From 30803e737d22023d59685ee09ed25066540c0acf Mon Sep 17 00:00:00 2001 From: cte Date: Wed, 19 Mar 2025 23:49:45 -0700 Subject: [PATCH] Move shared config --- .../eslint-config => config/eslint}/base.js | 0 .../eslint-config => config/eslint}/next.js | 0 .../eslint}/package.json | 0 .../typescript}/base.json | 0 .../typescript}/nextjs.json | 0 .../typescript}/package.json | 0 benchmark/packages/cli/package.json | 2 +- benchmark/packages/db/package.json | 2 +- .../packages/eslint-config/shared/rules.js | 0 benchmark/packages/ipc/package.json | 2 +- benchmark/packages/runner/package.json | 2 +- benchmark/packages/web/package.json | 2 +- benchmark/pnpm-lock.yaml | 120 +++++++++--------- benchmark/pnpm-workspace.yaml | 3 +- 14 files changed, 67 insertions(+), 66 deletions(-) rename benchmark/{packages/eslint-config => config/eslint}/base.js (100%) rename benchmark/{packages/eslint-config => config/eslint}/next.js (100%) rename benchmark/{packages/eslint-config => config/eslint}/package.json (100%) rename benchmark/{packages/typescript-config => config/typescript}/base.json (100%) rename benchmark/{packages/typescript-config => config/typescript}/nextjs.json (100%) rename benchmark/{packages/typescript-config => config/typescript}/package.json (100%) delete mode 100644 benchmark/packages/eslint-config/shared/rules.js diff --git a/benchmark/packages/eslint-config/base.js b/benchmark/config/eslint/base.js similarity index 100% rename from benchmark/packages/eslint-config/base.js rename to benchmark/config/eslint/base.js diff --git a/benchmark/packages/eslint-config/next.js b/benchmark/config/eslint/next.js similarity index 100% rename from benchmark/packages/eslint-config/next.js rename to benchmark/config/eslint/next.js diff --git a/benchmark/packages/eslint-config/package.json b/benchmark/config/eslint/package.json similarity index 100% rename from benchmark/packages/eslint-config/package.json rename to benchmark/config/eslint/package.json diff --git a/benchmark/packages/typescript-config/base.json b/benchmark/config/typescript/base.json similarity index 100% rename from benchmark/packages/typescript-config/base.json rename to benchmark/config/typescript/base.json diff --git a/benchmark/packages/typescript-config/nextjs.json b/benchmark/config/typescript/nextjs.json similarity index 100% rename from benchmark/packages/typescript-config/nextjs.json rename to benchmark/config/typescript/nextjs.json diff --git a/benchmark/packages/typescript-config/package.json b/benchmark/config/typescript/package.json similarity index 100% rename from benchmark/packages/typescript-config/package.json rename to benchmark/config/typescript/package.json diff --git a/benchmark/packages/cli/package.json b/benchmark/packages/cli/package.json index 396799e526..762e1db67c 100644 --- a/benchmark/packages/cli/package.json +++ b/benchmark/packages/cli/package.json @@ -7,7 +7,7 @@ "scripts": { "lint": "eslint src --ext ts --max-warnings=0", "check-types": "tsc --noEmit", - "format": "prettier --write .", + "format": "prettier --write src", "build": "pnpm --filter @benchmark/client build", "dev": "dotenvx run -f ../../.env -- tsx src/index.ts" }, diff --git a/benchmark/packages/db/package.json b/benchmark/packages/db/package.json index 92f01e6ec8..7550b0aede 100644 --- a/benchmark/packages/db/package.json +++ b/benchmark/packages/db/package.json @@ -10,7 +10,7 @@ "scripts": { "lint": "eslint src --ext ts --max-warnings=0", "check-types": "tsc --noEmit", - "format": "prettier --write .", + "format": "prettier --write src", "drizzle-kit": "dotenvx run -f ../../.env -- tsx node_modules/drizzle-kit/bin.cjs", "db:generate": "pnpm drizzle-kit generate", "db:migrate": "pnpm drizzle-kit migrate", diff --git a/benchmark/packages/eslint-config/shared/rules.js b/benchmark/packages/eslint-config/shared/rules.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/benchmark/packages/ipc/package.json b/benchmark/packages/ipc/package.json index b457cb2aa7..fdb697e2ca 100644 --- a/benchmark/packages/ipc/package.json +++ b/benchmark/packages/ipc/package.json @@ -7,7 +7,7 @@ "scripts": { "lint": "eslint src --ext ts --max-warnings=0", "check-types": "tsc --noEmit", - "format": "prettier --write .", + "format": "prettier --write src", "test:server": "tsx scripts/server.ts", "test:client": "tsx scripts/client.ts" }, diff --git a/benchmark/packages/runner/package.json b/benchmark/packages/runner/package.json index bbb65401d7..e63845fa2a 100644 --- a/benchmark/packages/runner/package.json +++ b/benchmark/packages/runner/package.json @@ -6,7 +6,7 @@ "scripts": { "lint": "eslint src --ext ts --max-warnings=0", "check-types": "tsc --noEmit", - "format": "prettier --write .", + "format": "prettier --write src", "build": "rimraf dist && tsc", "vscode-test": "pnpm build && cd ../../.. && npm run vscode-test" }, diff --git a/benchmark/packages/web/package.json b/benchmark/packages/web/package.json index fe02a903b2..06cf72eeb6 100644 --- a/benchmark/packages/web/package.json +++ b/benchmark/packages/web/package.json @@ -9,7 +9,7 @@ "start": "next start", "lint": "next lint", "check-types": "tsc -b", - "format": "prettier --write ." + "format": "prettier --write src" }, "dependencies": { "@benchmark/db": "workspace:^", diff --git a/benchmark/pnpm-lock.yaml b/benchmark/pnpm-lock.yaml index 86c59a00dd..32d17ad078 100644 --- a/benchmark/pnpm-lock.yaml +++ b/benchmark/pnpm-lock.yaml @@ -39,59 +39,7 @@ importers: specifier: ^8.26.0 version: 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) - packages/cli: - dependencies: - '@benchmark/db': - specifier: workspace:^ - version: link:../db - '@vscode/test-electron': - specifier: ^2.4.0 - version: 2.4.1 - gluegun: - specifier: ^5.1.2 - version: 5.2.0 - p-map: - specifier: ^7.0.3 - version: 7.0.3 - devDependencies: - '@benchmark/eslint-config': - specifier: workspace:^ - version: link:../eslint-config - '@benchmark/typescript-config': - specifier: workspace:^ - version: link:../typescript-config - - packages/db: - dependencies: - '@libsql/client': - specifier: ^0.14.0 - version: 0.14.0 - drizzle-orm: - specifier: ^0.40.0 - version: 0.40.1(@libsql/client@0.14.0)(gel@2.0.1) - drizzle-zod: - specifier: ^0.7.0 - version: 0.7.0(drizzle-orm@0.40.1(@libsql/client@0.14.0)(gel@2.0.1))(zod@3.24.2) - libsql: - specifier: ^0.5.1 - version: 0.5.1 - zod: - specifier: ^3.24.2 - version: 3.24.2 - devDependencies: - '@benchmark/eslint-config': - specifier: workspace:^ - version: link:../eslint-config - '@benchmark/typescript-config': - specifier: workspace:^ - version: link:../typescript-config - drizzle-kit: - specifier: ^0.30.5 - version: 0.30.5 - - packages/docker: {} - - packages/eslint-config: + config/eslint: devDependencies: '@eslint/js': specifier: ^9.22.0 @@ -127,6 +75,60 @@ importers: specifier: ^8.26.0 version: 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) + config/typescript: {} + + packages/cli: + dependencies: + '@benchmark/db': + specifier: workspace:^ + version: link:../db + '@vscode/test-electron': + specifier: ^2.4.0 + version: 2.4.1 + gluegun: + specifier: ^5.1.2 + version: 5.2.0 + p-map: + specifier: ^7.0.3 + version: 7.0.3 + devDependencies: + '@benchmark/eslint-config': + specifier: workspace:^ + version: link:../../config/eslint + '@benchmark/typescript-config': + specifier: workspace:^ + version: link:../../config/typescript + + packages/db: + dependencies: + '@libsql/client': + specifier: ^0.14.0 + version: 0.14.0 + drizzle-orm: + specifier: ^0.40.0 + version: 0.40.1(@libsql/client@0.14.0)(gel@2.0.1) + drizzle-zod: + specifier: ^0.7.0 + version: 0.7.0(drizzle-orm@0.40.1(@libsql/client@0.14.0)(gel@2.0.1))(zod@3.24.2) + libsql: + specifier: ^0.5.1 + version: 0.5.1 + zod: + specifier: ^3.24.2 + version: 3.24.2 + devDependencies: + '@benchmark/eslint-config': + specifier: workspace:^ + version: link:../../config/eslint + '@benchmark/typescript-config': + specifier: workspace:^ + version: link:../../config/typescript + drizzle-kit: + specifier: ^0.30.5 + version: 0.30.5 + + packages/docker: {} + packages/ipc: dependencies: node-ipc: @@ -138,10 +140,10 @@ importers: devDependencies: '@benchmark/eslint-config': specifier: workspace:^ - version: link:../eslint-config + version: link:../../config/eslint '@benchmark/typescript-config': specifier: workspace:^ - version: link:../typescript-config + version: link:../../config/typescript '@types/node-ipc': specifier: ^9.2.3 version: 9.2.3 @@ -150,13 +152,11 @@ importers: devDependencies: '@benchmark/eslint-config': specifier: workspace:^ - version: link:../eslint-config + version: link:../../config/eslint '@types/vscode': specifier: ^1.98.0 version: 1.98.0 - packages/typescript-config: {} - packages/web: dependencies: '@benchmark/db': @@ -198,10 +198,10 @@ importers: devDependencies: '@benchmark/eslint-config': specifier: workspace:^ - version: link:../eslint-config + version: link:../../config/eslint '@benchmark/typescript-config': specifier: workspace:^ - version: link:../typescript-config + version: link:../../config/typescript '@tailwindcss/postcss': specifier: ^4 version: 4.0.14 diff --git a/benchmark/pnpm-workspace.yaml b/benchmark/pnpm-workspace.yaml index 18ec407efc..babd90cb98 100644 --- a/benchmark/pnpm-workspace.yaml +++ b/benchmark/pnpm-workspace.yaml @@ -1,2 +1,3 @@ packages: - - 'packages/*' + - "packages/*" + - "config/*"