From 7795cf633bf0307479ac8787dd0bf4a4d1e6ca71 Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Tue, 23 May 2023 19:59:43 +0800
Subject: [PATCH] refactor(admin-next): add patch in vite-express which support
 base

---
 package.json                     |  3 ++-
 patches/vite-express@0.8.0.patch | 15 +++++++++++++++
 pnpm-lock.yaml                   | 12 ++++++++----
 server/admin-next/package.json   |  2 +-
 server/admin-next/vite.config.ts |  1 +
 5 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 patches/vite-express@0.8.0.patch

diff --git a/package.json b/package.json
index c225fabc..36f0ac6f 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,8 @@
     },
     "patchedDependencies": {
       "moleculer-minio@2.0.0": "patches/moleculer-minio@2.0.0.patch",
-      "moleculer@0.14.23": "patches/moleculer@0.14.23.patch"
+      "moleculer@0.14.23": "patches/moleculer@0.14.23.patch",
+      "vite-express@0.8.0": "patches/vite-express@0.8.0.patch"
     }
   }
 }
diff --git a/patches/vite-express@0.8.0.patch b/patches/vite-express@0.8.0.patch
new file mode 100644
index 00000000..70ab77ec
--- /dev/null
+++ b/patches/vite-express@0.8.0.patch
@@ -0,0 +1,15 @@
+diff --git a/dist/main.js b/dist/main.js
+index c3abbbad4dc48238cdf09f8fd009e7d89a7ea542..cdaeb9773154b1083877a22db4cb06f7d7e97a7e 100644
+--- a/dist/main.js
++++ b/dist/main.js
+@@ -57,7 +57,9 @@ function serveStatic() {
+ const stubMiddleware = (req, res, next) => next();
+ function injectStaticMiddleware(app, middleware) {
+     return __awaiter(this, void 0, void 0, function* () {
+-        app.use(middleware);
++        const config = yield Vite.resolveConfig({}, "build");
++        const base = config.base || '/';
++        app.use(base, middleware);
+         const stubMiddlewareLayer = app._router.stack.find((layer) => layer.handle === stubMiddleware);
+         if (stubMiddlewareLayer !== undefined) {
+             const serveStaticLayer = app._router.stack.pop();
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ac5eb8f0..fabd55dd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,6 +21,9 @@ patchedDependencies:
   moleculer@0.14.23:
     hash: ahhlgpfy57fntn2aftq6beaeja
     path: patches/moleculer@0.14.23.patch
+  vite-express@0.8.0:
+    hash: u6touqej4dt3zxnslnszarl7vq
+    path: patches/vite-express@0.8.0.patch
 
 importers:
 
@@ -1642,8 +1645,8 @@ importers:
         specifier: ^0.2.9
         version: 0.2.9(history@5.3.0)(prop-types@15.8.1)(react-hook-form@7.41.5)(ts-node@10.9.1)
       vite-express:
-        specifier: ^0.5.4
-        version: 0.5.4(express@4.18.2)(vite@4.2.0)
+        specifier: 0.8.0
+        version: 0.8.0(patch_hash=u6touqej4dt3zxnslnszarl7vq)(express@4.18.2)(vite@4.2.0)
     devDependencies:
       '@types/compression':
         specifier: ^1.7.2
@@ -35534,8 +35537,8 @@ packages:
       replace-ext: 1.0.1
     dev: true
 
-  /vite-express@0.5.4(express@4.18.2)(vite@4.2.0):
-    resolution: {integrity: sha512-9M608q41rVISItrUidcqmUFV9g0GcUJDeaPRyuW1ZO/blmhoDNjnPz8hdOglfLhfUp8n3oAHxZZeoRNtCmqIxA==}
+  /vite-express@0.8.0(patch_hash=u6touqej4dt3zxnslnszarl7vq)(express@4.18.2)(vite@4.2.0):
+    resolution: {integrity: sha512-6rTyHMnOpi6+7XIH49MZNKOh4Rv684pKj2fSiJ+mI0xKgomBQkEhzL+Y/6mAmvWcStXSCf4lr7ZR+rRVuVaNCg==}
     peerDependencies:
       express: ^4.18.2
       vite: ^4.0.0
@@ -35547,6 +35550,7 @@ packages:
     transitivePeerDependencies:
       - encoding
     dev: false
+    patched: true
 
   /vite@4.2.0(@types/node@18.16.1):
     resolution: {integrity: sha512-AbDTyzzwuKoRtMIRLGNxhLRuv1FpRgdIw+1y6AQG73Q5+vtecmvzKo/yk8X/vrHDpETRTx01ABijqUHIzBXi0g==}
diff --git a/server/admin-next/package.json b/server/admin-next/package.json
index 96257d51..622c48e2 100644
--- a/server/admin-next/package.json
+++ b/server/admin-next/package.json
@@ -26,7 +26,7 @@
     "react-dom": "^18.2.0",
     "tailchat-server-sdk": "workspace:^",
     "tushan": "^0.2.9",
-    "vite-express": "^0.5.4"
+    "vite-express": "0.8.0"
   },
   "devDependencies": {
     "@types/compression": "^1.7.2",
diff --git a/server/admin-next/vite.config.ts b/server/admin-next/vite.config.ts
index 627a3196..ad4b0d2a 100644
--- a/server/admin-next/vite.config.ts
+++ b/server/admin-next/vite.config.ts
@@ -3,5 +3,6 @@ import react from '@vitejs/plugin-react';
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  base: '/admin',
   plugins: [react()],
 });