@modern-js/app-tools 2.5.1-alpha.1 → 2.6.0

package/dist/cjs/schema/index.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/utils/config.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/utils/createServer.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/utils/generateWatchFiles.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/utils/routes.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/esm/analyze/generateCode.js

@@ -148,7 +148,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import path from "path";
-import { fs, getEntryOptions, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isRouterV5, logger } from "@modern-js/utils";
 import { useResolvedConfigContext } from "@modern-js/core";
 import * as templates from "./templates";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
@@ -240,7 +240,7 @@ var createImportStatements = function(statements) {
 };
 var generateCode = function() {
     var _ref = _asyncToGenerator(function(appContext, config, entrypoints, api) {
-        var _config_runtime, _config_runtime1, _config_runtime_router, internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, mountId, getRoutes;
+        var internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, mountId, getRoutes;
         function generateEntryCode(entrypoint) {
             return _generateEntryCode.apply(this, arguments);
         }
@@ -253,11 +253,11 @@ var generateCode = function() {
                             entryName = entrypoint.entryName, isAutoMount = entrypoint.isAutoMount, customBootstrap = entrypoint.customBootstrap, fileSystemRoutes = entrypoint.fileSystemRoutes;
                             if (!isAutoMount) return [
                                 3,
-                                17
+                                16
                             ];
                             if (!fileSystemRoutes) return [
                                 3,
-                                10
+                                9
                             ];
                             initialRoutes = [];
                             nestedRoute = null;
@@ -270,11 +270,7 @@ var generateCode = function() {
                                     internalDirAlias: internalDirAlias
                                 });
                             }
-                            if (!entrypoint.nestedRoutesEntry) return [
-                                3,
-                                3
-                            ];
-                            if (!!isV5) return [
+                            if (!(!isV5 && entrypoint.nestedRoutesEntry)) return [
                                 3,
                                 2
                             ];
@@ -290,15 +286,8 @@ var generateCode = function() {
                             if (nestedRoute) {
                                 initialRoutes.unshift(nestedRoute);
                             }
-                            return [
-                                3,
-                                3
-                            ];
+                            _state.label = 2;
                         case 2:
-                            logger.error("Nested routes is not supported in legacy mode.");
-                            process.exit(1);
-                            _state.label = 3;
-                        case 3:
                             return [
                                 4,
                                 hookRunners.modifyFileSystemRoutes({
@@ -306,7 +295,7 @@ var generateCode = function() {
                                     routes: initialRoutes
                                 })
                             ];
-                        case 4:
+                        case 3:
                             routes = _state.sent().routes;
                             config2 = useResolvedConfigContext();
                             ssr = getEntryOptions(entryName, config2.server.ssr, config2.server.ssrByEntries, packageName);
@@ -338,18 +327,18 @@ var generateCode = function() {
                                     internalDirectory: internalDirectory
                                 })
                             ];
-                        case 5:
+                        case 4:
                             return [
                                 4,
                                 _.apply(hookRunners, [
                                     (_tmp.code = _state.sent(), _tmp)
                                 ])
                             ];
-                        case 6:
+                        case 5:
                             _ref = _state.sent(), code2 = _ref.code;
                             if (!(entrypoint.nestedRoutesEntry && mode)) return [
                                 3,
-                                9
+                                8
                             ];
                             routesServerFile = getServerLoadersFile(internalDirectory, entryName);
                             code3 = templates.routesForServer({
@@ -359,19 +348,19 @@ var generateCode = function() {
                                 4,
                                 fs.ensureFile(routesServerFile)
                             ];
-                        case 7:
+                        case 6:
                             _state.sent();
                             return [
                                 4,
                                 fs.writeFile(routesServerFile, code3)
                             ];
-                        case 8:
+                        case 7:
                             _state.sent();
+                            _state.label = 8;
+                        case 8:
+                            fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), code2, "utf8");
                             _state.label = 9;
                         case 9:
-                            fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), code2, "utf8");
-                            _state.label = 10;
-                        case 10:
                             return [
                                 4,
                                 hookRunners.modifyEntryImports({
@@ -385,7 +374,7 @@ var generateCode = function() {
                                     })
                                 })
                             ];
-                        case 11:
+                        case 10:
                             _ref1 = _state.sent(), importStatements = _ref1.imports;
                             return [
                                 4,
@@ -394,7 +383,7 @@ var generateCode = function() {
                                     plugins: []
                                 })
                             ];
