Make naming consistent

n8n-io · Apr 19, 2024 · a193bd3 · a193bd3
1 parent 0c39b4f
commit a193bd3
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 10 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -20,10 +20,11 @@
     "bin": "n8n"
   },
   "scripts": {
-    "benchmark": "pnpm build && NODE_ENV=benchmark node dist/benchmarks/main.js",
+    "benchmark": "pnpm build:benchmark && NODE_ENV=benchmark node dist/benchmarks/main.js",
     "clean": "rimraf dist .turbo",
     "typecheck": "tsc",
     "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && node scripts/build.mjs",
+    "build:benchmark": "tsc -p tsconfig.benchmark.json && tsc-alias -p tsconfig.benchmark.json && node scripts/build.mjs",
     "buildAndDev": "pnpm run build && pnpm run dev",
     "dev": "concurrently -k -n \"TypeScript,Node\" -c \"yellow.bold,cyan.bold\" \"npm run watch\" \"nodemon\"",
     "dev:worker": "concurrently -k -n \"TypeScript,Node\" -c \"yellow.bold,cyan.bold\" \"npm run watch\" \"nodemon worker\"",

diff --git a/packages/cli/src/benchmarks/db/users.ts → packages/cli/src/benchmark/db/users.ts b/packages/cli/src/benchmarks/db/users.ts → packages/cli/src/benchmark/db/users.ts
diff --git a/packages/cli/src/benchmarks/hooks.ts → packages/cli/src/benchmark/hooks.ts b/packages/cli/src/benchmarks/hooks.ts → packages/cli/src/benchmark/hooks.ts
diff --git a/packages/cli/src/benchmarks/main.ts → packages/cli/src/benchmark/main.ts b/packages/cli/src/benchmarks/main.ts → packages/cli/src/benchmark/main.ts
@@ -1,13 +1,14 @@
 import 'reflect-metadata';
 import path from 'node:path';
 import glob from 'fast-glob';
-// eslint-disable-next-line import/no-extraneous-dependencies
-import Bench from 'tinybench';
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { withCodSpeed } from '@codspeed/tinybench-plugin';
 import type { Task } from './types';
 import { hooks } from './hooks';
 
+/* eslint-disable import/no-extraneous-dependencies */
+import { withCodSpeed } from '@codspeed/tinybench-plugin';
+import Bench from 'tinybench';
+/* eslint-ensable import/no-extraneous-dependencies */
+
 const tasks: Task[] = [];
 
 export function task(description: string, operation: Task['operation']) {
@@ -16,7 +17,7 @@ export function task(description: string, operation: Task['operation']) {
 
 async function loadTasks() {
 	const files = await glob('**/*.tasks.js', {
-		cwd: path.join('dist', 'benchmarks'),
+		cwd: path.join('dist', 'benchmark'),
 		absolute: true,
 	});
 

diff --git a/...cli/src/benchmarks/tasks/example.tasks.ts → .../cli/src/benchmark/tasks/example.tasks.ts b/...cli/src/benchmarks/tasks/example.tasks.ts → .../cli/src/benchmark/tasks/example.tasks.ts
diff --git a/...cli/src/benchmarks/tasks/webhook.tasks.ts → .../cli/src/benchmark/tasks/webhook.tasks.ts b/...cli/src/benchmarks/tasks/webhook.tasks.ts → .../cli/src/benchmark/tasks/webhook.tasks.ts
diff --git a/packages/cli/src/benchmarks/types.ts → packages/cli/src/benchmark/types.ts b/packages/cli/src/benchmarks/types.ts → packages/cli/src/benchmark/types.ts
diff --git a/packages/cli/tsconfig.benchmark.json b/packages/cli/tsconfig.benchmark.json
@@ -1,9 +1,10 @@
 {
 	"extends": ["./tsconfig.json", "../../tsconfig.build.json"],
 	"compilerOptions": {
-		"rootDir": ".",
+		"rootDir": "src",
 		"outDir": "dist",
 		"tsBuildInfoFile": "dist/benchmark.tsbuildinfo"
-	}
-	// "include": ["test/benchmark/**/*.ts"]
+	},
+	"include": ["src/**/*.ts", "src/benchmark/**/*.ts"],
+	"exclude": ["test/**"]
 }
diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json
@@ -6,5 +6,5 @@
 		"tsBuildInfoFile": "dist/build.tsbuildinfo"
 	},
 	"include": ["src/**/*.ts"],
-	"exclude": ["test/**"]
+	"exclude": ["test/**", "src/benchmarks/**"]
 }