From c5a295a87b65e6bfe3810a83389da0d2fc4a54c9 Mon Sep 17 00:00:00 2001 From: Himself65 Date: Fri, 9 Jun 2023 11:42:54 +0800 Subject: [PATCH] chore: bump `typescript` to `5.1.3` (#2735) Co-authored-by: LongYinan --- apps/electron/package.json | 3 +++ apps/server/package.json | 2 +- apps/server/tsconfig.node.json | 9 ++++++- apps/web/package.json | 2 +- package.json | 2 +- packages/component/package.json | 2 +- packages/i18n/package.json | 2 +- packages/native/package.json | 2 +- packages/y-indexeddb/tsconfig.node.json | 1 + scripts/setup/build-plugins.ts | 1 + scripts/vitest/next-config-mock.ts | 3 ++- tsconfig.json | 12 ++++----- tsconfig.node.json | 1 + yarn.lock | 36 +++++++++++++++++++------ 14 files changed, 56 insertions(+), 22 deletions(-) diff --git a/apps/electron/package.json b/apps/electron/package.json index dbcc4f7441..3cfcde53b2 100644 --- a/apps/electron/package.json +++ b/apps/electron/package.json @@ -23,6 +23,9 @@ "forge": "./forge.config.js" }, "main": "./dist/layers/main/index.js", + "exports": { + "./scripts/plugins/build-plugins.mjs": "./scripts/plugins/build-plugins.mjs" + }, "devDependencies": { "@affine-test/kit": "workspace:*", "@affine/native": "workspace:*", diff --git a/apps/server/package.json b/apps/server/package.json index 4224796917..1cdf698b15 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -43,7 +43,7 @@ "nodemon": "^2.0.22", "supertest": "^6.3.3", "ts-node": "^10.9.1", - "typescript": "^5.0.4", + "typescript": "^5.1.3", "vitest": "^0.31.4" }, "nodemonConfig": { diff --git a/apps/server/tsconfig.node.json b/apps/server/tsconfig.node.json index c97171294c..e2809e7856 100644 --- a/apps/server/tsconfig.node.json +++ b/apps/server/tsconfig.node.json @@ -1,4 +1,5 @@ { + "extends": "../../tsconfig.json", "compilerOptions": { "composite": true, "target": "ESNext", @@ -6,7 +7,13 @@ "resolveJsonModule": true, "moduleResolution": "Node", "allowSyntheticDefaultImports": true, - "outDir": "dist/scripts" + "outDir": "dist/scripts", + "rootDir": "." }, + "references": [ + { + "path": "../../tests/fixtures" + } + ], "include": ["scripts", "package.json"] } diff --git a/apps/web/package.json b/apps/web/package.json index 37b63c8f25..74918f3133 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -77,7 +77,7 @@ "raw-loader": "^4.0.2", "redux": "^4.2.1", "swc-plugin-coverage-instrument": "^0.0.18", - "typescript": "^5.0.4", + "typescript": "^5.1.3", "webpack": "^5.85.0" }, "stableVersion": "0.0.0" diff --git a/package.json b/package.json index e8409279eb..b48b1aff93 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "react": "18.3.0-canary-16d053d59-20230506", "react-dom": "18.3.0-canary-16d053d59-20230506", "serve": "^14.2.0", - "typescript": "^5.0.4", + "typescript": "^5.1.3", "vite": "^4.3.9", "vite-plugin-istanbul": "^4.1.0", "vite-tsconfig-paths": "^4.2.0", diff --git a/packages/component/package.json b/packages/component/package.json index 937498e76d..eb44117624 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -61,7 +61,7 @@ "@types/react-dnd": "^3.0.2", "@types/react-dom": "18.2.4", "@vanilla-extract/css": "^1.11.0", - "typescript": "^5.0.4", + "typescript": "^5.1.3", "vite": "^4.3.9", "yjs": "^13.6.1" }, diff --git a/packages/i18n/package.json b/packages/i18n/package.json index c8c57bd347..a688f23f95 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -35,7 +35,7 @@ "@types/prettier": "^2.7.3", "prettier": "^2.8.8", "ts-node": "^10.9.1", - "typescript": "^5.0.4" + "typescript": "^5.1.3" }, "version": "0.7.0-canary.11" } diff --git a/packages/native/package.json b/packages/native/package.json index 540f69df70..eba1eda520 100644 --- a/packages/native/package.json +++ b/packages/native/package.json @@ -21,7 +21,7 @@ "cross-env": "^7.0.3", "rxjs": "^7.8.1", "ts-node": "^10.9.1", - "typescript": "^5.0.4", + "typescript": "^5.1.3", "uuid": "^9.0.0" }, "engines": { diff --git a/packages/y-indexeddb/tsconfig.node.json b/packages/y-indexeddb/tsconfig.node.json index 1b87925cbc..77927553a3 100644 --- a/packages/y-indexeddb/tsconfig.node.json +++ b/packages/y-indexeddb/tsconfig.node.json @@ -1,4 +1,5 @@ { + "extends": "../../tsconfig.json", "compilerOptions": { "composite": true, "module": "ESNext", diff --git a/scripts/setup/build-plugins.ts b/scripts/setup/build-plugins.ts index 83667b096e..3f9abdbeeb 100644 --- a/scripts/setup/build-plugins.ts +++ b/scripts/setup/build-plugins.ts @@ -2,5 +2,6 @@ import { beforeAll } from 'vitest'; beforeAll(async () => { console.log('Build plugins'); + // @ts-expect-error await import('../../apps/electron/scripts/plugins/build-plugins.mjs'); }); diff --git a/scripts/vitest/next-config-mock.ts b/scripts/vitest/next-config-mock.ts index aebfed4a5d..ea001ad2e7 100644 --- a/scripts/vitest/next-config-mock.ts +++ b/scripts/vitest/next-config-mock.ts @@ -1,7 +1,8 @@ import { blockSuiteFeatureFlags, buildFlags, -} from '../../apps/web/preset.config.mjs'; + // @ts-expect-error +} from '@affine/web/preset.config.mjs'; export default function getConfig() { return { diff --git a/tsconfig.json b/tsconfig.json index 5c0eb35e4b..8bdb65e35b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -69,10 +69,7 @@ "@affine/graphql": ["./packages/graphql/src"], "@affine/copilot": ["./plugins/copilot/src"], "@affine/copilot/*": ["./plugins/copilot/src/*"], - "@affine/electron/layers/*": ["./apps/electron/layers/*"], - "@affine/electron/preload": [ - "./apps/electron/layers/preload/preload.d.ts" - ], + "@affine/electron/scripts/*": ["./apps/electron/scripts/*"], "@affine-test/kit/*": ["./tests/kit/*"], "@affine-test/fixtures/*": ["./tests/fixtures/*"], "@toeverything/infra": ["./packages/infra/src"], @@ -81,7 +78,10 @@ "@toeverything/plugin-infra": ["./packages/plugin-infra/src"], "@toeverything/plugin-infra/*": ["./packages/plugin-infra/src/*"], "@affine/native": ["./packages/native/index.d.ts"], - "@affine/native/*": ["./packages/native/*"] + "@affine/native/*": ["./packages/native/*"], + + // Development only + "@affine/electron/layers/*": ["./apps/electron/layers/*"] } }, "include": [], @@ -146,5 +146,5 @@ } ], "files": [], - "exclude": ["node_modules"] + "exclude": ["node_modules", "target", "lib", "test-results"] } diff --git a/tsconfig.node.json b/tsconfig.node.json index 674cb5b3dd..794276cb6d 100644 --- a/tsconfig.node.json +++ b/tsconfig.node.json @@ -1,4 +1,5 @@ { + "extends": "./tsconfig.json", "compilerOptions": { "composite": true, "module": "ESNext", diff --git a/yarn.lock b/yarn.lock index 978acce65f..6fbc05f7d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -103,7 +103,7 @@ __metadata: react-error-boundary: ^4.0.9 react-is: ^18.2.0 rxjs: ^7.8.1 - typescript: ^5.0.4 + typescript: ^5.1.3 vite: ^4.3.9 yjs: ^13.6.1 peerDependencies: @@ -230,7 +230,7 @@ __metadata: prettier: ^2.8.8 react-i18next: ^12.3.1 ts-node: ^10.9.1 - typescript: ^5.0.4 + typescript: ^5.1.3 languageName: unknown linkType: soft @@ -265,7 +265,7 @@ __metadata: cross-env: ^7.0.3 rxjs: ^7.8.1 ts-node: ^10.9.1 - typescript: ^5.0.4 + typescript: ^5.1.3 uuid: ^9.0.0 languageName: unknown linkType: soft @@ -301,7 +301,7 @@ __metadata: rxjs: ^7.8.1 supertest: ^6.3.3 ts-node: ^10.9.1 - typescript: ^5.0.4 + typescript: ^5.1.3 vitest: ^0.31.4 bin: run-test: ./scripts/run-test.ts @@ -424,7 +424,7 @@ __metadata: rxjs: ^7.8.1 swc-plugin-coverage-instrument: ^0.0.18 swr: ^2.1.5 - typescript: ^5.0.4 + typescript: ^5.1.3 webpack: ^5.85.0 y-protocols: ^1.0.5 yjs: ^13.6.1 @@ -10670,7 +10670,7 @@ __metadata: react: 18.3.0-canary-16d053d59-20230506 react-dom: 18.3.0-canary-16d053d59-20230506 serve: ^14.2.0 - typescript: ^5.0.4 + typescript: ^5.1.3 vite: ^4.3.9 vite-plugin-istanbul: ^4.1.0 vite-tsconfig-paths: ^4.2.0 @@ -26480,7 +26480,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^4.6.4 || ^5.0.0, typescript@npm:^5.0.4, typescript@npm:~5.0.4": +"typescript@npm:^4.6.4 || ^5.0.0, typescript@npm:~5.0.4": version: 5.0.4 resolution: "typescript@npm:5.0.4" bin: @@ -26490,6 +26490,16 @@ __metadata: languageName: node linkType: hard +"typescript@npm:^5.1.3": + version: 5.1.3 + resolution: "typescript@npm:5.1.3" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: d9d51862d98efa46534f2800a1071a613751b1585dc78884807d0c179bcd93d6e9d4012a508e276742f5f33c480adefc52ffcafaf9e0e00ab641a14cde9a31c7 + languageName: node + linkType: hard + "typescript@patch:typescript@^3.9.10#~builtin, typescript@patch:typescript@^3.9.7#~builtin": version: 3.9.10 resolution: "typescript@patch:typescript@npm%3A3.9.10#~builtin::version=3.9.10&hash=3bd3d3" @@ -26510,7 +26520,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@^4.6.4 || ^5.0.0#~builtin, typescript@patch:typescript@^5.0.4#~builtin, typescript@patch:typescript@~5.0.4#~builtin": +"typescript@patch:typescript@^4.6.4 || ^5.0.0#~builtin, typescript@patch:typescript@~5.0.4#~builtin": version: 5.0.4 resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin::version=5.0.4&hash=85af82" bin: @@ -26520,6 +26530,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@^5.1.3#~builtin": + version: 5.1.3 + resolution: "typescript@patch:typescript@npm%3A5.1.3#~builtin::version=5.1.3&hash=85af82" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 32a25b2e128a4616f999d4ee502aabb1525d5647bc8955e6edf05d7fbc53af8aa98252e2f6ba80bcedfc0260c982b885f3c09cfac8bb65d2924f3133ad1e1e62 + languageName: node + linkType: hard + "typeson-registry@npm:^1.0.0-alpha.20": version: 1.0.0-alpha.39 resolution: "typeson-registry@npm:1.0.0-alpha.39"