sku 0.0.0-webpack-dev-server-2022942468 → 0.0.0-webpack-dev-server-20229554335

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # sku
 
-## 0.0.0-webpack-dev-server-2022942468
+## 0.0.0-webpack-dev-server-20229554335
 
 ### Patch Changes
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sku",
-  "version": "0.0.0-webpack-dev-server-2022942468",
+  "version": "0.0.0-webpack-dev-server-20229554335",
   "description": "Front-end development toolkit, powered by Webpack, Babel, CSS Modules, Less and Jest",
   "main": "index.js",
   "bin": {
@@ -65,15 +65,15 @@
     "@babel/preset-typescript": "^7.12.7",
     "@babel/runtime": "^7.12.5",
     "@loadable/babel-plugin": "^5.13.2",
-    "@loadable/component": "^5.14.1",
-    "@loadable/server": "^5.14.0",
-    "@loadable/webpack-plugin": "^5.14.0",
-    "@pmmmwh/react-refresh-webpack-plugin": "0.5.0-rc.2",
+    "@loadable/component": "^5.15.2",
+    "@loadable/server": "^5.15.2",
+    "@loadable/webpack-plugin": "^5.15.2",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.7",
     "@storybook/builder-webpack5": "^6.3.6",
     "@storybook/manager-webpack5": "^6.3.6",
     "@storybook/react": "^6.3.4",
     "@types/jest": "^27.0.0",
-    "@types/loadable__component": "^5.13.1",
+    "@types/loadable__component": "^5.13.4",
     "@vanilla-extract/babel-plugin": "^1.0.0",
     "@vanilla-extract/webpack-plugin": "^2.0.0",
     "@vocab/core": "^1.1.0",

package/scripts/start-ssr.js

@@ -152,7 +152,7 @@ const localhost = '0.0.0.0';
   onDeath(() => {
     serverManager.kill();
 
-    devServer.close(() => {
+    devServer.stopCallback(() => {
       debug('Webpack dev server closed');
     });
     serverCompiler.close(() => {

package/scripts/start.js

@@ -73,7 +73,6 @@ const hot = process.env.SKU_HOT !== 'false';
   });
 
   const appHosts = getAppHosts();
-  console.log({ appHosts });
 
   const devServerConfig = {
     devMiddleware: {
@@ -119,63 +118,56 @@ const hot = process.env.SKU_HOT !== 'false';
           }
         }
 
-        middlewares.push({
-          name: 'foo',
-          path: '*',
-          middleware: (req, res, next) => {
-            const matchingSiteName = getSiteForHost(req.hostname);
-
-            const matchingRoute = routes.find(({ route, siteIndex }) => {
-              if (
-                typeof siteIndex === 'number' &&
-                matchingSiteName !== sites[siteIndex].name
-              ) {
-                return false;
-              }
-
-              return routeMatcher(route)(req.path);
-            });
+        middlewares.push((req, res, next) => {
+          const matchingSiteName = getSiteForHost(req.hostname);
 
-            if (!matchingRoute) {
-              return next();
+          const matchingRoute = routes.find(({ route, siteIndex }) => {
+            if (
+              typeof siteIndex === 'number' &&
+              matchingSiteName !== sites[siteIndex].name
+            ) {
+              return false;
             }
 
-            let chosenLanguage;
+            return routeMatcher(route)(req.path);
+          });
+
+          if (!matchingRoute) {
+            return next();
+          }
+
+          let chosenLanguage;
+
+          try {
+            chosenLanguage = getLanguageFromRoute(req, matchingRoute);
+          } catch (e) {
+            return res.status(500).send(
+              exceptionFormatter(e, {
+                format: 'html',
+                inlineStyle: true,
+                basepath: 'webpack://static/./',
+              }),
+            );
+          }
 
-            try {
-              chosenLanguage = getLanguageFromRoute(req, matchingRoute);
-            } catch (e) {
-              return res.status(500).send(
-                exceptionFormatter(e, {
+          htmlRenderPlugin
+            .renderWhenReady({
+              route: getRouteWithLanguage(matchingRoute.route, chosenLanguage),
+              routeName: matchingRoute.name,
+              site: matchingSiteName,
+              language: chosenLanguage,
+              environment,
+            })
+            .then((html) => res.send(html))
+            .catch((renderError) => {
+              res.status(500).send(
+                exceptionFormatter(renderError, {
                   format: 'html',
                   inlineStyle: true,
                   basepath: 'webpack://static/./',
                 }),
               );
-            }
-
-            htmlRenderPlugin
-              .renderWhenReady({
-                route: getRouteWithLanguage(
-                  matchingRoute.route,
-                  chosenLanguage,
-                ),
-                routeName: matchingRoute.name,
-                site: matchingSiteName,
-                language: chosenLanguage,
-                environment,
-              })
-              .then((html) => res.send(html))
-              .catch((renderError) => {
-                res.status(500).send(
-                  exceptionFormatter(renderError, {
-                    format: 'html',
-                    inlineStyle: true,
-                    basepath: 'webpack://static/./',
-                  }),
-                );
-              });
-          },
+            });
         });
 
         return middlewares;