Merge pull request #596 from terwer/dev

fix: install scripts
terwer · Jan 10, 2025 · a9bcbc5 · a9bcbc5
2 parents 972de2f + 3b238c7
commit a9bcbc5
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 30 deletions.
diff --git a/apps/app/nuxt.config.ts b/apps/app/nuxt.config.ts
@@ -13,7 +13,7 @@ const generateDynamicV = () => {
 }
 
 const isDev = process.env.NODE_ENV === "development"
-const appBase = "/"
+const appBase = "/plugins/siyuan-blog/app/"
 const staticV = generateDynamicV()
 
 // https://nuxt.com/docs/api/configuration/nuxt-config
@@ -30,6 +30,37 @@ export default defineNuxtConfig({
     vueI18n: "./i18n.ts"
   },
 
+  // https://nuxt.com/docs/guide/going-further/custom-routing#hash-mode-spa
+  ssr: false,
+  router: {
+    options: {
+      hashMode: true,
+    },
+  },
+
+  vite: {
+    define: {
+      "process.env.DEV_MODE": `"${isDev}"`,
+      "process.env.APP_BASE": `"${appBase}"`,
+      "process.env.SSR": "\"false\"",
+    },
+    plugins: [
+      AutoImport({
+        resolvers: [ElementPlusResolver()],
+      }),
+      Components({
+        resolvers: [ElementPlusResolver()],
+      }),
+    ]
+  },
+
+  css: ["~/assets/css/index.styl"],
+
+  elementPlus: {
+    /** Options */
+    themes: ["dark"],
+  },
+
   app: {
     baseURL: appBase,
     head: {
@@ -77,36 +108,13 @@ export default defineNuxtConfig({
     },
   },
 
-  vite: {
-    define: {
-      "process.env.DEV_MODE": `"${isDev}"`,
-      "process.env.APP_BASE": `"${appBase}"`,
-      "process.env.SSR": "\"true\"",
-    },
-    plugins: [
-      AutoImport({
-        resolvers: [ElementPlusResolver()],
-      }),
-      Components({
-        resolvers: [ElementPlusResolver()],
-      }),
-    ]
-  },
-
-  css: ["~/assets/css/index.styl"],
-
-  elementPlus: {
-    /** Options */
-    themes: ["dark"],
-  },
-
   // 环境变量
   runtimeConfig: {
     public: {
-      defaultType: process.env.NUXT_PUBLIC_DEFAULT_TYPE ?? "node",
-      siyuanApiUrl: process.env.NUXT_PUBLIC_SIYUAN_API_URL ?? "http://127.0.0.1:6806",
-      providerMode: process.env.NUXT_PUBLIC_PROVIDER_MODE ?? "false",
-      providerUrl: process.env.NUXT_PUBLIC_PROVIDER_URL ?? "http://127.0.0.1:8086",
+      defaultType: "siyuan",
+      siyuanApiUrl: "",
+      providerMode: "false",
+      providerUrl: "",
     },
   },
 

diff --git a/build-artifacts.sh b/build-artifacts.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+pnpm build -F @terwer/share-pro-app --force -- --from node
+pnpm build -F @terwer/share-pro-app --force -- --from siyuan
+pnpm build -F siyuan-blog
+echo "Build all finished."
diff --git a/install.sh b/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # 解压 package.zip打牌 文件到 build/node/
-unzip package.zip -d .
+unzip build/node-provider.zip -d .
 # Check if packaging was successful
 if [ $? -eq 0 ]; then
   echo "Packaging successful: package.zip"

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "scripts": {
     "devApp": "ppnpm dev -F @terwer/share-pro-app -- --host",
     "devSiyuan": "pnpm build -F siyuan-blog -- --watch",
-    "buildArtifacts": "pnpm build -F @terwer/share-pro-app -- --from node && pnpm build -F siyuan-blog",
+    "buildArtifacts": "./build-artifacts.sh",
     "build": "turbo run build",
     "dev": "turbo run dev",
     "lint": "turbo run lint",