From febe5cc2ae6134222520764cab19d9281ef1f4f8 Mon Sep 17 00:00:00 2001 From: LongYinan Date: Thu, 7 Dec 2023 09:13:00 +0000 Subject: [PATCH] ci: fix ts-node scripts (#5225) - Ref: https://github.com/TypeStrong/ts-node/issues/2094 --- .github/workflows/build-test.yml | 6 +++--- packages/frontend/electron/package.json | 16 ++++++++-------- packages/frontend/i18n/package.json | 4 ++-- tsconfig.json | 8 -------- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 7b76cb92cb..cb26bc18c1 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -374,7 +374,7 @@ jobs: DATABASE_URL: postgresql://affine:affine@localhost:5432/affine - name: Run init-db script - run: yarn workspace @affine/server exec ts-node ./scripts/init-db.ts + run: yarn workspace @affine/server exec node --loader ts-node/esm/transpile-only ./scripts/init-db.ts env: DATABASE_URL: postgresql://affine:affine@localhost:5432/affine @@ -464,7 +464,7 @@ jobs: DATABASE_URL: postgresql://affine:affine@localhost:5432/affine - name: Run init-db script - run: yarn workspace @affine/server exec ts-node ./scripts/init-db.ts + run: yarn workspace @affine/server exec node --loader ts-node/esm/transpile-only ./scripts/init-db.ts - name: Download storage.node uses: actions/download-artifact@v3 with: @@ -588,7 +588,7 @@ jobs: - name: Output check if: ${{ matrix.spec.os == 'macos-latest' && matrix.spec.arch == 'arm64' }} run: | - yarn workspace @affine/electron ts-node ./scripts/macos-arm64-output-check.ts + yarn workspace @affine/electron exec node --loader ts-node/esm/transpile-only ./scripts/macos-arm64-output-check.ts - name: Upload test results if: ${{ failure() }} diff --git a/packages/frontend/electron/package.json b/packages/frontend/electron/package.json index cfa5bce56c..92d2573313 100644 --- a/packages/frontend/electron/package.json +++ b/packages/frontend/electron/package.json @@ -11,14 +11,14 @@ "homepage": "https://github.com/toeverything/AFFiNE", "scripts": { "start": "electron .", - "dev": "DEV_SERVER_URL=http://localhost:8080 yarn ts-node ./scripts/dev.ts", - "dev:prod": "yarn ts-node scripts/dev.ts", - "build": "NODE_ENV=production ts-node scripts/build-layers.ts", - "build:dev": "NODE_ENV=development ts-node scripts/build-layers.ts", - "generate-assets": "ts-node scripts/generate-assets.ts", - "package": "cross-env NODE_OPTIONS=\"--loader ts-node/esm\" electron-forge package", - "make": "cross-env NODE_OPTIONS=\"--loader ts-node/esm\" electron-forge make", - "make-squirrel": "yarn ts-node scripts/make-squirrel.ts" + "dev": "DEV_SERVER_URL=http://localhost:8080 node --loader ts-node/esm/transpile-only ./scripts/dev.ts", + "dev:prod": "yarn node --loader ts-node/esm/transpile-only scripts/dev.ts", + "build": "NODE_ENV=production node --loader ts-node/esm/transpile-only scripts/build-layers.ts", + "build:dev": "NODE_ENV=development node --loader ts-node/esm/transpile-only scripts/build-layers.ts", + "generate-assets": "node --loader ts-node/esm/transpile-only scripts/generate-assets.ts", + "package": "cross-env NODE_OPTIONS=\"--loader ts-node/esm/transpile-only\" electron-forge package", + "make": "cross-env NODE_OPTIONS=\"--loader ts-node/esm/transpile-only\" electron-forge make", + "make-squirrel": "node --loader ts-node/esm/transpile-only scripts/make-squirrel.ts" }, "main": "./dist/main.js", "devDependencies": { diff --git a/packages/frontend/i18n/package.json b/packages/frontend/i18n/package.json index 4d1c8a165c..c049ed4be9 100644 --- a/packages/frontend/i18n/package.json +++ b/packages/frontend/i18n/package.json @@ -17,9 +17,9 @@ "scripts": { "build": "node build.mjs", "dev": "node dev.mjs", - "sync-languages": "ts-node -P ./tsconfig.node.json src/scripts/sync.ts", + "sync-languages": "node --loader ts-node/esm/transpile-only src/scripts/sync.ts", "sync-languages:check": "yarn run sync-languages --check", - "download-resources": "ts-node -P ./tsconfig.node.json src/scripts/download.ts" + "download-resources": "node --loader ts-node/esm/transpile-only src/scripts/download.ts" }, "keywords": [], "repository": { diff --git a/tsconfig.json b/tsconfig.json index 0439ba2331..b03ccd2b6c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,7 +2,6 @@ "compilerOptions": { "verbatimModuleSyntax": true, // Classification follows https://www.typescriptlang.org/tsconfig - // Type Checking "strict": true, "exactOptionalPropertyTypes": false, @@ -16,7 +15,6 @@ "noPropertyAccessFromIndexSignature": false, "noUncheckedIndexedAccess": false, "useUnknownInCatchVariables": true, - // Modules "module": "ESNext", "moduleResolution": "bundler", @@ -28,16 +26,13 @@ "sourceMap": true, // skip type emit for @internal types // "stripInternal": true, - // JavaScript Support "allowJs": false, "checkJs": false, - // Interop Constraints "forceConsistentCasingInFileNames": true, "allowSyntheticDefaultImports": true, "isolatedModules": true, - // Language and Environment "jsx": "preserve", "jsxImportSource": "@emotion/react", @@ -46,11 +41,9 @@ "useDefineForClassFields": false, "experimentalDecorators": true, "emitDecoratorMetadata": true, - // Projects "composite": true, "incremental": true, - // Completeness "skipLibCheck": true, // skip all type checks for .d.ts files "paths": { @@ -81,7 +74,6 @@ "@affine/native": ["./packages/frontend/native/index.d.ts"], "@affine/native/*": ["./packages/frontend/native/*"], "@affine/storage": ["./packages/backend/storage/index.d.ts"], - // Development only "@affine/electron/*": ["./packages/frontend/electron/src/*"] }