Improve webpack compatibility

yandeu · May 20, 2023 · 0e3da30 · 0e3da30
1 parent 1c34b86
commit 0e3da30
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -295,7 +295,7 @@ export default class LiveServer {
 
     // enable CORS
     if (cors) {
-      const myModule = (await import(/*webpackIgnore: true*/ 'cors')).default
+      const myModule = (await import('cors')).default
       app.use(myModule({ credentials: true }))
       // app.use(require('cors')({ credentials: true }))
     }
@@ -334,10 +334,10 @@ export default class LiveServer {
       if (typeof mw === 'string') {
         const ext = path.extname(mw).toLocaleLowerCase()
         if (ext !== '.js') {
-          mw = (await import(/*webpackIgnore: true*/ path.join(__dirname, 'middleware', `${mw}.js`))).default
+          mw = (await import(path.join(__dirname, 'middleware', `${mw}.js`))).default
           // mw = require(path.join(__dirname, 'middleware', `${mw}.js`)).default
         } else {
-          mw = (await import(/*webpackIgnore: true*/ mw)).default
+          mw = (await import(mw)).default
           // mw = require(mw)
         }
         if (typeof mw !== 'function') message.error(`middleware ${mw} does not return a function`, null, false)
@@ -388,7 +388,7 @@ export default class LiveServer {
         via: true
       }
 
-      const { proxyMiddleware } = await import(/*webpackIgnore: true*/ './middleware/proxy.js')
+      const { proxyMiddleware } = await import('./middleware/proxy.js')
       // const { proxyMiddleware } = require('./middleware/proxy')
       // @ts-expect-error
       app.use(ROUTE, proxyMiddleware(proxyOpts, injectBody || false))
@@ -427,7 +427,7 @@ export default class LiveServer {
       let httpsConfig = _https as Certificate
 
       if (typeof _https === 'string') {
-        httpsConfig = (await import(/*webpackIgnore: true*/ path.resolve(process.cwd(), _https))).default
+        httpsConfig = (await import(path.resolve(process.cwd(), _https))).default
         // httpsConfig = require(path.resolve(process.cwd(), _https))
       }
 

diff --git a/src/misc.ts b/src/misc.ts
@@ -37,11 +37,18 @@ export const fileDoesExist = (path: string): Promise<boolean> => {
 export const loadConfigFile = async configPath => {
   let config = {}
 
-  if (os.platform() === 'win32') {
+  // five-server-vscode uses webpack and the code is converted to cjs
+  // @ts-ignore
+  if (typeof WEBPACK_COMMONJS2 !== 'undefined') {
+    delete require.cache[configPath]
+    config = require(configPath)
+  }
+  // on windows we need to add file:// for dynamic file imports
+  else if (os.platform() === 'win32') {
     const p = `file://${configPath}`
-    config = (await import(/*webpackIgnore: true*/ p)).default
+    config = (await import(p)).default
   } else {
-    config = (await import(/*webpackIgnore: true*/ configPath)).default
+    config = (await import(configPath)).default
   }
 
   return config