From 660c5b8aed5b79d8fd49a531dbb967bd9563efcc Mon Sep 17 00:00:00 2001 From: Sheraff Date: Wed, 14 Feb 2024 11:46:49 +0100 Subject: [PATCH 1/3] Fix #18: circular tsconfig references --- client/tsconfig.app.json | 2 +- client/tsconfig.tools.json | 2 +- package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- script/tsconfig.lib.json | 2 +- script/turbo.json | 4 +--- server/tsconfig.app.json | 2 +- server/tsconfig.tools.json | 2 +- shared/tsconfig.lib.json | 2 +- shared/tsconfig.tools.json | 2 +- tsconfig.app.json | 2 +- tsconfig.tools.json | 2 +- worker/tsconfig.app.json | 2 +- worker/tsconfig.tools.json | 2 +- 14 files changed, 22 insertions(+), 24 deletions(-) diff --git a/client/tsconfig.app.json b/client/tsconfig.app.json index 45a6984..7d1546b 100644 --- a/client/tsconfig.app.json +++ b/client/tsconfig.app.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.json", + "extends": "../tsconfig.base.json", "compilerOptions": { "jsx": "react-jsx", "lib": ["DOM", "DOM.Iterable", "ESNext"], diff --git a/client/tsconfig.tools.json b/client/tsconfig.tools.json index 7b69d0d..c67ba6b 100644 --- a/client/tsconfig.tools.json +++ b/client/tsconfig.tools.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.json", + "extends": "../tsconfig.base.json", "compilerOptions": { "types": ["node", "vitest/importMeta"], "module": "ESNext" diff --git a/package.json b/package.json index d9b8bcf..b23a4ee 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "typed-css-modules": "^0.9.1", "typescript": "^5.3.3", "typescript-plugin-css-modules": "^5.1.0", - "vite": "5.0.12", + "vite": "5.1.1", "vitest": "^1.2.2", "vitest-github-actions-reporter": "^0.11.1" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 570391e..c75caf8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -86,7 +86,7 @@ importers: version: 7.0.1(eslint@8.56.0)(typescript@5.3.3) '@vitejs/plugin-react-swc': specifier: 3.6.0 - version: 3.6.0(vite@5.0.12) + version: 3.6.0(vite@5.1.1) '@vitest/web-worker': specifier: ^1.2.2 version: 1.2.2(vitest@1.2.2) @@ -139,8 +139,8 @@ importers: specifier: ^5.1.0 version: 5.1.0(typescript@5.3.3) vite: - specifier: 5.0.12 - version: 5.0.12(@types/node@20.11.17) + specifier: 5.1.1 + version: 5.1.1(@types/node@20.11.17) vitest: specifier: ^1.2.2 version: 1.2.2(@types/node@20.11.17) @@ -1868,13 +1868,13 @@ packages: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} dev: true - /@vitejs/plugin-react-swc@3.6.0(vite@5.0.12): + /@vitejs/plugin-react-swc@3.6.0(vite@5.1.1): resolution: {integrity: sha512-XFRbsGgpGxGzEV5i5+vRiro1bwcIaZDIdBRP16qwm+jP68ue/S8FJTBEgOeojtVDYrbSua3XFp71kC8VJE6v+g==} peerDependencies: vite: ^4 || ^5 dependencies: '@swc/core': 1.3.107 - vite: 5.0.12(@types/node@20.11.17) + vite: 5.1.1(@types/node@20.11.17) transitivePeerDependencies: - '@swc/helpers' dev: true @@ -5658,7 +5658,7 @@ packages: debug: 4.3.4 pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.0.12(@types/node@20.11.17) + vite: 5.1.1(@types/node@20.11.17) transitivePeerDependencies: - '@types/node' - less @@ -5670,8 +5670,8 @@ packages: - terser dev: true - /vite@5.0.12(@types/node@20.11.17): - resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==} + /vite@5.1.1(@types/node@20.11.17): + resolution: {integrity: sha512-wclpAgY3F1tR7t9LL5CcHC41YPkQIpKUGeIuT8MdNwNZr6OqOTLs7JX5vIHAtzqLWXts0T+GDrh9pN2arneKqg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -5760,7 +5760,7 @@ packages: strip-literal: 1.3.0 tinybench: 2.6.0 tinypool: 0.8.2 - vite: 5.0.12(@types/node@20.11.17) + vite: 5.1.1(@types/node@20.11.17) vite-node: 1.2.2(@types/node@20.11.17) why-is-node-running: 2.2.2 transitivePeerDependencies: diff --git a/script/tsconfig.lib.json b/script/tsconfig.lib.json index bf17f60..48c53c1 100644 --- a/script/tsconfig.lib.json +++ b/script/tsconfig.lib.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.json", + "extends": "../tsconfig.base.json", "compilerOptions": { "types": ["node"], "lib": ["ESNext"] diff --git a/script/turbo.json b/script/turbo.json index 6c9dcb2..c88d27d 100644 --- a/script/turbo.json +++ b/script/turbo.json @@ -6,8 +6,6 @@ "outputs": ["src/**/*.js"], "inputs": ["src/**/*.ts"] }, - "tsc": { - "inputs": ["src/**/*.ts"] - } + "tsc": {} } } diff --git a/server/tsconfig.app.json b/server/tsconfig.app.json index 1b00fc7..43a1b98 100644 --- a/server/tsconfig.app.json +++ b/server/tsconfig.app.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.json", + "extends": "../tsconfig.base.json", "compilerOptions": { "lib": ["ESNext"], "outDir": "../dist/server", diff --git a/server/tsconfig.tools.json b/server/tsconfig.tools.json index bb7305c..747e49a 100644 --- a/server/tsconfig.tools.json +++ b/server/tsconfig.tools.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.json", + "extends": "../tsconfig.base.json", "compilerOptions": { "types": ["node", "vitest/importMeta"], "module": "ESNext" diff --git a/shared/tsconfig.lib.json b/shared/tsconfig.lib.json index 0b2dc08..d63e90e 100644 --- a/shared/tsconfig.lib.json +++ b/shared/tsconfig.lib.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.json", + "extends": "../tsconfig.base.json", "compilerOptions": { "types": [] }, diff --git a/shared/tsconfig.tools.json b/shared/tsconfig.tools.json index 0aa01aa..88094a2 100644 --- a/shared/tsconfig.tools.json +++ b/shared/tsconfig.tools.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.json", + "extends": "../tsconfig.base.json", "compilerOptions": { "types": ["node", "vitest/importMeta"], "module": "ESNext" diff --git a/tsconfig.app.json b/tsconfig.app.json index fb077ac..0a68838 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.json", + "extends": "./tsconfig.base.json", "compilerOptions": { "composite": true, "lib": ["ESNext"], diff --git a/tsconfig.tools.json b/tsconfig.tools.json index 8526ca4..743109b 100644 --- a/tsconfig.tools.json +++ b/tsconfig.tools.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.json", + "extends": "./tsconfig.base.json", "compilerOptions": { "composite": true, "types": ["node"], diff --git a/worker/tsconfig.app.json b/worker/tsconfig.app.json index 5e7ff4a..30ac35a 100644 --- a/worker/tsconfig.app.json +++ b/worker/tsconfig.app.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.json", + "extends": "../tsconfig.base.json", "compilerOptions": { "lib": ["WebWorker", "ESNext"], "outDir": "../dist/worker", diff --git a/worker/tsconfig.tools.json b/worker/tsconfig.tools.json index caa8d20..441e4e4 100644 --- a/worker/tsconfig.tools.json +++ b/worker/tsconfig.tools.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.json", + "extends": "../tsconfig.base.json", "compilerOptions": { "types": ["node", "vitest/importMeta"], "module": "ESNext", From 1ac4a5826d0d7d2f434b03deaefb2bf6b98e41b1 Mon Sep 17 00:00:00 2001 From: Sheraff Date: Wed, 14 Feb 2024 11:54:50 +0100 Subject: [PATCH 2/3] no-op reorg of base tsconfig --- tsconfig.base.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tsconfig.base.json b/tsconfig.base.json index a2258a3..2a814bb 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1,13 +1,16 @@ { "compilerOptions": { + "lib": ["ESNext"], + // graph "rootDir": ".", "baseUrl": ".", - "moduleResolution": "Bundler", - "module": "ESNext", - "target": "ESNext", "skipLibCheck": true, "skipDefaultLibCheck": true, - "lib": ["ESNext"], + // build + "target": "ESNext", + // imports + "module": "ESNext", + "moduleResolution": "Bundler", "paths": { "assets/*": ["assets/src/*"], "script/*": ["script/src/*"], From 104e715dd208c1072a74ca049d37885a7144a732 Mon Sep 17 00:00:00 2001 From: Sheraff Date: Wed, 14 Feb 2024 11:55:19 +0100 Subject: [PATCH 3/3] release version, because i'm happy i solved this issue --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b23a4ee..62470bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "repo", - "version": "0.0.0-alpha.7", + "version": "0.0.0-alpha.8", "license": "MIT", "private": true, "repository": {