-                        case 12:
+                        case 11:
                             plugins = _state.sent().plugins;
                             return [
                                 4,
@@ -407,7 +396,7 @@ var generateCode = function() {
                                     })
                                 })
                             ];
-                        case 13:
+                        case 12:
                             _ref2 = _state.sent(), renderFunction = _ref2.code;
                             return [
                                 4,
@@ -416,7 +405,7 @@ var generateCode = function() {
                                     exportStatement: "export default AppWrapper;"
                                 })
                             ];
-                        case 14:
+                        case 13:
                             exportStatement = _state.sent().exportStatement;
                             code = templates.index({
                                 mountId: mountId,
@@ -428,7 +417,7 @@ var generateCode = function() {
                             entrypoint.entry = entryFile;
                             if (!config.source.enableAsyncEntry) return [
                                 3,
-                                16
+                                15
                             ];
                             return [
                                 4,
@@ -437,19 +426,19 @@ var generateCode = function() {
                                     code: "import('./".concat(ENTRY_BOOTSTRAP_FILE_NAME, "');")
                                 })
                             ];
-                        case 15:
+                        case 14:
                             _ref3 = _state.sent(), asyncEntryCode = _ref3.code;
                             fs.outputFileSync(entryFile, asyncEntryCode, "utf8");
                             bootstrapFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_BOOTSTRAP_FILE_NAME));
                             fs.outputFileSync(bootstrapFile, code, "utf8");
                             return [
                                 3,
-                                17
+                                16
                             ];
-                        case 16:
+                        case 15:
                             fs.outputFileSync(entryFile, code, "utf8");
-                            _state.label = 17;
-                        case 17:
+                            _state.label = 16;
+                        case 16:
                             return [
                                 2
                             ];
