feat: 修复vercel构建问题

terwer · Mar 15, 2023 · 08fa827 · 08fa827
1 parent 9233566
commit 08fa827
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/apps/blog/nuxt.config.ts b/apps/blog/nuxt.config.ts
@@ -1,5 +1,7 @@
 const isDev = process.env.NODE_ENV === "development"
-const appBase = isDev ? "/" : "/appearance/themes/zhi/apps/blog/dist/"
+const isVercelBuild = process.env.BUILD_TYPE === "vercel"
+const appBase = !isDev ? "/" : isVercelBuild ? "/" : "/appearance/themes/zhi/apps/blog/dist/"
+console.log("isVercelBuild=>", isVercelBuild)
 console.log("isDev=>", isDev)
 console.log("appBase=>", appBase)
 
@@ -24,7 +26,7 @@ export default defineNuxtConfig({
       VITE_DEBUG_MODE: false,
     },
   },
-  // nitro: {
-  //   serveStatic: true,
-  // },
+  nitro: {
+    serveStatic: !isDev,
+  },
 })
diff --git a/apps/blog/package.json b/apps/blog/package.json
@@ -10,6 +10,7 @@
     "build:js": "nuxt build",
     "dev": "pnpm build:css && nuxt dev",
     "generate": "pnpm build:css && nuxt generate",
+    "generate:vercel": "pnpm build:css && BUILD_TYPE=vercel nuxt generate",
     "preview": "nuxt preview",
     "postinstall": "nuxt prepare",
     "package:vercel": "bash package.sh",

diff --git a/apps/blog/package.sh b/apps/blog/package.sh
@@ -1,7 +1,3 @@
-cd ../common
 pnpm install
-pnpm build
-pnpm vitepress:api
-cd ../blog
-pnpm generate
+pnpm generate:vercel
 echo "vercel build blog done."
diff --git a/apps/blog/pages/index.vue b/apps/blog/pages/index.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script lang="ts" setup>
-import ZhiUtil from "zhi-common"
+import ZhiUtil, { ThemeFromEnum } from "zhi-common"
 import { version } from "~/package.json"
 import Env from "zhi-env"