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

package/dist/cjs/analyze/templates.js

@@ -275,17 +275,12 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
             lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
             component = `lazy(${lazyImport})`;
           }
+        } else if (ssrMode === "string") {
+          components.push(route._component);
+          component = `component_${components.length - 1}`;
         } else {
           lazyImport = `() => import(/* webpackMode: "eager" */  '${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
-          if (route.isRoot) {
-            lazyImport = `() => import('${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
-            rootLayoutCode = `import RootLayout from '${route._component}'`;
-            component = `RootLayout`;
-          } else if (ssrMode === "string") {
-            component = `loadable(${lazyImport})`;
-          } else {
-            component = `lazy(${lazyImport})`;
-          }
+          component = `lazy(${lazyImport})`;
         }
       }
     } else if (route._component) {

package/dist/esm/analyze/templates.js

@@ -220,17 +220,12 @@ var fileSystemRoutes = function() {
                     lazyImport = '() => import(/* webpackChunkName: "'.concat(route2.id, `" */  '`).concat(route2._component, `').then(routeModule => handleRouteModule(routeModule, "`).concat(route2.id, '")).catch(handleRouteModuleError) ');
                     component2 = "lazy(".concat(lazyImport, ")");
                   }
+                } else if (ssrMode === "string") {
+                  components.push(route2._component);
+                  component2 = "component_".concat(components.length - 1);
                 } else {
                   lazyImport = `() => import(/* webpackMode: "eager" */  '`.concat(route2._component, `').then(routeModule => handleRouteModule(routeModule, "`).concat(route2.id, '")).catch(handleRouteModuleError) ');
-                  if (route2.isRoot) {
-                    lazyImport = "() => import('".concat(route2._component, `').then(routeModule => handleRouteModule(routeModule, "`).concat(route2.id, '")).catch(handleRouteModuleError) ');
-                    rootLayoutCode = "import RootLayout from '".concat(route2._component, "'");
-                    component2 = "RootLayout";
-                  } else if (ssrMode === "string") {
-                    component2 = "loadable(".concat(lazyImport, ")");
-                  } else {
-                    component2 = "lazy(".concat(lazyImport, ")");
-                  }
+                  component2 = "lazy(".concat(lazyImport, ")");
                 }
               }
             } else if (route2._component) {

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

@@ -237,17 +237,12 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
             lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
             component = `lazy(${lazyImport})`;
           }
+        } else if (ssrMode === "string") {
+          components.push(route._component);
+          component = `component_${components.length - 1}`;
         } else {
           lazyImport = `() => import(/* webpackMode: "eager" */  '${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
-          if (route.isRoot) {
-            lazyImport = `() => import('${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
-            rootLayoutCode = `import RootLayout from '${route._component}'`;
-            component = `RootLayout`;
-          } else if (ssrMode === "string") {
-            component = `loadable(${lazyImport})`;
-          } else {
-            component = `lazy(${lazyImport})`;
-          }
+          component = `lazy(${lazyImport})`;
         }
       }
     } else if (route._component) {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.43.1-alpha.0",
+  "version": "2.43.1-alpha.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -72,25 +72,25 @@
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
     "@swc/helpers": "0.5.3",
-    "@modern-js/builder-plugin-esbuild": "2.43.0",
-    "@modern-js/builder": "2.43.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.43.0",
     "@modern-js/builder-shared": "2.43.0",
     "@modern-js/builder-webpack-provider": "2.43.0",
+    "@modern-js/builder": "2.43.0",
+    "@modern-js/builder-plugin-esbuild": "2.43.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.43.0",
     "@modern-js/core": "2.43.0",
+    "@modern-js/plugin-data-loader": "2.43.0",
+    "@modern-js/node-bundle-require": "2.43.0",
     "@modern-js/new-action": "2.43.0",
     "@modern-js/prod-server": "2.43.0",
     "@modern-js/server": "2.43.0",
     "@modern-js/server-utils": "2.43.0",
     "@modern-js/types": "2.43.0",
-    "@modern-js/upgrade": "2.43.0",
-    "@modern-js/plugin-lint": "2.43.0",
+    "@modern-js/plugin": "2.43.0",
     "@modern-js/utils": "2.43.0",
     "@modern-js/server-core": "2.43.0",
-    "@modern-js/node-bundle-require": "2.43.0",
-    "@modern-js/plugin": "2.43.0",
     "@modern-js/plugin-i18n": "2.43.0",
-    "@modern-js/plugin-data-loader": "2.43.0"
+    "@modern-js/plugin-lint": "2.43.0",
+    "@modern-js/upgrade": "2.43.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "7.18.5",
@@ -100,8 +100,8 @@
     "typescript": "^5",
     "webpack": "^5.89.0",
     "@modern-js/builder-rspack-provider": "2.43.0",
-    "@modern-js/builder-plugin-swc": "2.43.0",
     "@scripts/build": "2.43.0",
+    "@modern-js/builder-plugin-swc": "2.43.0",
     "@scripts/jest-config": "2.43.0"
   },
   "peerDependencies": {