@@ -463,7 +452,7 @@ var generateCode = function() {
                 case 0:
                     internalDirectory = appContext.internalDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
                     hookRunners = api.useHookRunners();
-                    isV5 = typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && (config === null || config === void 0 ? void 0 : (_config_runtime1 = config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
+                    isV5 = isRouterV5(config);
                     mountId = config.html.mountId;
                     getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
                     return [

package/dist/esm/analyze/getBundleEntry.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { ensureAbsolutePath, fs, findExists, MAIN_ENTRY_NAME } from "@modern-js/utils";
+import { ensureAbsolutePath, fs, findExists, MAIN_ENTRY_NAME, isRouterV5 } from "@modern-js/utils";
 import { getFileSystemEntry } from "./getFileSystemEntry";
 import { JS_EXTENSIONS } from "./constants";
 var ensureExtensions = function(file) {
@@ -43,7 +43,7 @@ var getBundleEntry = function(appContext, config) {
                 customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
                 fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
             };
-            if (entrypoint.fileSystemRoutes) {
+            if (entrypoint.fileSystemRoutes && isRouterV5(config)) {
                 entrypoint.nestedRoutesEntry = entrypoint.entry;
             }
             if (!ifAlreadyExists(defaults, entrypoint)) {

package/dist/esm/analyze/index.js

@@ -570,7 +570,8 @@ var analyze_default = function(param) {
                         resolved: config
                     };
                 },
-                modifyEntryImports: function modifyEntryImports(param) {
+                modifyEntryImports: // This logic is not in the router plugin to avoid having to include some dependencies in the utils package
+                function modifyEntryImports(param) {
                     var entrypoint = param.entrypoint, imports = param.imports;
                     return _asyncToGenerator(function() {
                         var appContext, srcDirectory, internalSrcAlias, fileSystemRoutes, nestedRoutesEntry, rootLayoutPath, rootLayoutFile, rootLayoutBuffer, rootLayout, _ref, moduleExports, hasAppConfig, generateLayoutPath, hasAppInit;

package/dist/esm/builder/builder-webpack/builderPlugins/compatModern.js

@@ -26,7 +26,7 @@ function _unsupportedIterableToArray(o, minLen) {
 import { join } from "path";
 import { createCopyPattern } from "../../shared";
 import { RouterPlugin } from "../webpackPlugins";
-var PluginCompatModern = function(options) {
+var builderPluginCompatModern = function(options) {
     return {
         name: "builder-plugin-compat-modern",
         setup: function setup(api) {
@@ -61,4 +61,4 @@ var PluginCompatModern = function(options) {
         }
     };
 };
-export { PluginCompatModern };
+export { builderPluginCompatModern };

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

@@ -200,10 +200,9 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { builderWebpackProvider } from "@modern-js/builder-webpack-provider";
-import { applyOptionsChain } from "@modern-js/utils";
 import { createCopyPattern } from "../shared";
 import { generateBuilder } from "../generator";
-import { PluginCompatModern } from "./builderPlugins/compatModern";
+import { builderPluginCompatModern } from "./builderPlugins/compatModern";
 function createWebpackBuilderForModern(options) {
     return generateBuilder(options, builderWebpackProvider, {
         modifyBuilderConfig: function modifyBuilderConfig(config) {
@@ -248,7 +247,7 @@ function applyBuilderPlugins(builder, options) {
 }
 function _applyBuilderPlugins() {
     _applyBuilderPlugins = _asyncToGenerator(function(builder, options) {
-        var normalizedConfig, PluginNodePolyfill, _normalizedConfig_tools, esbuildOptions, PluginEsbuild;
+        var normalizedConfig, builderPluginNodePolyfill, _normalizedConfig_tools, esbuildOptions, builderPluginEsbuild;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -262,9 +261,9 @@ function _applyBuilderPlugins() {
                         import("@modern-js/builder-plugin-node-polyfill")
                     ];
                 case 1:
-                    PluginNodePolyfill = _state.sent().PluginNodePolyfill;
+                    builderPluginNodePolyfill = _state.sent().builderPluginNodePolyfill;
                     builder.addPlugins([
-                        PluginNodePolyfill()
+                        builderPluginNodePolyfill()
                     ]);
                     _state.label = 2;
                 case 2:
@@ -278,17 +277,14 @@ function _applyBuilderPlugins() {
                         import("@modern-js/builder-plugin-esbuild")
                     ];
                 case 3:
-                    PluginEsbuild = _state.sent().PluginEsbuild;
+                    builderPluginEsbuild = _state.sent().builderPluginEsbuild;
                     builder.addPlugins([
-                        PluginEsbuild({
-                            loader: false,
-                            minimize: applyOptionsChain({}, esbuildOptions)
-                        })
+                        builderPluginEsbuild(esbuildOptions)
                     ]);
                     _state.label = 4;
                 case 4:
                     builder.addPlugins([
-                        PluginCompatModern(options)
+                        builderPluginCompatModern(options)
                     ]);
                     return [
                         2

package/dist/esm/builder/generator/createBuilderProviderConfig.js

@@ -61,6 +61,7 @@ function createBuilderProviderConfig(resolveConfig, appContext, modifyBuilderCon
         }),
         html: htmlConfig,
         output: _objectSpreadProps(_objectSpread({}, resolveConfig.output), {
+            // We need to do this in the app-tools prepare hook because some files will be generated into the dist directory in the analyze process
             cleanDistPath: false
         })
     });

package/dist/esm/builder/generator/getBuilderTargets.js

@@ -7,7 +7,7 @@ function getBuilderTargets(normalizedConfig) {
     if (useNodeTarget) {
         targets.push("node");
     }
-    var useWorkerTarget = isProd() ? isServiceWorker(normalizedConfig) : false;
+    var useWorkerTarget = isServiceWorker(normalizedConfig);
     if (useWorkerTarget) {
         targets.push("service-worker");
     }

package/dist/esm/builder/shared/createCopyPattern.js

@@ -7,6 +7,9 @@ function createCopyPattern(appContext, config, patternsType, chain) {
     var minifiedJsRexExp = /\.min\.js/;
     var info = function(file) {
         return {
+            // If the file name ends with `.min.js`, we assume it's a compressed file.
+            // So we don't want copy-webpack-plugin to minify it.
+            // ref: https://github.com/webpack-contrib/copy-webpack-plugin#info
             minimized: minifiedJsRexExp.test(file.sourceFilename)
         };
     };
@@ -20,6 +23,7 @@ function createCopyPattern(appContext, config, patternsType, chain) {
             to: "public",
             context: publicDir,
             noErrorOnMissing: true,
+            // eslint-disable-next-line node/prefer-global/buffer
             transform: function(content, absoluteFrom) {
                 if (!/\.html?$/.test(absoluteFrom)) {
                     return content;

package/dist/esm/commands/build.js

@@ -199,6 +199,7 @@ var build = function() {
                     return [
                         4,
                         hookRunners.beforeBuild({
+                            // "null" bundlerConfigs
                             bundlerConfigs: void 0
                         })
                     ];
@@ -223,6 +224,7 @@ var build = function() {
                     return [
                         4,
                         hookRunners.afterBuild({
+                            // "null" stats
                             stats: void 0
                         })
                     ];

package/dist/esm/commands/dev.js

@@ -175,6 +175,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { ResolvedConfigContext } from "@modern-js/core";
+import { DEFAULT_DEV_HOST } from "@modern-js/utils";
 import { printInstructions } from "../utils/printInstructions";
 import { setServer, createServer, injectDataLoaderPlugin } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
@@ -182,7 +183,7 @@ import { buildServerConfig } from "../utils/config";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 var dev = function() {
     var _ref = _asyncToGenerator(function(api, options) {
-        var _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, serverInternalPlugins, serverOptions, app, server;
+        var _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, serverInternalPlugins, serverOptions, _normalizedConfig_dev, app, host, server;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -236,14 +237,9 @@ var dev = function() {
                     serverOptions = {
                         dev: _objectSpread({
                             port: port,
-                            https: normalizedConfig.dev.https
+                            https: normalizedConfig.dev.https,
+                            host: normalizedConfig.dev.host
                         }, (_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer),
-                        appContext: {
-                            appDirectory: appContext.appDirectory,
-                            sharedDirectory: appContext.sharedDirectory,
-                            apiDirectory: appContext.apiDirectory,
-                            lambdaDirectory: appContext.lambdaDirectory
-                        },
                         pwd: appDirectory,
                         config: normalizedConfig,
                         serverConfigFile: serverConfigFile,
@@ -261,7 +257,11 @@ var dev = function() {
                     ];
                 case 5:
                     app = _state.sent();
-                    app.listen(port, function() {
+                    host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
+                    app.listen({
+                        port: port,
+                        host: host
+                    }, function() {
                         var _ref = _asyncToGenerator(function(err) {
                             return __generator(this, function(_state) {
                                 if (err) {

package/dist/esm/commands/serve.js

@@ -122,7 +122,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { logger, chalk, isApiOnly, getTargetDir } from "@modern-js/utils";
+import { logger, chalk, isApiOnly } from "@modern-js/utils";
 import server from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
 import { injectDataLoaderPlugin } from "../utils/createServer";
@@ -155,11 +155,6 @@ var start = function() {
                         server({
                             pwd: appDirectory,
                             config: userConfig,
-                            appContext: {
-                                sharedDirectory: getTargetDir(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
-                                apiDirectory: getTargetDir(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
-                                lambdaDirectory: getTargetDir(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
-                            },
                             serverConfigFile: serverConfigFile,
                             internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
                             apiOnly: apiOnly

package/dist/esm/config/default.js

@@ -54,6 +54,8 @@ import { createDefaultConfig as createDefaultBuilderConfig } from "@modern-js/bu
 function createDefaultConfig(appContext, bundler) {
     var defaultBuilderConfig = createDefaultBuilderConfig();
     var dev = _objectSpreadProps(_objectSpread({}, defaultBuilderConfig.dev), {
+        // `dev.port` should not have a default value
+        // because we will use `server.port` by default
         port: void 0
     });
     var output = _objectSpreadProps(_objectSpread({}, defaultBuilderConfig.output), {

package/dist/esm/config/legacy/createOutputConfig.js

@@ -8,6 +8,7 @@ function createOutputConfig(config) {
             css: cssPath,
             js: jsPath,
             html: htmlPath,
+            // modern.js v1 output all media files to `dist/media` by default
             svg: mediaPath || "media",
             image: mediaPath || "media",
             font: mediaPath || "media",
@@ -33,6 +34,7 @@ function createOutputConfig(config) {
         disableFilenameHash: disableAssetsCache,
         enableLatestDecorators: enableLatestDecorators,
         ssg: ssg,
+        // set `true`, only in legacy config
         enableAssetFallback: true,
         enableAssetManifest: true,
         disableNodePolyfill: disableNodePolyfill

package/dist/esm/config/legacy/createToolsConfig.js

@@ -17,7 +17,10 @@ function createToolsConfig(config) {
         devServer: devServer,
         tailwindcss: tailwindcss,
         jest: jest,
-        esbuild: esbuild
+        esbuild: {
+            loader: false,
+            minimize: esbuild
+        }
     };
 }
 export { createToolsConfig };

package/dist/esm/index.js

@@ -653,7 +653,8 @@ var src_default = function() {
                         });
                     })();
                 },
-                fileChange: function fileChange(e) {
+                fileChange: // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
+                function fileChange(e) {
                     return _asyncToGenerator(function() {
                         var filename, eventType, appContext, appDirectory, srcDirectory, absolutePath, closeServer;
                         return __generator(this, function(_state) {

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

@@ -1,5 +1,5 @@
 import path from "path";
-import { fs, getEntryOptions, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isRouterV5, logger } from "@modern-js/utils";
 import {
   useResolvedConfigContext
 } from "@modern-js/core";
@@ -60,7 +60,6 @@ ${initialize || ""}`
   ).join("\n");
 };
 const generateCode = async (appContext, config, entrypoints, api) => {
-  var _a, _b, _c;
   const {
     internalDirectory,
     srcDirectory,
@@ -69,7 +68,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
     packageName
   } = appContext;
   const hookRunners = api.useHookRunners();
-  const isV5 = typeof ((_a = config.runtime) == null ? void 0 : _a.router) !== "boolean" && ((_c = (_b = config == null ? void 0 : config.runtime) == null ? void 0 : _b.router) == null ? void 0 : _c.mode) === "react-router-5";
+  const isV5 = isRouterV5(config);
   const { mountId } = config.html;
   const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
   await Promise.all(entrypoints.map(generateEntryCode));
@@ -88,23 +87,18 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             internalDirAlias
           });
         }
-        if (entrypoint.nestedRoutesEntry) {
-          if (!isV5) {
-            nestedRoute = await walk(
-              entrypoint.nestedRoutesEntry,
-              entrypoint.nestedRoutesEntry,
-              {
-                name: internalSrcAlias,
-                basename: srcDirectory
-              },
-              entrypoint.entryName
-            );
-            if (nestedRoute) {
-              initialRoutes.unshift(nestedRoute);
-            }
-          } else {
-            logger.error("Nested routes is not supported in legacy mode.");
-            process.exit(1);
+        if (!isV5 && entrypoint.nestedRoutesEntry) {
+          nestedRoute = await walk(
+            entrypoint.nestedRoutesEntry,
+            entrypoint.nestedRoutesEntry,
+            {
+              name: internalSrcAlias,
+              basename: srcDirectory
+            },
+            entrypoint.entryName
+          );
+          if (nestedRoute) {
+            initialRoutes.unshift(nestedRoute);
           }
         }
         const { routes } = await hookRunners.modifyFileSystemRoutes({

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

@@ -3,7 +3,8 @@ import {
   ensureAbsolutePath,
   fs,
   findExists,
-  MAIN_ENTRY_NAME
+  MAIN_ENTRY_NAME,
+  isRouterV5
 } from "@modern-js/utils";
 import { getFileSystemEntry } from "./getFileSystemEntry";
 import { JS_EXTENSIONS } from "./constants";
@@ -55,7 +56,7 @@ const getBundleEntry = (appContext, config) => {
         customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
         fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
       };
-      if (entrypoint.fileSystemRoutes) {
+      if (entrypoint.fileSystemRoutes && isRouterV5(config)) {
         entrypoint.nestedRoutesEntry = entrypoint.entry;
       }
       if (!ifAlreadyExists(defaults, entrypoint)) {

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

@@ -209,6 +209,7 @@ var analyze_default = ({
           resolved: config
         };
       },
+      // This logic is not in the router plugin to avoid having to include some dependencies in the utils package
       async modifyEntryImports({ entrypoint, imports }) {
         const appContext = api.useAppContext();
         const { srcDirectory, internalSrcAlias } = appContext;

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

@@ -69,7 +69,7 @@ const html = (partials) => `
 
   <script>
     window.__assetPrefix__ = '<%= assetPrefix %>';
-  <\/script>
+  </script>
   ${partials.head.join("\n")}
 
   <!--<?- chunksMap.css ?>-->

package/dist/esm-node/builder/builder-webpack/builderPlugins/compatModern.js

@@ -1,7 +1,7 @@
 import { join } from "path";
 import { createCopyPattern } from "../../shared";
 import { RouterPlugin } from "../webpackPlugins";
-const PluginCompatModern = (options) => ({
+const builderPluginCompatModern = (options) => ({
   name: "builder-plugin-compat-modern",
   setup(api) {
     const { normalizedConfig: modernConfig, appContext } = options;
@@ -37,5 +37,5 @@ const PluginCompatModern = (options) => ({
   }
 });
 export {
-  PluginCompatModern
+  builderPluginCompatModern
 };