@modern-js/app-tools 2.35.2-alpha.0 → 2.37.0

package/dist/cjs/analyze/index.js

@@ -147,13 +147,11 @@ var analyze_default = ({ bundler }) => ({
           });
           builder.onDevCompileDone(async ({ isFirstCompile }) => {
             const hookRunners2 = api.useHookRunners();
-            if (process.stdout.isTTY || isFirstCompile) {
-              hookRunners2.afterDev({
-                isFirstCompile
-              });
-              if (isFirstCompile) {
-                (0, import_printInstructions.printInstructions)(hookRunners2, appContext, normalizedConfig);
-              }
+            hookRunners2.afterDev({
+              isFirstCompile
+            });
+            if (isFirstCompile) {
+              (0, import_printInstructions.printInstructions)(hookRunners2, appContext, normalizedConfig);
             }
           });
           builder.onBeforeCreateCompiler(async ({ bundlerConfigs }) => {

package/dist/cjs/analyze/nestedRoutes.js

@@ -268,7 +268,7 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
     delete finalRoute.path;
   }
   const childRoutes = finalRoute.children = (_finalRoute_children = finalRoute.children) === null || _finalRoute_children === void 0 ? void 0 : _finalRoute_children.filter((childRoute) => childRoute);
-  if (childRoutes && childRoutes.length === 0 && !finalRoute.index) {
+  if (childRoutes && childRoutes.length === 0 && !finalRoute.index && !finalRoute._component) {
     return null;
   }
   if (childRoutes && childRoutes.length === 1 && !finalRoute._component) {
@@ -281,6 +281,9 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
       };
     }
   }
+  if (isRoot && !finalRoute._component) {
+    throw new Error("The root layout component is required, make sure the routes/layout.tsx file exists.");
+  }
   if (isRoot && !oldVersion) {
     const optimizedRoutes = optimizeRoute(finalRoute);
     return optimizedRoutes;

package/dist/cjs/analyze/templates.js

@@ -38,7 +38,8 @@ __export(templates_exports, {
 module.exports = __toCommonJS(templates_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_constants = require("./constants");
+var import_constants = require("@modern-js/utils/universal/constants");
+var import_constants2 = require("./constants");
 var import_utils2 = require("./utils");
 const index = ({ mountId, imports, renderFunction: renderFunction2, exportStatement }) => `
 const IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';
@@ -64,7 +65,7 @@ const renderFunction = ({ plugins, customBootstrap, fileSystemRoutes: fileSystem
   return `
   const finalAppConfig = {
     ...App.config,
-    ...typeof ${import_constants.APP_CONFIG_NAME} === 'function' ? ${import_constants.APP_CONFIG_NAME}() : {},
+    ...typeof ${import_constants2.APP_CONFIG_NAME} === 'function' ? ${import_constants2.APP_CONFIG_NAME}() : {},
   }
 
   AppWrapper = createApp({
@@ -198,7 +199,7 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
   const loadersMap = {};
   const configs = [];
   const configsMap = {};
-  const loadersMapFile = import_path.default.join(internalDirectory, entryName, import_constants.TEMP_LOADERS_DIR, "map.json");
+  const loadersMapFile = import_path.default.join(internalDirectory, entryName, import_constants2.TEMP_LOADERS_DIR, "map.json");
   const importLazyCode = `
     import { lazy } from "react";
     import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
@@ -210,7 +211,7 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
     }
     const clientDataStr = clientData ? `&clientData=${clientData}` : "";
     if (nestedRoutesEntry) {
-      return `?loaderId=${loaderId}${clientDataStr}&action=${action}&inline=${inline}&routeId=${routeId}`;
+      return `?loaderId=${loaderId}${clientDataStr}&action=${action ? (0, import_utils.slash)(action) : action}&inline=${inline}&routeId=${routeId}`;
     }
     return "";
   };
@@ -263,18 +264,23 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
       if (route._component) {
         if (splitRouteChunks) {
           if (route.isRoot) {
+            lazyImport = `async function(){const routeModule = await import('${route._component}'); if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
             rootLayoutCode = `import RootLayout from '${route._component}'`;
             component = `RootLayout`;
           } else if (ssrMode === "string") {
-            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+            lazyImport = `async function(){const routeModule = await import(/* webpackChunkName: "${route.id}" */  '${route._component}'); if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
             component = `loadable(${lazyImport})`;
           } else {
-            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+            lazyImport = `async function(){const routeModule = await import(/* webpackChunkName: "${route.id}" */  '${route._component}'); if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
             component = `lazy(${lazyImport})`;
           }
         } else {
-          components.push(route._component);
-          component = `component_${components.length - 1}`;
+          lazyImport = `async function(){const routeModule = await import(/* webpackMode: "eager" */ '${route._component}'); if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
+          if (ssrMode === "string") {
+            component = `loadable(${lazyImport})`;
+          } else {
+            component = `lazy(${lazyImport})`;
+          }
         }
       }
     } else if (route._component) {
@@ -299,6 +305,9 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
     if (route._component) {
       finalRoute.component = component;
     }
+    if (route.type === "nested" && route._component && (route.loader || route.data)) {
+      finalRoute.shouldRevalidate = `createShouldRevalidate("${route.id}")`;
+    }
     return finalRoute;
   };
   let routeComponentsCode = `
@@ -311,6 +320,7 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
       const keywords = [
         "component",
         "lazyImport",
+        "shouldRevalidate",
         "loader",
         "action",
         "loading",
@@ -391,14 +401,24 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
   }
   await import_utils.fs.ensureFile(loadersMapFile);
   await import_utils.fs.writeJSON(loadersMapFile, loadersMap);
+  const importRuntimeRouterCode = `
+    import { createShouldRevalidate } from '@modern-js/runtime/router';
+  `;
+  const routeModulesCode = `
+    if(typeof document !== 'undefined'){
+      window.${import_constants.ROUTE_MODULES} = {}
+    }
+  `;
   return `
     ${importLazyCode}
     ${importComponentsCode}
+    ${importRuntimeRouterCode}
     ${rootLayoutCode}
     ${importLoadingCode}
     ${importErrorComponentsCode}
     ${importLoadersCode}
     ${importConfigsCode}
+    ${routeModulesCode}
     ${routeComponentsCode}
   `;
 };

package/dist/cjs/builder/builder-rspack/adapterCopy.js

@@ -39,17 +39,21 @@ const builderPluginAdpaterCopy = (options) => ({
   name: "builder-plugin-adapter-rspack-copy",
   setup(api) {
     let publicPath;
+    api.modifyBundlerChain((chain, { CHAIN_ID }) => {
+      chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
+        var _args_;
+        return [
+          {
+            patterns: [
+              ...((_args_ = args[0]) === null || _args_ === void 0 ? void 0 : _args_.patterns) || [],
+              ...createConfigBuiltinCopy(options)
+            ]
+          }
+        ];
+      });
+    });
     api.modifyRspackConfig((config) => {
-      var _config_builtins_copy, _config_builtins, _config_output;
-      config.builtins = {
-        ...config.builtins || {},
-        copy: {
-          patterns: [
-            ...((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns) || [],
-            ...createConfigBuiltinCopy(options)
-          ]
-        }
-      };
+      var _config_output;
       publicPath = (_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.publicPath;
     });
     api.onDevCompileDone(async () => {

package/dist/cjs/builder/builder-webpack/adapterModern.js

@@ -21,14 +21,12 @@ __export(adapterModern_exports, {
   builderPluginAdapterModern: () => builderPluginAdapterModern
 });
 module.exports = __toCommonJS(adapterModern_exports);
-var import_path = require("path");
 var import_createCopyPattern = require("./createCopyPattern");
 const builderPluginAdapterModern = (options) => ({
   name: "builder-plugin-adapter-modern",
   setup(api) {
     const { normalizedConfig: modernConfig, appContext } = options;
     api.modifyWebpackChain((chain, { CHAIN_ID }) => {
-      chain.resolve.modules.add("node_modules").add((0, import_path.join)(api.context.rootPath, "node_modules"));
       if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
         const defaultCopyPattern = (0, import_createCopyPattern.createPublicPattern)(appContext, modernConfig, chain);
         chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {

package/dist/cjs/builder/shared/builderPlugins/adapterBasic.js

@@ -31,6 +31,7 @@ __export(adapterBasic_exports, {
   builderPluginAdapterBasic: () => builderPluginAdapterBasic
 });
 module.exports = __toCommonJS(adapterBasic_exports);
+var import_path = __toESM(require("path"));
 const builderPluginAdapterBasic = () => ({
   name: "builder-plugin-adapter-modern-basic",
   setup(api) {
@@ -54,6 +55,7 @@ const builderPluginAdapterBasic = () => ({
         chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
         chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));
       }
+      chain.resolve.modules.add("node_modules").add(import_path.default.join(api.context.rootPath, "node_modules"));
     });
   }
 });

package/dist/cjs/config/initialize/inits.js

@@ -76,22 +76,6 @@ function initSourceConfig(config, appContext, bundler) {
       }
       return include2;
     }).concat(defaultInclude);
-    const root = (0, import_utils.findMonorepoRoot)(appContext2.appDirectory);
-    if (!root) {
-      return transformInclude;
-    }
-    const modernjsMonorepo = (0, import_utils.isModernjsMonorepo)(root);
-    if (modernjsMonorepo) {
-      const paths = import_utils.globby.sync(import_path.posix.join(root, "features", "**", "package.json"), {
-        ignore: [
-          "**/node_modules/**/*"
-        ]
-      }).map((pathname) => (0, import_path.dirname)(pathname) + import_path.sep);
-      return [
-        ...paths,
-        ...transformInclude
-      ];
-    }
     return transformInclude;
   }
   function createBuilderModuleScope(config2) {

package/dist/esm/analyze/index.js

@@ -257,13 +257,11 @@ function analyze_default(param) {
                       return _ts_generator(this, function(_state2) {
                         isFirstCompile = param2.isFirstCompile;
                         hookRunners2 = api.useHookRunners();
-                        if (process.stdout.isTTY || isFirstCompile) {
-                          hookRunners2.afterDev({
-                            isFirstCompile
-                          });
-                          if (isFirstCompile) {
-                            printInstructions(hookRunners2, appContext, normalizedConfig);
-                          }
+                        hookRunners2.afterDev({
+                          isFirstCompile
+                        });
+                        if (isFirstCompile) {
+                          printInstructions(hookRunners2, appContext, normalizedConfig);
                         }
                         return [
                           2

package/dist/esm/analyze/nestedRoutes.js

@@ -360,7 +360,7 @@ var walk = function() {
           childRoutes = finalRoute.children = (_finalRoute_children = finalRoute.children) === null || _finalRoute_children === void 0 ? void 0 : _finalRoute_children.filter(function(childRoute2) {
             return childRoute2;
           });
-          if (childRoutes && childRoutes.length === 0 && !finalRoute.index) {
+          if (childRoutes && childRoutes.length === 0 && !finalRoute.index && !finalRoute._component) {
             return [
               2,
               null
@@ -375,6 +375,9 @@ var walk = function() {
               });
             }
           }
+          if (isRoot && !finalRoute._component) {
+            throw new Error("The root layout component is required, make sure the routes/layout.tsx file exists.");
+          }
           if (isRoot && !oldVersion) {
             optimizedRoutes = optimizeRoute(finalRoute);
             return [

package/dist/esm/analyze/templates.js

@@ -5,6 +5,7 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { fs, getEntryOptions, isSSGEntry, slash } from "@modern-js/utils";
+import { ROUTE_MODULES } from "@modern-js/utils/universal/constants";
 import { APP_CONFIG_NAME, TEMP_LOADERS_DIR } from "./constants";
 import { getServerLoadersFile } from "./utils";
 var index = function(param) {
@@ -134,7 +135,7 @@ var createMatchReg = function(keyword) {
 };
 var fileSystemRoutes = function() {
   var _ref = _async_to_generator(function(param) {
-    var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, _param_splitRouteChunks, splitRouteChunks, components, loadings, errors, loaders, loadersMap, configs, configsMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, routeStr, keywords, regs, newRouteStr, component, finalRoute, keywords1, routeStr1, regs1, newRouteStr1, importLoadingCode, importComponentsCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo, route1, importConfigsCode, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, _step_value1, key1, configPath;
+    var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, _param_splitRouteChunks, splitRouteChunks, components, loadings, errors, loaders, loadersMap, configs, configsMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, routeStr, keywords, regs, newRouteStr, component, finalRoute, keywords1, routeStr1, regs1, newRouteStr1, importLoadingCode, importComponentsCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo, route1, importConfigsCode, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, _step_value1, key1, configPath, importRuntimeRouterCode, routeModulesCode;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -156,7 +157,7 @@ var fileSystemRoutes = function() {
             }
             var clientDataStr = clientData ? "&clientData=".concat(clientData) : "";
             if (nestedRoutesEntry) {
-              return "?loaderId=".concat(loaderId).concat(clientDataStr, "&action=").concat(action, "&inline=").concat(inline, "&routeId=").concat(routeId);
+              return "?loaderId=".concat(loaderId).concat(clientDataStr, "&action=").concat(action ? slash(action) : action, "&inline=").concat(inline, "&routeId=").concat(routeId);
             }
             return "";
           };
@@ -209,18 +210,23 @@ var fileSystemRoutes = function() {
               if (route2._component) {
                 if (splitRouteChunks) {
                   if (route2.isRoot) {
+                    lazyImport = "async function(){const routeModule = await import('".concat(route2._component, `'); if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule;return routeModule;}');
                     rootLayoutCode = "import RootLayout from '".concat(route2._component, "'");
                     component2 = "RootLayout";
                   } else if (ssrMode === "string") {
-                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route2.id, `" */  '`).concat(route2._component, "')");
+                    lazyImport = 'async function(){const routeModule = await import(/* webpackChunkName: "'.concat(route2.id, `" */  '`).concat(route2._component, `'); if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule;return routeModule;}');
                     component2 = "loadable(".concat(lazyImport, ")");
                   } else {
-                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route2.id, `" */  '`).concat(route2._component, "')");
+                    lazyImport = 'async function(){const routeModule = await import(/* webpackChunkName: "'.concat(route2.id, `" */  '`).concat(route2._component, `'); if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule;return routeModule;}');
                     component2 = "lazy(".concat(lazyImport, ")");
                   }
                 } else {
-                  components.push(route2._component);
-                  component2 = "component_".concat(components.length - 1);
+                  lazyImport = `async function(){const routeModule = await import(/* webpackMode: "eager" */ '`.concat(route2._component, `'); if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule;return routeModule;}');
+                  if (ssrMode === "string") {
+                    component2 = "loadable(".concat(lazyImport, ")");
+                  } else {
+                    component2 = "lazy(".concat(lazyImport, ")");
+                  }
                 }
               }
             } else if (route2._component) {
@@ -244,6 +250,9 @@ var fileSystemRoutes = function() {
             if (route2._component) {
               finalRoute2.component = component2;
             }
+            if (route2.type === "nested" && route2._component && (route2.loader || route2.data)) {
+              finalRoute2.shouldRevalidate = 'createShouldRevalidate("'.concat(route2.id, '")');
+            }
             return finalRoute2;
           };
           routeComponentsCode = "\n    export const routes = [\n  ";
@@ -257,6 +266,7 @@ var fileSystemRoutes = function() {
                 keywords = [
                   "component",
                   "lazyImport",
+                  "shouldRevalidate",
                   "loader",
                   "action",
                   "loading",
@@ -390,9 +400,11 @@ var fileSystemRoutes = function() {
           ];
         case 2:
           _state.sent();
+          importRuntimeRouterCode = "\n    import { createShouldRevalidate } from '@modern-js/runtime/router';\n  ";
+          routeModulesCode = "\n    if(typeof document !== 'undefined'){\n      window.".concat(ROUTE_MODULES, " = {}\n    }\n  ");
           return [
             2,
-            "\n    ".concat(importLazyCode, "\n    ").concat(importComponentsCode, "\n    ").concat(rootLayoutCode, "\n    ").concat(importLoadingCode, "\n    ").concat(importErrorComponentsCode, "\n    ").concat(importLoadersCode, "\n    ").concat(importConfigsCode, "\n    ").concat(routeComponentsCode, "\n  ")
+            "\n    ".concat(importLazyCode, "\n    ").concat(importComponentsCode, "\n    ").concat(importRuntimeRouterCode, "\n    ").concat(rootLayoutCode, "\n    ").concat(importLoadingCode, "\n    ").concat(importErrorComponentsCode, "\n    ").concat(importLoadersCode, "\n    ").concat(importConfigsCode, "\n    ").concat(routeModulesCode, "\n    ").concat(routeComponentsCode, "\n  ")
           ];
       }
     });

package/dist/esm/builder/builder-rspack/adapterCopy.js

@@ -1,6 +1,4 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
@@ -12,13 +10,19 @@ var builderPluginAdpaterCopy = function(options) {
     name: "builder-plugin-adapter-rspack-copy",
     setup: function setup(api) {
       var publicPath;
-      api.modifyRspackConfig(function(config) {
-        var _config_builtins_copy, _config_builtins, _config_output;
-        config.builtins = _object_spread_props(_object_spread({}, config.builtins || {}), {
-          copy: {
-            patterns: _to_consumable_array(((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns) || []).concat(_to_consumable_array(createConfigBuiltinCopy(options)))
-          }
+      api.modifyBundlerChain(function(chain, param) {
+        var CHAIN_ID = param.CHAIN_ID;
+        chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(function(args) {
+          var _args_;
+          return [
+            {
+              patterns: _to_consumable_array(((_args_ = args[0]) === null || _args_ === void 0 ? void 0 : _args_.patterns) || []).concat(_to_consumable_array(createConfigBuiltinCopy(options)))
+            }
+          ];
         });
+      });
+      api.modifyRspackConfig(function(config) {
+        var _config_output;
         publicPath = (_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.publicPath;
       });
       api.onDevCompileDone(/* @__PURE__ */ _async_to_generator(function() {

package/dist/esm/builder/builder-webpack/adapterModern.js

@@ -1,5 +1,4 @@
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { join } from "path";
 import { createPublicPattern } from "./createCopyPattern";
 var builderPluginAdapterModern = function(options) {
   return {
@@ -8,7 +7,6 @@ var builderPluginAdapterModern = function(options) {
       var modernConfig = options.normalizedConfig, appContext = options.appContext;
       api.modifyWebpackChain(function(chain, param) {
         var CHAIN_ID = param.CHAIN_ID;
-        chain.resolve.modules.add("node_modules").add(join(api.context.rootPath, "node_modules"));
         if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
           var defaultCopyPattern = createPublicPattern(appContext, modernConfig, chain);
           chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(function(args) {

package/dist/esm/builder/shared/builderPlugins/adapterBasic.js

@@ -1,3 +1,4 @@
+import path from "path";
 var builderPluginAdapterBasic = function() {
   return {
     name: "builder-plugin-adapter-modern-basic",
@@ -23,6 +24,7 @@ var builderPluginAdapterBasic = function() {
           chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
           chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));
         }
+        chain.resolve.modules.add("node_modules").add(path.join(api.context.rootPath, "node_modules"));
       });
     }
   };

package/dist/esm/config/initialize/inits.js

@@ -1,6 +1,6 @@
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import path, { dirname, isAbsolute, posix, sep } from "path";
-import { findExists, findMonorepoRoot, globby, isModernjsMonorepo } from "@modern-js/utils";
+import path, { isAbsolute } from "path";
+import { findExists } from "@modern-js/utils";
 function initHtmlConfig(config, appContext) {
   var createBuilderAppIcon = function createBuilderAppIcon2(config2, appContext2) {
     var configDir = config2.source.configDir;
@@ -43,21 +43,6 @@ function initSourceConfig(config, appContext, bundler) {
       }
       return include2;
     }).concat(defaultInclude);
-    var root = findMonorepoRoot(appContext2.appDirectory);
-    if (!root) {
-      return transformInclude;
-    }
-    var modernjsMonorepo = isModernjsMonorepo(root);
-    if (modernjsMonorepo) {
-      var paths = globby.sync(posix.join(root, "features", "**", "package.json"), {
-        ignore: [
-          "**/node_modules/**/*"
-        ]
-      }).map(function(pathname) {
-        return dirname(pathname) + sep;
-      });
-      return _to_consumable_array(paths).concat(_to_consumable_array(transformInclude));
-    }
     return transformInclude;
   };
   var createBuilderModuleScope = function createBuilderModuleScope2(config2) {

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

@@ -114,13 +114,11 @@ var analyze_default = ({ bundler }) => ({
           });
           builder.onDevCompileDone(async ({ isFirstCompile }) => {
             const hookRunners2 = api.useHookRunners();
-            if (process.stdout.isTTY || isFirstCompile) {
-              hookRunners2.afterDev({
-                isFirstCompile
-              });
-              if (isFirstCompile) {
-                printInstructions(hookRunners2, appContext, normalizedConfig);
-              }
+            hookRunners2.afterDev({
+              isFirstCompile
+            });
+            if (isFirstCompile) {
+              printInstructions(hookRunners2, appContext, normalizedConfig);
             }
           });
           builder.onBeforeCreateCompiler(async ({ bundlerConfigs }) => {

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

@@ -233,7 +233,7 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
     delete finalRoute.path;
   }
   const childRoutes = finalRoute.children = (_finalRoute_children = finalRoute.children) === null || _finalRoute_children === void 0 ? void 0 : _finalRoute_children.filter((childRoute) => childRoute);
-  if (childRoutes && childRoutes.length === 0 && !finalRoute.index) {
+  if (childRoutes && childRoutes.length === 0 && !finalRoute.index && !finalRoute._component) {
     return null;
   }
   if (childRoutes && childRoutes.length === 1 && !finalRoute._component) {
@@ -246,6 +246,9 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
       };
     }
   }
+  if (isRoot && !finalRoute._component) {
+    throw new Error("The root layout component is required, make sure the routes/layout.tsx file exists.");
+  }
   if (isRoot && !oldVersion) {
     const optimizedRoutes = optimizeRoute(finalRoute);
     return optimizedRoutes;

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

@@ -1,5 +1,6 @@
 import path from "path";
 import { fs, getEntryOptions, isSSGEntry, slash } from "@modern-js/utils";
+import { ROUTE_MODULES } from "@modern-js/utils/universal/constants";
 import { APP_CONFIG_NAME, TEMP_LOADERS_DIR } from "./constants";
 import { getServerLoadersFile } from "./utils";
 const index = ({ mountId, imports, renderFunction: renderFunction2, exportStatement }) => `
@@ -172,7 +173,7 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
     }
     const clientDataStr = clientData ? `&clientData=${clientData}` : "";
     if (nestedRoutesEntry) {
-      return `?loaderId=${loaderId}${clientDataStr}&action=${action}&inline=${inline}&routeId=${routeId}`;
+      return `?loaderId=${loaderId}${clientDataStr}&action=${action ? slash(action) : action}&inline=${inline}&routeId=${routeId}`;
     }
     return "";
   };
@@ -225,18 +226,23 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
       if (route._component) {
         if (splitRouteChunks) {
           if (route.isRoot) {
+            lazyImport = `async function(){const routeModule = await import('${route._component}'); if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
             rootLayoutCode = `import RootLayout from '${route._component}'`;
             component = `RootLayout`;
           } else if (ssrMode === "string") {
-            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+            lazyImport = `async function(){const routeModule = await import(/* webpackChunkName: "${route.id}" */  '${route._component}'); if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
             component = `loadable(${lazyImport})`;
           } else {
-            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+            lazyImport = `async function(){const routeModule = await import(/* webpackChunkName: "${route.id}" */  '${route._component}'); if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
             component = `lazy(${lazyImport})`;
           }
         } else {
-          components.push(route._component);
-          component = `component_${components.length - 1}`;
+          lazyImport = `async function(){const routeModule = await import(/* webpackMode: "eager" */ '${route._component}'); if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
+          if (ssrMode === "string") {
+            component = `loadable(${lazyImport})`;
+          } else {
+            component = `lazy(${lazyImport})`;
+          }
         }
       }
     } else if (route._component) {
@@ -261,6 +267,9 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
     if (route._component) {
       finalRoute.component = component;
     }
+    if (route.type === "nested" && route._component && (route.loader || route.data)) {
+      finalRoute.shouldRevalidate = `createShouldRevalidate("${route.id}")`;
+    }
     return finalRoute;
   };
   let routeComponentsCode = `
@@ -273,6 +282,7 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
       const keywords = [
         "component",
         "lazyImport",
+        "shouldRevalidate",
         "loader",
         "action",
         "loading",
@@ -353,14 +363,24 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
   }
   await fs.ensureFile(loadersMapFile);
   await fs.writeJSON(loadersMapFile, loadersMap);
+  const importRuntimeRouterCode = `
+    import { createShouldRevalidate } from '@modern-js/runtime/router';
+  `;
+  const routeModulesCode = `
+    if(typeof document !== 'undefined'){
+      window.${ROUTE_MODULES} = {}
+    }
+  `;
   return `
     ${importLazyCode}
     ${importComponentsCode}
+    ${importRuntimeRouterCode}
     ${rootLayoutCode}
     ${importLoadingCode}
     ${importErrorComponentsCode}
     ${importLoadersCode}
     ${importConfigsCode}
+    ${routeModulesCode}
     ${routeComponentsCode}
   `;
 };

package/dist/esm-node/builder/builder-rspack/adapterCopy.js

@@ -6,17 +6,21 @@ const builderPluginAdpaterCopy = (options) => ({
   name: "builder-plugin-adapter-rspack-copy",
   setup(api) {
     let publicPath;
+    api.modifyBundlerChain((chain, { CHAIN_ID }) => {
+      chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
+        var _args_;
+        return [
+          {
+            patterns: [
+              ...((_args_ = args[0]) === null || _args_ === void 0 ? void 0 : _args_.patterns) || [],
+              ...createConfigBuiltinCopy(options)
+            ]
+          }
+        ];
+      });
+    });
     api.modifyRspackConfig((config) => {
-      var _config_builtins_copy, _config_builtins, _config_output;
-      config.builtins = {
-        ...config.builtins || {},
-        copy: {
-          patterns: [
-            ...((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns) || [],
-            ...createConfigBuiltinCopy(options)
-          ]
-        }
-      };
+      var _config_output;
       publicPath = (_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.publicPath;
     });
     api.onDevCompileDone(async () => {

package/dist/esm-node/builder/builder-webpack/adapterModern.js

@@ -1,11 +1,9 @@
-import { join } from "path";
 import { createPublicPattern } from "./createCopyPattern";
 const builderPluginAdapterModern = (options) => ({
   name: "builder-plugin-adapter-modern",
   setup(api) {
     const { normalizedConfig: modernConfig, appContext } = options;
     api.modifyWebpackChain((chain, { CHAIN_ID }) => {
-      chain.resolve.modules.add("node_modules").add(join(api.context.rootPath, "node_modules"));
       if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
         const defaultCopyPattern = createPublicPattern(appContext, modernConfig, chain);
         chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {

package/dist/esm-node/builder/shared/builderPlugins/adapterBasic.js

@@ -1,3 +1,4 @@
+import path from "path";
 const builderPluginAdapterBasic = () => ({
   name: "builder-plugin-adapter-modern-basic",
   setup(api) {
@@ -21,6 +22,7 @@ const builderPluginAdapterBasic = () => ({
         chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
         chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));
       }
+      chain.resolve.modules.add("node_modules").add(path.join(api.context.rootPath, "node_modules"));
     });
   }
 });