@modern-js/runtime 2.65.5 → 2.67.0

package/dist/cjs/cli/index.js

@@ -33,15 +33,13 @@ __export(cli_exports, {
   isRuntimeEntry: () => import_entry2.isRuntimeEntry,
   routerPlugin: () => import_cli2.routerPlugin,
   runtimePlugin: () => runtimePlugin,
-  ssrPlugin: () => import_ssr.ssrPlugin,
-  statePlugin: () => import_cli3.statePlugin
+  ssrPlugin: () => import_ssr.ssrPlugin
 });
 module.exports = __toCommonJS(cli_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_cli = require("../document/cli");
 var import_cli2 = require("../router/cli");
-var import_cli3 = require("../state/cli");
 var import_alias = require("./alias");
 var import_code = require("./code");
 var import_constants = require("./constants");
@@ -61,7 +59,6 @@ const runtimePlugin = (params) => ({
   usePlugins: (params === null || params === void 0 ? void 0 : params.plugins) || [
     (0, import_ssr.ssrPlugin)(),
     (0, import_cli2.routerPlugin)(),
-    (0, import_cli3.statePlugin)(),
     (0, import_cli.documentPlugin)()
   ],
   setup: (api) => {
@@ -167,7 +164,6 @@ const runtimePlugin = (params) => ({
     });
     api.onBeforeRestart(() => {
       (0, import_utils.cleanRequireCache)([
-        require.resolve("../state/cli"),
         require.resolve("../router/cli"),
         require.resolve("./ssr")
       ]);
@@ -181,6 +177,5 @@ var cli_default = runtimePlugin;
   isRuntimeEntry,
   routerPlugin,
   runtimePlugin,
-  ssrPlugin,
-  statePlugin
+  ssrPlugin
 });

package/dist/cjs/router/cli/code/index.js

@@ -42,11 +42,10 @@ var import_getClientRoutes = require("./getClientRoutes");
 var import_nestedRoutes = require("./nestedRoutes");
 var templates = __toESM(require("./templates"));
 var import_utils3 = require("./utils");
-const generateCode = async (appContext, config, entrypoints, api) => {
+const generateCode = async (appContext, config, entrypoints, api, isRouterV5) => {
   const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
   const hooks = api.getHooks();
-  const isV5 = (0, import_utils.isRouterV5)(config);
-  const getRoutes = isV5 ? import_getClientRoutes.getClientRoutesLegacy : import_getClientRoutes.getClientRoutes;
+  const getRoutes = isRouterV5 ? import_getClientRoutes.getClientRoutesLegacy : import_getClientRoutes.getClientRoutes;
   const oldVersion = typeof (config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
   await Promise.all(entrypoints.map(generateEntryCode));
   async function generateEntryCode(entrypoint) {
@@ -66,7 +65,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             internalDirAlias
           });
         }
-        if (!isV5 && entrypoint.nestedRoutesEntry) {
+        if (!isRouterV5 && entrypoint.nestedRoutesEntry) {
           nestedRoutes = await (0, import_nestedRoutes.walk)(entrypoint.nestedRoutesEntry, entrypoint.nestedRoutesEntry, {
             name: internalSrcAlias,
             basename: srcDirectory

package/dist/cjs/router/cli/code/templates.js

@@ -430,6 +430,9 @@ const runtimeGlobalContext = async ({ entryName, metaName, srcDirectory, nestedR
       } else {
         imports.push(`let appInit;`);
       }
+    } else {
+      imports.push(`let appConfig;`);
+      imports.push(`let appInit;`);
     }
   } else {
     imports.push(`let appConfig;`);

package/dist/cjs/router/cli/entry.js

@@ -49,14 +49,14 @@ const isRouteEntry = (dir) => {
   }
   return false;
 };
-const modifyEntrypoints = (entrypoints, config = {}) => {
+const modifyEntrypoints = (entrypoints, isRouterV5) => {
   return entrypoints.map((entrypoint) => {
     if (!entrypoint.isAutoMount) {
       return entrypoint;
     }
     if (entrypoint === null || entrypoint === void 0 ? void 0 : entrypoint.isCustomSourceEntry) {
       if (entrypoint.fileSystemRoutes) {
-        if ((0, import_utils.isRouterV5)(config)) {
+        if (isRouterV5) {
           throw Error("Custom entries with conventional routing not support use react router v5!");
         }
         entrypoint.nestedRoutesEntry = entrypoint.entry;

package/dist/cjs/router/cli/handler.js

@@ -39,17 +39,16 @@ var templates = __toESM(require("./code/templates"));
 var import_utils = require("./code/utils");
 var import_entry = require("./entry");
 let originEntrypoints = [];
-async function handleModifyEntrypoints(api, entrypoints) {
-  const config = api.getNormalizedConfig();
-  return (0, import_entry.modifyEntrypoints)(entrypoints, config);
+async function handleModifyEntrypoints(isRouterV5, entrypoints) {
+  return (0, import_entry.modifyEntrypoints)(entrypoints, isRouterV5);
 }
-async function handleGeneratorEntryCode(api, entrypoints) {
+async function handleGeneratorEntryCode(api, entrypoints, isRouterV5) {
   const appContext = api.getAppContext();
   const { internalDirectory } = appContext;
   const resolvedConfig = api.getNormalizedConfig();
   const { generatorRegisterCode, generateCode } = await Promise.resolve().then(() => __toESM(require("./code")));
   originEntrypoints = (0, import_lodash.cloneDeep)(entrypoints);
-  await generateCode(appContext, resolvedConfig, entrypoints, api);
+  await generateCode(appContext, resolvedConfig, entrypoints, api, isRouterV5);
   await Promise.all(entrypoints.map(async (entrypoint) => {
     if (entrypoint.nestedRoutesEntry || entrypoint.pageRoutesEntry) {
       var _entrypoint_fileSystemRoutes;
@@ -65,7 +64,7 @@ async function handleGeneratorEntryCode(api, entrypoints) {
   }));
   return entrypoints;
 }
-async function handleFileChange(api, e) {
+async function handleFileChange(api, isRouterV5, e) {
   const appContext = api.getAppContext();
   const { appDirectory, entrypoints } = appContext;
   const { filename, eventType } = e;
@@ -78,7 +77,7 @@ async function handleFileChange(api, e) {
     const resolvedConfig = api.getNormalizedConfig();
     const { generateCode } = await Promise.resolve().then(() => __toESM(require("./code")));
     const entrypoints2 = (0, import_lodash.cloneDeep)(originEntrypoints);
-    await generateCode(appContext, resolvedConfig, entrypoints2, api);
+    await generateCode(appContext, resolvedConfig, entrypoints2, api, isRouterV5);
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/router/cli/index.js

@@ -50,16 +50,19 @@ const routerPlugin = () => ({
   setup: (api) => {
     const nestedRoutes = {};
     const nestedRoutesForServer = {};
+    const { metaName } = api.getAppContext();
+    const isRouterV5 = api.isPluginExists(`@${metaName}/plugin-router-v5`);
     api._internalRuntimePlugins(({ entrypoint, plugins }) => {
       var _getEntryOptions;
-      const { packageName, serverRoutes, metaName } = api.getAppContext();
+      const { nestedRoutesEntry, pageRoutesEntry } = entrypoint;
+      const { packageName, serverRoutes, metaName: metaName2 } = api.getAppContext();
       const serverBase = serverRoutes.filter((route) => route.entryName === entrypoint.entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
       const userConfig = api.getNormalizedConfig();
       const routerConfig = (_getEntryOptions = (0, import_utils.getEntryOptions)(entrypoint.entryName, entrypoint.isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.router;
-      if (routerConfig && !(0, import_utils.isRouterV5)(userConfig)) {
+      if ((nestedRoutesEntry || pageRoutesEntry) && !isRouterV5) {
         plugins.push({
           name: "router",
-          path: `@${metaName}/runtime/router`,
+          path: `@${metaName2}/runtime/router`,
           config: typeof routerConfig === "boolean" ? {
             serverBase
           } : {
@@ -94,24 +97,23 @@ const routerPlugin = () => ({
       };
     });
     api.modifyEntrypoints(async ({ entrypoints }) => {
-      const newEntryPoints = await (0, import_handler.handleModifyEntrypoints)(api, entrypoints);
+      const newEntryPoints = await (0, import_handler.handleModifyEntrypoints)(isRouterV5, entrypoints);
       return {
         entrypoints: newEntryPoints
       };
     });
     api.generateEntryCode(async ({ entrypoints }) => {
-      await (0, import_handler.handleGeneratorEntryCode)(api, entrypoints);
+      await (0, import_handler.handleGeneratorEntryCode)(api, entrypoints, isRouterV5);
     });
     api.addRuntimeExports(() => {
-      const userConfig = api.useResolvedConfigContext();
-      const { internalDirectory, metaName } = api.useAppContext();
+      const { internalDirectory, metaName: metaName2 } = api.useAppContext();
       const pluginsExportsUtils = (0, import_utils.createRuntimeExportsUtils)(internalDirectory, "plugins");
-      if (!(0, import_utils.isRouterV5)(userConfig)) {
-        pluginsExportsUtils.addExport(`export { default as router } from '@${metaName}/runtime/router'`);
+      if (!isRouterV5) {
+        pluginsExportsUtils.addExport(`export { default as router } from '@${metaName2}/runtime/router'`);
       }
     });
     api.onFileChanged(async (e) => {
-      await (0, import_handler.handleFileChange)(api, e);
+      await (0, import_handler.handleFileChange)(api, isRouterV5, e);
     });
     api.modifyFileSystemRoutes(({ entrypoint, routes }) => {
       nestedRoutes[entrypoint.entryName] = routes;

package/dist/esm/cli/index.js

@@ -5,7 +5,6 @@ import path from "path";
 import { isReact18 as checkIsReact18, cleanRequireCache, createRuntimeExportsUtils } from "@modern-js/utils";
 import { documentPlugin } from "../document/cli";
 import { routerPlugin } from "../router/cli";
-import { statePlugin } from "../state/cli";
 import { builderPluginAlias } from "./alias";
 import { generateCode } from "./code";
 import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME } from "./constants";
@@ -26,7 +25,6 @@ var runtimePlugin = function(params) {
     usePlugins: (params === null || params === void 0 ? void 0 : params.plugins) || [
       ssrPlugin(),
       routerPlugin(),
-      statePlugin(),
       documentPlugin()
     ],
     setup: function(api) {
@@ -152,7 +150,6 @@ var runtimePlugin = function(params) {
       });
       api.onBeforeRestart(function() {
         cleanRequireCache([
-          require.resolve("../state/cli"),
           require.resolve("../router/cli"),
           require.resolve("./ssr")
         ]);
@@ -167,6 +164,5 @@ export {
   isRuntimeEntry2 as isRuntimeEntry,
   routerPlugin,
   runtimePlugin,
-  ssrPlugin,
-  statePlugin
+  ssrPlugin
 };

package/dist/esm/router/cli/code/index.js

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
 import { filterRoutesForServer, filterRoutesLoader, markRoutes } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
@@ -12,8 +12,8 @@ import { walk } from "./nestedRoutes";
 import * as templates from "./templates";
 import { getServerCombinedModueFile, getServerLoadersFile } from "./utils";
 var generateCode = function() {
-  var _ref = _async_to_generator(function(appContext, config, entrypoints, api) {
-    var internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hooks, isV5, getRoutes, oldVersion;
+  var _ref = _async_to_generator(function(appContext, config, entrypoints, api, isRouterV5) {
+    var internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hooks, getRoutes, oldVersion;
     function generateEntryCode(entrypoint) {
       return _generateEntryCode.apply(this, arguments);
     }
@@ -46,7 +46,7 @@ var generateCode = function() {
                   internalDirAlias
                 });
               }
-              if (!(!isV5 && entrypoint.nestedRoutesEntry))
+              if (!(!isRouterV5 && entrypoint.nestedRoutesEntry))
                 return [
                   3,
                   2
@@ -222,8 +222,7 @@ var generateCode = function() {
         case 0:
           internalDirectory = appContext.internalDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
           hooks = api.getHooks();
-          isV5 = isRouterV5(config);
-          getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
+          getRoutes = isRouterV5 ? getClientRoutesLegacy : getClientRoutes;
           oldVersion = _type_of(config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
           return [
             4,
@@ -237,7 +236,7 @@ var generateCode = function() {
       }
     });
   });
-  return function generateCode2(appContext, config, entrypoints, api) {
+  return function generateCode2(appContext, config, entrypoints, api, isRouterV5) {
     return _ref.apply(this, arguments);
   };
 }();

package/dist/esm/router/cli/code/templates.js

@@ -444,7 +444,7 @@ var runtimeGlobalContext = function() {
           if (!nestedRoutesEntry)
             return [
               3,
-              4
+              5
             ];
           rootLayoutPath = path.join(nestedRoutesEntry, "layout");
           rootLayoutFile = findExists([
@@ -496,17 +496,24 @@ var runtimeGlobalContext = function() {
           } else {
             imports.push("let appInit;");
           }
-          _state.label = 3;
-        case 3:
           return [
             3,
-            5
+            4
           ];
-        case 4:
+        case 3:
           imports.push("let appConfig;");
           imports.push("let appInit;");
-          _state.label = 5;
+          _state.label = 4;
+        case 4:
+          return [
+            3,
+            6
+          ];
         case 5:
+          imports.push("let appConfig;");
+          imports.push("let appInit;");
+          _state.label = 6;
+        case 6:
           if (globalApp) {
             imports.push("import layoutApp from '".concat(formatImportPath(globalApp.replace(srcDirectory, internalSrcAlias)), "';"));
           } else {

package/dist/esm/router/cli/entry.js

@@ -1,7 +1,7 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import path from "path";
-import { fs, JS_EXTENSIONS, findExists, isRouterV5 } from "@modern-js/utils";
+import { fs, JS_EXTENSIONS, findExists } from "@modern-js/utils";
 import { hasApp } from "../../cli/entry";
 import { FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, NESTED_ROUTES_DIR, PAGES_DIR_NAME } from "./constants";
 var hasPages = function(dir) {
@@ -19,15 +19,14 @@ var isRouteEntry = function(dir) {
   }
   return false;
 };
-var modifyEntrypoints = function(entrypoints) {
-  var config = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+var modifyEntrypoints = function(entrypoints, isRouterV5) {
   return entrypoints.map(function(entrypoint) {
     if (!entrypoint.isAutoMount) {
       return entrypoint;
     }
     if (entrypoint === null || entrypoint === void 0 ? void 0 : entrypoint.isCustomSourceEntry) {
       if (entrypoint.fileSystemRoutes) {
-        if (isRouterV5(config)) {
+        if (isRouterV5) {
           throw Error("Custom entries with conventional routing not support use react router v5!");
         }
         entrypoint.nestedRoutesEntry = entrypoint.entry;

package/dist/esm/router/cli/handler.js

@@ -6,27 +6,25 @@ import * as templates from "./code/templates";
 import { isPageComponentFile } from "./code/utils";
 import { modifyEntrypoints } from "./entry";
 var originEntrypoints = [];
-function handleModifyEntrypoints(api, entrypoints) {
+function handleModifyEntrypoints(isRouterV5, entrypoints) {
   return _handleModifyEntrypoints.apply(this, arguments);
 }
 function _handleModifyEntrypoints() {
-  _handleModifyEntrypoints = _async_to_generator(function(api, entrypoints) {
-    var config;
+  _handleModifyEntrypoints = _async_to_generator(function(isRouterV5, entrypoints) {
     return _ts_generator(this, function(_state) {
-      config = api.getNormalizedConfig();
       return [
         2,
-        modifyEntrypoints(entrypoints, config)
+        modifyEntrypoints(entrypoints, isRouterV5)
       ];
     });
   });
   return _handleModifyEntrypoints.apply(this, arguments);
 }
-function handleGeneratorEntryCode(api, entrypoints) {
+function handleGeneratorEntryCode(api, entrypoints, isRouterV5) {
   return _handleGeneratorEntryCode.apply(this, arguments);
 }
 function _handleGeneratorEntryCode() {
-  _handleGeneratorEntryCode = _async_to_generator(function(api, entrypoints) {
+  _handleGeneratorEntryCode = _async_to_generator(function(api, entrypoints, isRouterV5) {
     var appContext, internalDirectory, resolvedConfig, _ref, generatorRegisterCode, generateCode;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -43,7 +41,7 @@ function _handleGeneratorEntryCode() {
           originEntrypoints = cloneDeep(entrypoints);
           return [
             4,
-            generateCode(appContext, resolvedConfig, entrypoints, api)
+            generateCode(appContext, resolvedConfig, entrypoints, api, isRouterV5)
           ];
         case 2:
           _state.sent();
@@ -103,11 +101,11 @@ function _handleGeneratorEntryCode() {
   });
   return _handleGeneratorEntryCode.apply(this, arguments);
 }
-function handleFileChange(api, e) {
+function handleFileChange(api, isRouterV5, e) {
   return _handleFileChange.apply(this, arguments);
 }
 function _handleFileChange() {
-  _handleFileChange = _async_to_generator(function(api, e) {
+  _handleFileChange = _async_to_generator(function(api, isRouterV5, e) {
     var appContext, appDirectory, entrypoints, filename, eventType, nestedRouteEntries, pagesDir, isPageFile, absoluteFilePath, isRouteComponent, resolvedConfig, generateCode, entrypoints1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -145,7 +143,7 @@ function _handleFileChange() {
           entrypoints1 = cloneDeep(originEntrypoints);
           return [
             4,
-            generateCode(appContext, resolvedConfig, entrypoints1, api)
+            generateCode(appContext, resolvedConfig, entrypoints1, api, isRouterV5)
           ];
         case 2:
           _state.sent();

package/dist/esm/router/cli/index.js

@@ -3,7 +3,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
-import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
+import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, getEntryOptions } from "@modern-js/utils";
 import { filterRoutesForServer } from "@modern-js/utils";
 import { isRouteEntry } from "./entry";
 import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
@@ -18,10 +18,13 @@ var routerPlugin = function() {
     setup: function(api) {
       var nestedRoutes = {};
       var nestedRoutesForServer = {};
+      var metaName = api.getAppContext().metaName;
+      var isRouterV5 = api.isPluginExists("@".concat(metaName, "/plugin-router-v5"));
       api._internalRuntimePlugins(function(param) {
         var entrypoint = param.entrypoint, plugins = param.plugins;
         var _getEntryOptions;
-        var _api_getAppContext = api.getAppContext(), packageName = _api_getAppContext.packageName, serverRoutes = _api_getAppContext.serverRoutes, metaName = _api_getAppContext.metaName;
+        var nestedRoutesEntry = entrypoint.nestedRoutesEntry, pageRoutesEntry = entrypoint.pageRoutesEntry;
+        var _api_getAppContext = api.getAppContext(), packageName = _api_getAppContext.packageName, serverRoutes = _api_getAppContext.serverRoutes, metaName2 = _api_getAppContext.metaName;
         var serverBase = serverRoutes.filter(function(route) {
           return route.entryName === entrypoint.entryName;
         }).map(function(route) {
@@ -31,10 +34,10 @@ var routerPlugin = function() {
         });
         var userConfig = api.getNormalizedConfig();
         var routerConfig = (_getEntryOptions = getEntryOptions(entrypoint.entryName, entrypoint.isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.router;
-        if (routerConfig && !isV5(userConfig)) {
+        if ((nestedRoutesEntry || pageRoutesEntry) && !isRouterV5) {
           plugins.push({
             name: "router",
-            path: "@".concat(metaName, "/runtime/router"),
+            path: "@".concat(metaName2, "/runtime/router"),
             config: typeof routerConfig === "boolean" ? {
               serverBase
             } : _object_spread_props(_object_spread({}, routerConfig), {
@@ -77,7 +80,7 @@ var routerPlugin = function() {
                 entrypoints = param.entrypoints;
                 return [
                   4,
-                  handleModifyEntrypoints(api, entrypoints)
+                  handleModifyEntrypoints(isRouterV5, entrypoints)
                 ];
               case 1:
                 newEntryPoints = _state.sent();
@@ -103,7 +106,7 @@ var routerPlugin = function() {
                 entrypoints = param.entrypoints;
                 return [
                   4,
-                  handleGeneratorEntryCode(api, entrypoints)
+                  handleGeneratorEntryCode(api, entrypoints, isRouterV5)
                 ];
               case 1:
                 _state.sent();
@@ -118,11 +121,10 @@ var routerPlugin = function() {
         };
       }());
       api.addRuntimeExports(function() {
-        var userConfig = api.useResolvedConfigContext();
-        var _api_useAppContext = api.useAppContext(), internalDirectory = _api_useAppContext.internalDirectory, metaName = _api_useAppContext.metaName;
+        var _api_useAppContext = api.useAppContext(), internalDirectory = _api_useAppContext.internalDirectory, metaName2 = _api_useAppContext.metaName;
         var pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
-        if (!isV5(userConfig)) {
-          pluginsExportsUtils.addExport("export { default as router } from '@".concat(metaName, "/runtime/router'"));
+        if (!isRouterV5) {
+          pluginsExportsUtils.addExport("export { default as router } from '@".concat(metaName2, "/runtime/router'"));
         }
       });
       api.onFileChanged(function() {
@@ -132,7 +134,7 @@ var routerPlugin = function() {
               case 0:
                 return [
                   4,
-                  handleFileChange(api, e)
+                  handleFileChange(api, isRouterV5, e)
                 ];
               case 1:
                 _state.sent();

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

@@ -2,7 +2,6 @@ import path from "path";
 import { isReact18 as checkIsReact18, cleanRequireCache, createRuntimeExportsUtils } from "@modern-js/utils";
 import { documentPlugin } from "../document/cli";
 import { routerPlugin } from "../router/cli";
-import { statePlugin } from "../state/cli";
 import { builderPluginAlias } from "./alias";
 import { generateCode } from "./code";
 import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME } from "./constants";
@@ -22,7 +21,6 @@ const runtimePlugin = (params) => ({
   usePlugins: (params === null || params === void 0 ? void 0 : params.plugins) || [
     ssrPlugin(),
     routerPlugin(),
-    statePlugin(),
     documentPlugin()
   ],
   setup: (api) => {
@@ -128,7 +126,6 @@ const runtimePlugin = (params) => ({
     });
     api.onBeforeRestart(() => {
       cleanRequireCache([
-        require.resolve("../state/cli"),
         require.resolve("../router/cli"),
         require.resolve("./ssr")
       ]);
@@ -142,6 +139,5 @@ export {
   isRuntimeEntry2 as isRuntimeEntry,
   routerPlugin,
   runtimePlugin,
-  ssrPlugin,
-  statePlugin
+  ssrPlugin
 };

package/dist/esm-node/router/cli/code/index.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
 import { filterRoutesForServer, filterRoutesLoader, markRoutes } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
@@ -8,11 +8,10 @@ import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
 import { walk } from "./nestedRoutes";
 import * as templates from "./templates";
 import { getServerCombinedModueFile, getServerLoadersFile } from "./utils";
-const generateCode = async (appContext, config, entrypoints, api) => {
+const generateCode = async (appContext, config, entrypoints, api, isRouterV5) => {
   const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
   const hooks = api.getHooks();
-  const isV5 = isRouterV5(config);
-  const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
+  const getRoutes = isRouterV5 ? getClientRoutesLegacy : getClientRoutes;
   const oldVersion = typeof (config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
   await Promise.all(entrypoints.map(generateEntryCode));
   async function generateEntryCode(entrypoint) {
@@ -32,7 +31,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             internalDirAlias
           });
         }
-        if (!isV5 && entrypoint.nestedRoutesEntry) {
+        if (!isRouterV5 && entrypoint.nestedRoutesEntry) {
           nestedRoutes = await walk(entrypoint.nestedRoutesEntry, entrypoint.nestedRoutesEntry, {
             name: internalSrcAlias,
             basename: srcDirectory

package/dist/esm-node/router/cli/code/templates.js

@@ -394,6 +394,9 @@ const runtimeGlobalContext = async ({ entryName, metaName, srcDirectory, nestedR
       } else {
         imports.push(`let appInit;`);
       }
+    } else {
+      imports.push(`let appConfig;`);
+      imports.push(`let appInit;`);
     }
   } else {
     imports.push(`let appConfig;`);

package/dist/esm-node/router/cli/entry.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { fs, JS_EXTENSIONS, findExists, isRouterV5 } from "@modern-js/utils";
+import { fs, JS_EXTENSIONS, findExists } from "@modern-js/utils";
 import { hasApp } from "../../cli/entry";
 import { FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, NESTED_ROUTES_DIR, PAGES_DIR_NAME } from "./constants";
 const hasPages = (dir) => fs.existsSync(path.join(dir, PAGES_DIR_NAME));
@@ -13,14 +13,14 @@ const isRouteEntry = (dir) => {
   }
   return false;
 };
-const modifyEntrypoints = (entrypoints, config = {}) => {
+const modifyEntrypoints = (entrypoints, isRouterV5) => {
   return entrypoints.map((entrypoint) => {
     if (!entrypoint.isAutoMount) {
       return entrypoint;
     }
     if (entrypoint === null || entrypoint === void 0 ? void 0 : entrypoint.isCustomSourceEntry) {
       if (entrypoint.fileSystemRoutes) {
-        if (isRouterV5(config)) {
+        if (isRouterV5) {
           throw Error("Custom entries with conventional routing not support use react router v5!");
         }
         entrypoint.nestedRoutesEntry = entrypoint.entry;

package/dist/esm-node/router/cli/handler.js

@@ -4,17 +4,16 @@ import * as templates from "./code/templates";
 import { isPageComponentFile } from "./code/utils";
 import { modifyEntrypoints } from "./entry";
 let originEntrypoints = [];
-async function handleModifyEntrypoints(api, entrypoints) {
-  const config = api.getNormalizedConfig();
-  return modifyEntrypoints(entrypoints, config);
+async function handleModifyEntrypoints(isRouterV5, entrypoints) {
+  return modifyEntrypoints(entrypoints, isRouterV5);
 }
-async function handleGeneratorEntryCode(api, entrypoints) {
+async function handleGeneratorEntryCode(api, entrypoints, isRouterV5) {
   const appContext = api.getAppContext();
   const { internalDirectory } = appContext;
   const resolvedConfig = api.getNormalizedConfig();
   const { generatorRegisterCode, generateCode } = await import("./code");
   originEntrypoints = cloneDeep(entrypoints);
-  await generateCode(appContext, resolvedConfig, entrypoints, api);
+  await generateCode(appContext, resolvedConfig, entrypoints, api, isRouterV5);
   await Promise.all(entrypoints.map(async (entrypoint) => {
     if (entrypoint.nestedRoutesEntry || entrypoint.pageRoutesEntry) {
       var _entrypoint_fileSystemRoutes;
@@ -30,7 +29,7 @@ async function handleGeneratorEntryCode(api, entrypoints) {
   }));
   return entrypoints;
 }
-async function handleFileChange(api, e) {
+async function handleFileChange(api, isRouterV5, e) {
   const appContext = api.getAppContext();
   const { appDirectory, entrypoints } = appContext;
   const { filename, eventType } = e;
@@ -43,7 +42,7 @@ async function handleFileChange(api, e) {
     const resolvedConfig = api.getNormalizedConfig();
     const { generateCode } = await import("./code");
     const entrypoints2 = cloneDeep(originEntrypoints);
-    await generateCode(appContext, resolvedConfig, entrypoints2, api);
+    await generateCode(appContext, resolvedConfig, entrypoints2, api, isRouterV5);
   }
 }
 export {