npm - @modern-js/app-tools - Versions diffs - 2.8.1-alpha.0 → 2.8.1-alpha.2 - Mend

@modern-js/app-tools 2.8.1-alpha.0 → 2.8.1-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (137) hide show

package/dist/cjs/analyze/generateCode.js CHANGED Viewed

@@ -99,7 +99,6 @@ const generateCode = async (appContext, config, entrypoints, api) => {
   const getRoutes = isV5 ? import_getClientRoutes.getClientRoutesLegacy : import_getClientRoutes.getClientRoutes;
   await Promise.all(entrypoints.map(generateEntryCode));
   async function generateEntryCode(entrypoint) {
-    var _a;
     const { entryName, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
     if (isAutoMount) {
       if (fileSystemRoutes) {
@@ -162,8 +161,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             ssrMode: useSSG ? "string" : mode,
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
-            internalDirectory,
-            splitRoutesChunks: (_a = config2 == null ? void 0 : config2.output) == null ? void 0 : _a.splitRoutesChunks
+            internalDirectory
           })
         });
         if (entrypoint.nestedRoutesEntry && (0, import_utils.isUseSSRBundle)(config2)) {

package/dist/cjs/analyze/index.js CHANGED Viewed

@@ -247,14 +247,6 @@ var analyze_default = ({
           imports
         };
       },
-      validateSchema() {
-        return {
-          target: "output.splitRoutesChunks",
-          schema: {
-            type: "boolean"
-          }
-        };
-      },
       async fileChange(e) {
         const appContext = api.useAppContext();
         const { appDirectory } = appContext;

package/dist/cjs/analyze/templates.js CHANGED Viewed

@@ -110,10 +110,10 @@ const html = (partials) => `
   </script>
   ${partials.head.join("\n")}
-  <!--<?- chunksMap.css ?>-->
 </head>
 <body>
+  <!--<?- chunksMap.css ?>-->
   <noscript>
     We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.
   </noscript>
@@ -182,10 +182,8 @@ const fileSystemRoutes = async ({
   ssrMode,
   nestedRoutesEntry,
   entryName,
-  internalDirectory,
-  splitRoutesChunks = true
+  internalDirectory
 }) => {
-  const components = [];
   const loadings = [];
   const errors = [];
   const loaders = [];
@@ -244,30 +242,20 @@ const fileSystemRoutes = async ({
         };
       }
       if (route._component) {
-        if (splitRoutesChunks) {
-          if (route.isRoot) {
-            rootLayoutCode = `import RootLayout from '${route._component}'`;
-            component = `RootLayout`;
-          } else if (ssrMode === "string") {
-            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
-            component = `loadable(${lazyImport})`;
-          } else {
-            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
-            component = `lazy(${lazyImport})`;
-          }
+        if (route.isRoot) {
+          rootLayoutCode = `import RootLayout from '${route._component}'`;
+          component = `RootLayout`;
+        } else if (ssrMode === "string") {
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+          component = `loadable(${lazyImport})`;
         } else {
-          components.push(route._component);
-          component = `component_${components.length - 1}`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+          component = `lazy(${lazyImport})`;
         }
       }
     } else if (route._component) {
-      if (splitRoutesChunks) {
-        lazyImport = `() => import('${route._component}')`;
-        component = `loadable(${lazyImport})`;
-      } else {
-        components.push(route._component);
-        component = `component_${components.length - 1}`;
-      }
+      lazyImport = `() => import('${route._component}')`;
+      component = `loadable(${lazyImport})`;
     }
     const finalRoute = {
       ...route,
@@ -288,24 +276,20 @@ const fileSystemRoutes = async ({
   for (const route of routes) {
     if ("type" in route) {
       const newRoute = traverseRouteTree(route);
-      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/("component":\s)"([^"]+)"/g, "$1$2").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
+      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"]+)"/g, "$1").replace(/"(loader_[^"]+)"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"]+)"/g, "$1").replace(/\\"/g, '"')},`;
     } else {
       const component = `loadable(() => import('${route._component}'))`;
       const finalRoute = {
         ...route,
         component
       };
-      routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy[^"]*)"/g, "$2")},`;
+      routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(lazy[^"]*)"/g, "$1")},`;
     }
   }
   routeComponentsCode += `
 ];`;
   const importLoadingCode = loadings.map((loading, index2) => {
     return `import loading_${index2} from '${loading}';
-`;
-  }).join("");
-  const importComponentsCode = components.map((component, index2) => {
-    return `import component_${index2} from '${component}';
 `;
   }).join("");
   const importErrorComponentsCode = errors.map((error, index2) => {
@@ -330,7 +314,6 @@ const fileSystemRoutes = async ({
   await import_utils.fs.writeJSON(loadersMapFile, loadersMap);
   return `
     ${importLazyCode}
-    ${importComponentsCode}
     ${rootLayoutCode}
     ${importLoadingCode}
     ${importErrorComponentsCode}

package/dist/cjs/builder/index.js CHANGED Viewed

@@ -30,10 +30,12 @@ __export(builder_exports, {
   createBuilderGenerator: () => createBuilderGenerator
 });
 module.exports = __toCommonJS(builder_exports);
+var import_utils = require("@modern-js/utils");
 async function createBuilderGenerator(bundler) {
   if (bundler === "rspack") {
     try {
       const { createRspackBuilderForModern } = await Promise.resolve().then(() => __toESM(require("./builder-rspack")));
+      import_utils.logger.info("Using Rspack ✨");
       return createRspackBuilderForModern;
     } catch (_) {
       throw new Error(

package/dist/esm/analyze/generateCode.js CHANGED Viewed

@@ -245,7 +245,7 @@ var generateCode = function() {
         }
         function _generateEntryCode() {
             _generateEntryCode = _asyncToGenerator(function(entrypoint) {
-                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, _config2_output, initialRoutes, nestedRoute, routes, config2, ssr, useSSG, mode, hasPageRoute, _ref, code2, _, _tmp, routesServerFile, code3, serverLoaderCombined, serverLoaderFile, _ref1, importStatements, plugins, _ref2, renderFunction, exportStatement, code, entryFile, _ref3, asyncEntryCode, bootstrapFile;
+                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, routes, config2, ssr, useSSG, mode, hasPageRoute, _ref, code2, _, _tmp, routesServerFile, code3, serverLoaderCombined, serverLoaderFile, _ref1, importStatements, plugins, _ref2, renderFunction, exportStatement, code, entryFile, _ref3, asyncEntryCode, bootstrapFile;
                 return __generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
@@ -322,8 +322,7 @@ var generateCode = function() {
                                     ssrMode: useSSG ? "string" : mode,
                                     nestedRoutesEntry: entrypoint.nestedRoutesEntry,
                                     entryName: entrypoint.entryName,
-                                    internalDirectory: internalDirectory,
-                                    splitRoutesChunks: config2 === null || config2 === void 0 ? void 0 : (_config2_output = config2.output) === null || _config2_output === void 0 ? void 0 : _config2_output.splitRoutesChunks
+                                    internalDirectory: internalDirectory
                                 })
                             ];
                         case 4:

package/dist/esm/analyze/index.js CHANGED Viewed

@@ -638,14 +638,6 @@ var analyze_default = function(param) {
                         });
                     })();
                 },
-                validateSchema: function validateSchema() {
-                    return {
-                        target: "output.splitRoutesChunks",
-                        schema: {
-                            type: "boolean"
-                        }
-                    };
-                },
                 fileChange: function fileChange(e) {
                     return _asyncToGenerator(function() {
                         var appContext, appDirectory, filename, eventType, isPageFile, absoluteFilePath, isRouteComponent, resolvedConfig, generateCode, entrypoints;

package/dist/esm/analyze/templates.js CHANGED Viewed

@@ -237,7 +237,7 @@ var renderFunction = function(param) {
     }).join("\n"), "\n    ]\n  })(").concat(fileSystemRoutes2 ? "" : "App", ")\n\n\n  if(!AppWrapper.init && typeof appInit !== 'undefined') {\n    AppWrapper.init = appInit;\n  }\n\n\n  if (IS_BROWSER) {\n    ").concat(customBootstrap ? "customBootstrap(AppWrapper, () => ".concat(bootstrap, ");") : "".concat(bootstrap, ";"), "\n  }\n\n  return AppWrapper\n");
 };
 var html = function(partials) {
-    return "\n<!DOCTYPE html>\n<html>\n<head>\n  <%= meta %>\n  <title><%= title %></title>\n\n  ".concat(partials.top.join("\n"), "\n\n  <script>\n    window.__assetPrefix__ = '<%= assetPrefix %>';\n  </script>\n  ").concat(partials.head.join("\n"), "\n\n  <!--<?- chunksMap.css ?>-->\n</head>\n\n<body>\n  <noscript>\n    We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.\n  </noscript>\n  <div id=\"<%= mountId %>\"><!--<?- html ?>--></div>\n  ").concat(partials.body.join("\n"), "\n  <!--<?- chunksMap.js ?>-->\n  <!--<?- SSRDataScript ?>-->\n  <!--<?- bottomTemplate ?>-->\n</body>\n\n</html>\n");
+    return "\n<!DOCTYPE html>\n<html>\n<head>\n  <%= meta %>\n  <title><%= title %></title>\n\n  ".concat(partials.top.join("\n"), "\n\n  <script>\n    window.__assetPrefix__ = '<%= assetPrefix %>';\n  </script>\n  ").concat(partials.head.join("\n"), "\n\n</head>\n\n<body>\n  <!--<?- chunksMap.css ?>-->\n  <noscript>\n    We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.\n  </noscript>\n  <div id=\"<%= mountId %>\"><!--<?- html ?>--></div>\n  ").concat(partials.body.join("\n"), "\n  <!--<?- chunksMap.js ?>-->\n  <!--<?- SSRDataScript ?>-->\n  <!--<?- bottomTemplate ?>-->\n</body>\n\n</html>\n");
 };
 var routesForServer = function(param) {
     var routes = param.routes;
@@ -298,12 +298,11 @@ var routesForServer = function(param) {
 };
 var fileSystemRoutes = function() {
     var _ref = _asyncToGenerator(function(param) {
-        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, _param_splitRoutesChunks, splitRoutesChunks, components, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importComponentsCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo;
+        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory, _param_splitRoutesChunks = param.splitRoutesChunks, splitRoutesChunks = _param_splitRoutesChunks === void 0 ? true : _param_splitRoutesChunks;
-                    components = [];
+                    routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory;
                     loadings = [];
                     errors = [];
                     loaders = [];
@@ -352,30 +351,20 @@ var fileSystemRoutes = function() {
                                 };
                             }
                             if (route._component) {
-                                if (splitRoutesChunks) {
-                                    if (route.isRoot) {
-                                        rootLayoutCode = "import RootLayout from '".concat(route._component, "'");
-                                        component = "RootLayout";
-                                    } else if (ssrMode === "string") {
-                                        lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
-                                        component = "loadable(".concat(lazyImport, ")");
-                                    } else {
-                                        lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
-                                        component = "lazy(".concat(lazyImport, ")");
-                                    }
+                                if (route.isRoot) {
+                                    rootLayoutCode = "import RootLayout from '".concat(route._component, "'");
+                                    component = "RootLayout";
+                                } else if (ssrMode === "string") {
+                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
+                                    component = "loadable(".concat(lazyImport, ")");
                                 } else {
-                                    components.push(route._component);
-                                    component = "component_".concat(components.length - 1);
+                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
+                                    component = "lazy(".concat(lazyImport, ")");
                                 }
                             }
                         } else if (route._component) {
-                            if (splitRoutesChunks) {
-                                lazyImport = "() => import('".concat(route._component, "')");
-                                component = "loadable(".concat(lazyImport, ")");
-                            } else {
-                                components.push(route._component);
-                                component = "component_".concat(components.length - 1);
-                            }
+                            lazyImport = "() => import('".concat(route._component, "')");
+                            component = "loadable(".concat(lazyImport, ")");
                         }
                         var finalRoute = _objectSpreadProps(_objectSpread({}, route), {
                             lazyImport: lazyImport,
@@ -396,13 +385,13 @@ var fileSystemRoutes = function() {
                             route = _step.value;
                             if ("type" in route) {
                                 newRoute = traverseRouteTree(route);
-                                routeComponentsCode += "".concat(JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/("component":\s)"([^"]+)"/g, "$1$2").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"'), ",");
+                                routeComponentsCode += "".concat(JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"]+)"/g, "$1").replace(/"(loader_[^"]+)"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"]+)"/g, "$1").replace(/\\"/g, '"'), ",");
                             } else {
                                 component = "loadable(() => import('".concat(route._component, "'))");
                                 finalRoute = _objectSpreadProps(_objectSpread({}, route), {
                                     component: component
                                 });
-                                routeComponentsCode += "".concat(JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy[^"]*)"/g, "$2"), ",");
+                                routeComponentsCode += "".concat(JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(lazy[^"]*)"/g, "$1"), ",");
                             }
                         }
                     } catch (err) {
@@ -423,9 +412,6 @@ var fileSystemRoutes = function() {
                     importLoadingCode = loadings.map(function(loading, index2) {
                         return "import loading_".concat(index2, " from '").concat(loading, "';\n");
                     }).join("");
-                    importComponentsCode = components.map(function(component, index2) {
-                        return "import component_".concat(index2, " from '").concat(component, "';\n");
-                    }).join("");
                     importErrorComponentsCode = errors.map(function(error, index2) {
                         return "import error_".concat(index2, " from '").concat(error, "';\n");
                     }).join("");
@@ -468,7 +454,7 @@ var fileSystemRoutes = function() {
                     _state.sent();
                     return [
                         2,
-                        "\n    ".concat(importLazyCode, "\n    ").concat(importComponentsCode, "\n    ").concat(rootLayoutCode, "\n    ").concat(importLoadingCode, "\n    ").concat(importErrorComponentsCode, "\n    ").concat(importLoadersCode, "\n    ").concat(routeComponentsCode, "\n  ")
+                        "\n    ".concat(importLazyCode, "\n    ").concat(rootLayoutCode, "\n    ").concat(importLoadingCode, "\n    ").concat(importErrorComponentsCode, "\n    ").concat(importLoadersCode, "\n    ").concat(routeComponentsCode, "\n  ")
                     ];
             }
         });

package/dist/esm/builder/index.js CHANGED Viewed

@@ -122,6 +122,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
+import { logger } from "@modern-js/utils";
 function createBuilderGenerator(bundler) {
     return _createBuilderGenerator.apply(this, arguments);
 }
@@ -149,6 +150,7 @@ function _createBuilderGenerator() {
                     ];
                 case 2:
                     createRspackBuilderForModern = _state.sent().createRspackBuilderForModern;
+                    logger.info("Using Rspack ✨");
                     return [
                         2,
                         createRspackBuilderForModern

package/dist/esm-node/analyze/generateCode.js CHANGED Viewed

@@ -81,7 +81,6 @@ const generateCode = async (appContext, config, entrypoints, api) => {
   const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
   await Promise.all(entrypoints.map(generateEntryCode));
   async function generateEntryCode(entrypoint) {
-    var _a;
     const { entryName, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
     if (isAutoMount) {
       if (fileSystemRoutes) {
@@ -144,8 +143,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             ssrMode: useSSG ? "string" : mode,
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
-            internalDirectory,
-            splitRoutesChunks: (_a = config2 == null ? void 0 : config2.output) == null ? void 0 : _a.splitRoutesChunks
+            internalDirectory
           })
         });
         if (entrypoint.nestedRoutesEntry && isUseSSRBundle(config2)) {

package/dist/esm-node/analyze/index.js CHANGED Viewed

@@ -227,14 +227,6 @@ var analyze_default = ({
           imports
         };
       },
-      validateSchema() {
-        return {
-          target: "output.splitRoutesChunks",
-          schema: {
-            type: "boolean"
-          }
-        };
-      },
       async fileChange(e) {
         const appContext = api.useAppContext();
         const { appDirectory } = appContext;

package/dist/esm-node/analyze/templates.js CHANGED Viewed

@@ -73,10 +73,10 @@ const html = (partials) => `
   </script>
   ${partials.head.join("\n")}
-  <!--<?- chunksMap.css ?>-->
 </head>
 <body>
+  <!--<?- chunksMap.css ?>-->
   <noscript>
     We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.
   </noscript>
@@ -145,10 +145,8 @@ const fileSystemRoutes = async ({
   ssrMode,
   nestedRoutesEntry,
   entryName,
-  internalDirectory,
-  splitRoutesChunks = true
+  internalDirectory
 }) => {
-  const components = [];
   const loadings = [];
   const errors = [];
   const loaders = [];
@@ -207,30 +205,20 @@ const fileSystemRoutes = async ({
         };
       }
       if (route._component) {
-        if (splitRoutesChunks) {
-          if (route.isRoot) {
-            rootLayoutCode = `import RootLayout from '${route._component}'`;
-            component = `RootLayout`;
-          } else if (ssrMode === "string") {
-            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
-            component = `loadable(${lazyImport})`;
-          } else {
-            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
-            component = `lazy(${lazyImport})`;
-          }
+        if (route.isRoot) {
+          rootLayoutCode = `import RootLayout from '${route._component}'`;
+          component = `RootLayout`;
+        } else if (ssrMode === "string") {
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+          component = `loadable(${lazyImport})`;
         } else {
-          components.push(route._component);
-          component = `component_${components.length - 1}`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+          component = `lazy(${lazyImport})`;
         }
       }
     } else if (route._component) {
-      if (splitRoutesChunks) {
-        lazyImport = `() => import('${route._component}')`;
-        component = `loadable(${lazyImport})`;
-      } else {
-        components.push(route._component);
-        component = `component_${components.length - 1}`;
-      }
+      lazyImport = `() => import('${route._component}')`;
+      component = `loadable(${lazyImport})`;
     }
     const finalRoute = {
       ...route,
@@ -251,24 +239,20 @@ const fileSystemRoutes = async ({
   for (const route of routes) {
     if ("type" in route) {
       const newRoute = traverseRouteTree(route);
-      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/("component":\s)"([^"]+)"/g, "$1$2").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
+      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"]+)"/g, "$1").replace(/"(loader_[^"]+)"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"]+)"/g, "$1").replace(/\\"/g, '"')},`;
     } else {
       const component = `loadable(() => import('${route._component}'))`;
       const finalRoute = {
         ...route,
         component
       };
-      routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy[^"]*)"/g, "$2")},`;
+      routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(lazy[^"]*)"/g, "$1")},`;
     }
   }
   routeComponentsCode += `
 ];`;
   const importLoadingCode = loadings.map((loading, index2) => {
     return `import loading_${index2} from '${loading}';
-`;
-  }).join("");
-  const importComponentsCode = components.map((component, index2) => {
-    return `import component_${index2} from '${component}';
 `;
   }).join("");
   const importErrorComponentsCode = errors.map((error, index2) => {
@@ -293,7 +277,6 @@ const fileSystemRoutes = async ({
   await fs.writeJSON(loadersMapFile, loadersMap);
   return `
     ${importLazyCode}
-    ${importComponentsCode}
     ${rootLayoutCode}
     ${importLoadingCode}
     ${importErrorComponentsCode}

package/dist/esm-node/builder/index.js CHANGED Viewed

@@ -1,7 +1,9 @@
+import { logger } from "@modern-js/utils";
 async function createBuilderGenerator(bundler) {
   if (bundler === "rspack") {
     try {
       const { createRspackBuilderForModern } = await import("./builder-rspack");
+      logger.info("Using Rspack ✨");
       return createRspackBuilderForModern;
     } catch (_) {
       throw new Error(

package/dist/js/modern/analyze/constants.js CHANGED Viewed

@@ -23,7 +23,9 @@ const NESTED_ROUTE = {
   PAGE_LOADER_FILE: "page.loader",
   LOADING_FILE: "loading",
   ERROR_FILE: "error",
-  LOADER_FILE: "loader"
+  LOADER_FILE: "loader",
+  SPLATE_FILE: "$",
+  SPLATE_LOADER_FILE: "$.loader"
 };
 const APP_CONFIG_NAME = "config";
 const APP_INIT_EXPORTED = "init";

package/dist/js/modern/analyze/getServerRoutes.js CHANGED Viewed

@@ -38,7 +38,8 @@ import {
   getEntryOptions,
   SERVER_BUNDLE_DIRECTORY,
   MAIN_ENTRY_NAME,
-  removeTailSlash
+  removeTailSlash,
+  SERVER_WORKER_BUNDLE_DIRECTORY
 } from "@modern-js/utils";
 import { walkDirectory } from "./utils";
 const applyBaseUrl = (baseUrl, routes) => {
@@ -101,7 +102,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
   const {
     html: { disableHtmlFolder },
     output: { distPath: { html: htmlPath } = {} },
-    server: { baseUrl, routes, ssr, ssrByEntries }
+    server: { baseUrl, routes, ssr, ssrByEntries, worker }
   } = config;
   const { packageName } = appContext;
   let htmlRoutes = entrypoints.reduce(
@@ -113,6 +114,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
         packageName
       );
       const isSSR = Boolean(entryOptions);
+      const isWorker = Boolean(worker);
       const { resHeaders } = (routes == null ? void 0 : routes[entryName]) || {};
       let route = {
         urlPath: `/${entryName === MAIN_ENTRY_NAME ? "" : entryName}`,
@@ -125,6 +127,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
         isSPA: true,
         isSSR,
         responseHeaders: resHeaders,
+        worker: isWorker ? `${SERVER_WORKER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0,
         bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
       };
       if (routes == null ? void 0 : routes.hasOwnProperty(entryName)) {

package/dist/js/modern/analyze/index.js CHANGED Viewed

@@ -49,12 +49,12 @@ import {
   isDevCommand
 } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
-import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
 import { generateRoutes } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
 import { getSelectedEntries } from "../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../config";
+import { createBuilderGenerator } from "../builder";
 import {
   getServerLoadersFile,
   isPageComponentFile,
@@ -67,7 +67,9 @@ import {
   APP_INIT_IMPORTED
 } from "./constants";
 const debug = createDebugger("plugin-analyze");
-var analyze_default = () => ({
+var analyze_default = ({
+  bundler
+}) => ({
   name: "@modern-js/plugin-analyze",
   setup: (api) => {
     let pagesDir = [];
@@ -159,56 +161,55 @@ var analyze_default = () => ({
           if (buildCommands.includes(command)) {
             let _b;
             const normalizedConfig = api.useResolvedConfigContext();
+            const createBuilderForModern = yield createBuilderGenerator(bundler);
             const builder = yield createBuilderForModern({
               normalizedConfig,
               appContext,
-              compatPluginConfig: {
-                onBeforeBuild(_0) {
-                  return __async(this, arguments, function* ({ bundlerConfigs }) {
-                    const hookRunners2 = api.useHookRunners();
-                    yield generateRoutes(appContext);
-                    yield hookRunners2.beforeBuild({ bundlerConfigs });
+              onBeforeBuild(_0) {
+                return __async(this, arguments, function* ({ bundlerConfigs }) {
+                  const hookRunners2 = api.useHookRunners();
+                  yield generateRoutes(appContext);
+                  yield hookRunners2.beforeBuild({
+                    bundlerConfigs
                   });
-                },
-                onAfterBuild(_0) {
-                  return __async(this, arguments, function* ({ stats }) {
-                    const hookRunners2 = api.useHookRunners();
-                    yield hookRunners2.afterBuild({ stats });
-                    yield emitResolvedConfig(
-                      appContext.appDirectory,
-                      normalizedConfig
-                    );
-                  });
-                },
-                onDevCompileDone(_0) {
-                  return __async(this, arguments, function* ({ isFirstCompile }) {
-                    const hookRunners2 = api.useHookRunners();
-                    if (process.stdout.isTTY || isFirstCompile) {
-                      hookRunners2.afterDev();
-                      if (isFirstCompile) {
-                        printInstructions(
-                          hookRunners2,
-                          appContext,
-                          normalizedConfig
-                        );
-                      }
+                });
+              },
+              onAfterBuild(_0) {
+                return __async(this, arguments, function* ({ stats }) {
+                  const hookRunners2 = api.useHookRunners();
+                  yield hookRunners2.afterBuild({ stats });
+                  yield emitResolvedConfig(
+                    appContext.appDirectory,
+                    normalizedConfig
+                  );
+                });
+              },
+              onDevCompileDone(_0) {
+                return __async(this, arguments, function* ({ isFirstCompile }) {
+                  const hookRunners2 = api.useHookRunners();
+                  if (process.stdout.isTTY || isFirstCompile) {
+                    hookRunners2.afterDev();
+                    if (isFirstCompile) {
+                      printInstructions(hookRunners2, appContext, normalizedConfig);
                     }
+                  }
+                });
+              },
+              onBeforeCreateCompiler(_0) {
+                return __async(this, arguments, function* ({ bundlerConfigs }) {
+                  const hookRunners2 = api.useHookRunners();
+                  yield hookRunners2.beforeCreateCompiler({
+                    bundlerConfigs
                   });
-                },
-                onBeforeCreateCompiler(_0) {
-                  return __async(this, arguments, function* ({ bundlerConfigs }) {
-                    const hookRunners2 = api.useHookRunners();
-                    yield hookRunners2.beforeCreateCompiler({
-                      bundlerConfigs
-                    });
-                  });
-                },
-                onAfterCreateCompiler(_0) {
-                  return __async(this, arguments, function* ({ compiler }) {
-                    const hookRunners2 = api.useHookRunners();
-                    yield hookRunners2.afterCreateCompiler({ compiler });
+                });
+              },
+              onAfterCreateCompiler(_0) {
+                return __async(this, arguments, function* ({ compiler }) {
+                  const hookRunners2 = api.useHookRunners();
+                  yield hookRunners2.afterCreateCompiler({
+                    compiler
                   });
-                }
+                });
               }
             });
             builder.addPlugins(resolvedConfig.builderPlugins);
@@ -251,7 +252,7 @@ var analyze_default = () => ({
       },
       resolvedConfig({ resolved }) {
         const appContext = api.useAppContext();
-        const config = initialNormalizedConfig(resolved, appContext);
+        const config = initialNormalizedConfig(resolved, appContext, bundler);
         return {
           resolved: config
         };