Style: simplify base path normalization

advplyr · Apr 28, 2023 · 29cd63a · 29cd63a
1 parent 9f6d70e
commit 29cd63a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/client/layouts/default.vue b/client/layouts/default.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="text-white max-h-screen h-screen overflow-hidden bg-bg">
+  <div class="text-white max-h-screen h-screen overflow-hidden bg-bg">
     <app-appbar />
 
     <app-side-rail v-if="isShowingSideRail" class="hidden md:block" />

diff --git a/server/Server.js b/server/Server.js
@@ -327,13 +327,11 @@ class Server {
     }
   }
 
-  // Apply the current RouterBasePath to all `<base>` tags in the client html files
+  // Apply the current RouterBasePath to all html and js files
   async applyClientBasePath() {
-    const basePath = `/${global.RouterBasePath}/`
-      .replace('///', '') // convert base path `"/""` to `""`
-      .replace('//', '/') // Ensure there are single `/` at the front and end
-      .slice(0, -1) // Remove trailing `/`
-    const basePathSlash = `${basePath}/`
+    const basePathSlash = `/${global.RouterBasePath}/`
+      .replace(/\/\/+/, '/') // Ensure there are single `/` at the front and end
+    const basePath = basePathSlash.slice(0, -1) // Remove trailing `/`
     const distPath = Path.join(global.appRoot, '/client/dist')
 
     // Check if the client base path is already set to the current base path