fix: ci

terwer · Apr 9, 2023 · 9e90922 · 9e90922
1 parent 914eb00
commit 9e90922
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 67 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,5 +39,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      - name: Install dependencies and build for production
-        run: pnpm install && pnpm build
+      - name: Install dependencies
+        run: pnpm i --registry=https://registry.npmmirror.com
+
+      - name: build for production
+        run: nx reset && pnpm build
+
diff --git a/nx.json b/nx.json
@@ -35,12 +35,18 @@
     },
     "tasksRunnerOptions": {
         "default": {
-            "runner": "@nrwl/nx-cloud",
+            "runner": "nx/tasks-runners/default",
             "options": {
-                "cacheableOperations": ["build", "lint", "test", "e2e", "check"],
-                "accessToken": "MjNjZTQxNDgtYzhiYy00NDg0LWIwMGQtMWJhMjZhZmFlNDc0fHJlYWQtd3JpdGU="
+                "cacheableOperations": []
             }
-        }
+        },
+//        "default": {
+//            "runner": "@nrwl/nx-cloud",
+//            "options": {
+//                "cacheableOperations": ["build", "lint", "test", "e2e", "check"],
+//                "accessToken": "MjNjZTQxNDgtYzhiYy00NDg0LWIwMGQtMWJhMjZhZmFlNDc0fHJlYWQtd3JpdGU="
+//            }
+//        }
     },
     "defaultProject": "zhi-core",
     "generators": {

diff --git a/packages/zhi-blog-api/src/lib/custom.d.ts b/packages/zhi-blog-api/src/lib/custom.d.ts
diff --git a/packages/zhi-blog-api/tsconfig.lib.json b/packages/zhi-blog-api/tsconfig.lib.json
@@ -3,7 +3,8 @@
     "compilerOptions": {
         "outDir": "../../dist/out-tsc",
         "declaration": true,
-        "types": ["node"]
+        "module": "esnext",
+        "types": ["node", "vite/client"]
     },
     "include": ["src/**/*.ts"],
     "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]

diff --git a/packages/zhi-common/src/lib/ZhiUtil.ts b/packages/zhi-common/src/lib/ZhiUtil.ts
@@ -48,7 +48,7 @@ class ZhiUtil {
         if (!ZhiUtil.env) {
             // https://github.com/vitejs/vite/issues/9539#issuecomment-1206301266
             // 1 add modules:esnext tsconfig.app.json
-            // 2 add custom.d.ts
+            // 2 add custom.d.ts or add "vite/client" to tsconfig.app.json
             const envMeta = import.meta.env
 
             const customEnv = {

diff --git a/packages/zhi-common/src/lib/custom.d.ts b/packages/zhi-common/src/lib/custom.d.ts
diff --git a/packages/zhi-common/tsconfig.lib.json b/packages/zhi-common/tsconfig.lib.json
@@ -4,7 +4,8 @@
         "outDir": "../../dist/out-tsc",
         "declaration": true,
         "allowJs": true,
-        "types": ["node"]
+        "module": "esnext",
+        "types": ["node", "vite/client"]
     },
     "include": ["src/**/*.ts"],
     "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]

diff --git a/packages/zhi-server-modules-infra/tsconfig.lib.json b/packages/zhi-server-modules-infra/tsconfig.lib.json
@@ -3,7 +3,8 @@
     "compilerOptions": {
         "outDir": "../../dist/out-tsc",
         "declaration": true,
-        "types": ["node"]
+        "module": "esnext",
+        "types": ["node", "vite/client"]
     },
     "include": ["src/**/*.ts"],
     "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]

diff --git a/packages/zhi-siyuan-api/tsconfig.lib.json b/packages/zhi-siyuan-api/tsconfig.lib.json
@@ -3,7 +3,8 @@
     "compilerOptions": {
         "outDir": "../../dist/out-tsc",
         "declaration": true,
-        "types": ["node"]
+        "module": "esnext",
+        "types": ["node", "vite/client"]
     },
     "include": ["src/**/*.ts"],
     "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]