fix: /config endpoint resolving

Author: Yukaii

app.js

@@ -71,14 +71,27 @@ async function initializeApp () {
     try {
       const vite = require('vite')
       viteServer = await vite.createServer({
-        server: { middlewareMode: true },
+        server: {
+          middlewareMode: true,
+          fs: {
+            strict: true, // Strict file serving
+            allow: [__dirname] // Only allow serving from the project root
+          }
+        },
         appType: 'custom',
-        root: __dirname, // Ensure root is set
-        base: '/'
+        root: __dirname,
+        base: '/.vite/' // Set custom base path for Vite assets
       })
-      // Use vite's connect instance as middleware *before* anything else
-      app.use(viteServer.middlewares)
-      logger.info('Vite middleware enabled.')
+
+      // Only use Vite middleware for paths that start with /.vite/
+      app.use((req, res, next) => {
+        if (req.path.startsWith('/.vite/')) {
+          return viteServer.middlewares(req, res, next)
+        }
+        next()
+      })
+
+      logger.info('Vite middleware enabled for /.vite/ path only.')
     } catch (e) {
       logger.error('Failed to create Vite server:', e)
       process.exit(1)

lib/vite-helpers.js

@@ -68,10 +68,10 @@ function getViteAssets (entryName) {
       console.warn(`Vite manifest entry not found for: ${entryKey}`)
     }
   } else {
-    // In development, Vite handles everything through its dev server
-    assets.js.push(`/@vite/client`) // Vite HMR client
-    // Request the actual file path relative to the project root
-    assets.js.push(`/public/js/${entryName}.js`)
+    // In development, Vite now uses a custom base path
+    assets.js.push(`/.vite/@vite/client`) // Vite HMR client with custom base
+    // Request the actual file path relative to the project root with the custom base
+    assets.js.push(`/.vite/public/js/${entryName}.js`)
   }
 
   return assets

public/js/extra.js

@@ -3,7 +3,7 @@
 
 import Prism from 'prismjs'
 import hljs from 'highlight.js'
-import * as PDFObject from 'pdfobject'
+import PDFObject from 'pdfobject'
 import { saveAs } from 'file-saver'
 
 import escapeHTML from 'lodash/escape'

public/js/index.js

@@ -102,7 +102,7 @@ import '@hackmd/ot/lib/undo-manager'
 // import '@hackmd/ot/lib/client'
 import '@hackmd/ot/lib/editor-client'
 
-import * as mousewhell from 'jquery-mousewheel'
+import mousewhell from 'jquery-mousewheel'
 import '@vendor/jquery-textcomplete/jquery.textcomplete'
 import '@vendor/jquery-ui/jquery-ui.min.js'
 import '@vendor/bootstrap/tooltip.min.js'

public/js/lib/editor/index.js

@@ -70,8 +70,8 @@ import debounce from 'lodash/debounce'
 
 import * as utils from './utils'
 import config from './config'
-import statusBarTemplate from './statusbar.html'
-import toolBarTemplate from './toolbar.html'
+import statusBarTemplate from './statusbar.html?raw'
+import toolBarTemplate from './toolbar.html?raw'
 import { linterOptions } from './markdown-lint'
 import CodeMirrorSpellChecker, { supportLanguages, supportLanguageCodes } from './spellcheck'
 import { initTableEditor } from './table-editor'

public/views/codimd/foot.ejs

@@ -33,4 +33,5 @@
 <!-- <%- include('../build/index-pack-scripts') %> -->
 <% } %>
 
+<script src="<%- serverURL %>/config"></script>
 <%- generateTags(viteAssets('index')).jsTags %>

public/views/index/foot.ejs

@@ -12,4 +12,5 @@
 <%# Old webpack includes removed %>
 <% } %>
 <%# Inject Vite JS assets for the 'index' entry point %>
+<script src="<%- serverURL %>/config"></script>
 <%- generateTags(viteAssets('cover')).jsTags %>

public/views/pretty.ejs

@@ -114,5 +114,6 @@
 <%# Old webpack includes removed %>
 <% } %>
 <%# Inject Vite JS assets for the 'pretty' entry point %>
+<script src="<%- serverURL %>/config"></script>
 <%- generateTags(viteAssets('pretty')).jsTags %>
 <%- include('shared/ga') %>

public/views/slide.ejs

@@ -125,6 +125,7 @@
         <%# Old webpack includes removed %>
         <% } %>
         <%# Inject Vite JS assets for the 'slide' entry point %>
+        <script src="<%- serverURL %>/config"></script>
         <%- generateTags(viteAssets('slide')).jsTags %>
     </body>
 </html>

vite.config.js

@@ -25,9 +25,9 @@ export default defineConfig({
       // Add exclude for HTML files to prevent inject plugin from processing them
       exclude: ['**/*.html', '**/*.css']
     }),
-    string({
-      include: '**/*.html'
-    }),
+    // string({
+    //   include: '**/*.html'
+    // }),
     copy({
       targets: [
         {
@@ -143,7 +143,7 @@ export default defineConfig({
     ot: {} // Define ot as empty object for browser compatibility
   },
   root: __dirname,
-  base: '/',
+  base: '/.vite/', // Updated to match our custom base path in app.js
   publicDir: false, // Let Vite handle all assets through middleware
   appType: 'custom',
   optimizeDeps: {
@@ -166,14 +166,15 @@ export default defineConfig({
     ws: true,
     hmr: {
       protocol: 'ws',
-      host: 'localhost'
+      host: 'localhost',
+      path: '/.vite/hmr' // Specify a custom HMR path
     },
     fs: {
+      strict: true, // Only serve explicitly allowed files
       allow: [
         path.resolve(__dirname),
         path.resolve(__dirname, 'node_modules')
-      ],
-      strict: false
+      ]
     }
   }
 })