@best-shot/dev-server 0.16.0 → 0.17.1

package/lib/action.mjs

@@ -73,9 +73,13 @@ export function action({ _: [command] }) {
     if (shouldServe.length > 0) {
       const { DevServer } = await import('./server.mjs');
 
+      process.env.WEBPACK_DEV_SERVER_BASE_PORT = 1234;
+
       shouldServe.forEach((config) => {
         const compiler = createCompiler(config);
-        DevServer(compiler, config.devServer);
+        const instance = new DevServer(config.devServer, compiler);
+
+        instance.start();
       });
     }
   });

package/lib/server.mjs

@@ -5,74 +5,71 @@ import { notFound } from '../middleware/not-found/index.mjs';
 import { staticFile } from '../middleware/static-file/index.mjs';
 import * as waitPage from '../middleware/wait-page/index.mjs';
 
-export function DevServer(compiler, { setupMiddlewares, ...options }) {
-  waitPage.apply(compiler);
+export class DevServer extends WebpackDevServer {
+  constructor(options, compiler) {
+    waitPage.apply(compiler);
 
-  process.env.WEBPACK_DEV_SERVER_BASE_PORT = 1234;
+    const publicPath = options.publicPath ?? compiler.options.output.publicPath;
 
-  const publicPath = options.publicPath || compiler.options.output.publicPath;
+    /* eslint-disable no-param-reassign */
 
-  /* eslint-disable no-param-reassign */
+    options.proxy &&= (
+      Array.isArray(options.proxy) ? options.proxy : [options.proxy]
+    ).map((item) => ({
+      changeOrigin: true,
+      secure: false,
+      ...item,
+    }));
 
-  options.hot ??= 'only';
-  options.static ??= false;
-  options.allowedHosts ??= ['all'];
+    options.hot ??= 'only';
+    options.static ??= false;
+    options.allowedHosts ??= ['all'];
 
-  if (options.proxy !== undefined) {
-    for (const item of Object.values(options.proxy)) {
-      if (item) {
-        item.changeOrigin ??= true;
-        item.secure ??= false;
-      }
+    if (options.port === 443) {
+      options.server ??= {};
+      options.server.type ??= 'https';
     }
-  }
 
-  /* eslint-enable no-param-reassign */
+    /* eslint-enable no-param-reassign */
 
-  const Server = new WebpackDevServer(
-    {
-      ...options,
-      setupMiddlewares(middlewares, devServer) {
-        if (process.env.TERM_PROGRAM === 'vscode') {
-          devServer.app.use('/__open-in-editor', launchMiddleware('code'));
-        }
+    super(
+      {
+        ...options,
+        setupMiddlewares(middlewares, devServer) {
+          if (process.env.TERM_PROGRAM === 'vscode') {
+            devServer.app.use('/__open-in-editor', launchMiddleware('code'));
+          }
 
-        devServer.app.use(staticFile());
+          devServer.app.use(staticFile());
 
-        middlewares.unshift({
-          name: 'webpack-wait-page',
-          middleware: waitPage.middleware(devServer),
-        });
+          devServer.app.use(waitPage.middleware(devServer));
 
-        if (publicPath.startsWith('/')) {
-          const index = middlewares.findIndex(
-            ({ name }) => name === 'connect-history-api-fallback',
-          );
+          if (publicPath.startsWith('/')) {
+            const index = middlewares.findIndex(
+              ({ name }) => name === 'connect-history-api-fallback',
+            );
 
-          if (index > -1) {
-            // eslint-disable-next-line no-param-reassign
-            middlewares[index].path = publicPath;
+            if (index > -1) {
+              // eslint-disable-next-line no-param-reassign
+              middlewares[index].path = publicPath;
+            }
           }
-        }
 
-        middlewares.push({
-          name: 'page-not-found',
-          middleware: notFound({
-            publicPath: publicPath.startsWith('/') ? publicPath : '/',
-          }),
-        });
+          middlewares.push({
+            name: 'page-not-found',
+            middleware: notFound({
+              publicPath: publicPath.startsWith('/') ? publicPath : '/',
+            }),
+          });
 
-        if (typeof setupMiddlewares === 'function') {
-          return setupMiddlewares(middlewares, devServer);
-        }
+          if (typeof options.setupMiddlewares === 'function') {
+            options.setupMiddlewares(middlewares, devServer);
+          }
 
-        return middlewares;
+          return middlewares;
+        },
       },
-    },
-    compiler,
-  );
-
-  Server.start();
-
-  return Server;
+      compiler,
+    );
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@best-shot/dev-server",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "description": "DevServer support of `@best-shot/cli`",
   "license": "MIT",
   "author": {
@@ -36,7 +36,7 @@
     "ejs": "^3.1.9",
     "express": "^4.18.2",
     "launch-editor-middleware": "^2.6.1",
-    "webpack-dev-server": "^4.15.1",
+    "webpack-dev-server": "^5.0.2",
     "webpack-dev-server-waitpage": "^2.1.1",
     "@best-shot/config": "^0.5.0"
   },