@modern-js/runtime 2.5.0-alpha.0 → 2.6.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @modern-js/runtime
 
+## 2.6.0
+
+### Patch Changes
+
+- 671477d: chore(CI): make CI faster
+
+  chore(CI): 提升 CI 执行速度
+
+- 7915ab3: fix: should not assign nestedRoutesEntry to entrypoint if use v5 router
+  fix: 使用 v5 路由的时候，不应该在 entrypoint 上挂载 nestedRoutesEntry 属性
+- a909ad1: feat: revert worker use async_hooks
+
+  feat: 还原 worker 使用 async_hooks 代码
+
+- 49fa0b1: fix: remove header info from SSR ctx to avoid security issues, reserved a switch
+  fix: 移除 SSR 上下文中的 header 信息，避免造成安全问题，预留一个字段开启
+- 1906d7b: fix: document param output get undefined in default template
+  fix: 修复 Document param 中 output 参数取值问题
+- Updated dependencies [e1f799e]
+- Updated dependencies [7915ab3]
+- Updated dependencies [49fa0b1]
+- Updated dependencies [0fe658a]
+- Updated dependencies [62930b9]
+  - @modern-js/utils@2.6.0
+  - @modern-js/types@2.6.0
+  - @modern-js/plugin@2.6.0
+
 ## 2.5.0
 
 ### Patch Changes

package/dist/cjs/cli/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
 ));
@@ -52,6 +56,11 @@ var cli_default = () => ({
           runtimeByEntries: {},
           source: {
             alias: {
+              /**
+               * twin.macro inserts styled-components into the code during the compilation process
+               * But it will not be installed under the user project.
+               * So need to add alias
+               */
               "styled-components": require.resolve("styled-components")
             },
             globalVars: {

package/dist/cjs/common.js

@@ -17,17 +17,11 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var common_exports = {};
 __export(common_exports, {
-  ESCAPED_SHELL_STREAM_END_MARK: () => ESCAPED_SHELL_STREAM_END_MARK,
-  JSX_SHELL_STREAM_END_MARK: () => JSX_SHELL_STREAM_END_MARK,
   isBrowser: () => isBrowser
 });
 module.exports = __toCommonJS(common_exports);
 const isBrowser = () => typeof window !== "undefined" && window.name !== "nodejs";
-const JSX_SHELL_STREAM_END_MARK = "<!--<?- SHELL_STREAM_END ?>-->";
-const ESCAPED_SHELL_STREAM_END_MARK = "&lt;!--&lt;?- SHELL_STREAM_END ?&gt;--&gt;";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ESCAPED_SHELL_STREAM_END_MARK,
-  JSX_SHELL_STREAM_END_MARK,
   isBrowser
 });

package/dist/cjs/core/app-config.js

@@ -22,7 +22,11 @@ __export(app_config_exports, {
 });
 module.exports = __toCommonJS(app_config_exports);
 const APP_CONFIG_SYMBOL = "config";
-const getConfig = (Component) => Component[APP_CONFIG_SYMBOL];
+const getConfig = (Component) => (
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
+  Component[APP_CONFIG_SYMBOL]
+);
 const defineConfig = (Component, config) => {
   Component[APP_CONFIG_SYMBOL] = config;
   return Component;

package/dist/cjs/core/compatible.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
 ));
@@ -86,12 +90,7 @@ const createApp = ({ plugins }) => {
                 }
               );
             }
-            return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_runtime_context.RuntimeReactContext.Provider, {
-              value: contextValue,
-              children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App2, {
-                ...props
-              })
-            });
+            return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_runtime_context.RuntimeReactContext.Provider, { value: contextValue, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App2, { ...props }) });
           };
           return (0, import_hoist_non_react_statics.default)(WrapComponent, App2);
         }
@@ -218,12 +217,14 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
         {},
         {
           skipNonStatic: id.staticGenerate,
+          // if not static generate, only non-static loader can exec on prod env
           skipStatic: process.env.NODE_ENV === "production" && !id.staticGenerate
         }
       )
     });
     const isRedirectResponse = (result) => {
-      if (typeof Response !== "undefined" && result instanceof Response && result.status >= 300 && result.status <= 399) {
+      if (typeof Response !== "undefined" && // fix: ssg workflow doesn't inject Web Response
+      result instanceof Response && result.status >= 300 && result.status <= 399) {
         const { status } = result;
         const redirectUrl = result.headers.get("Location") || "/";
         const { ssrContext } = context;

package/dist/cjs/core/loader/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/core/loader/loaderManager.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
 ));
@@ -88,6 +92,7 @@ const createLoader = (id, initialData = {
     reloading: hasLoaded && status === 1 /* loading */,
     data,
     error: error instanceof Error ? `${error.message}` : error,
+    // redundant fields for ssr log
     _error: error
   });
   const notify = () => {
@@ -128,6 +133,7 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
         id,
         typeof initialDataMap[id] !== "undefined" ? initialDataMap[id] : { data: loaderOptions.initialData },
         loaderFn,
+        // Todo whether static loader is exec when CSR
         skipExec
       );
       loadersMap.set(id, loader);

package/dist/cjs/core/loader/useLoader.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/document/Body.js

@@ -28,14 +28,12 @@ var import_Root = require("./Root");
 function Body(props) {
   const { hasSetRoot } = (0, import_react.useContext)(import_DocumentStructureContext.DocumentStructureContext);
   const { children } = props;
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("body", {
-    children: [
-      hasSetRoot ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Root.DefaultRoot, {}),
-      children,
-      `${import_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER}`,
-      `${import_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER}`
-    ]
-  });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("body", { children: [
+    hasSetRoot ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Root.DefaultRoot, {}),
+    children,
+    `${import_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER}`,
+    `${import_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER}`
+  ] });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/document/DocumentContext.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/document/DocumentStructureContext.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/document/Head.js

@@ -30,19 +30,15 @@ var import_constants = require("./constants");
 function Head(props) {
   const { hasSetScripts, hasSetLinks } = (0, import_react.useContext)(import_DocumentStructureContext.DocumentStructureContext);
   const { children } = props;
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("head", {
-    children: [
-      `${import_constants.DOCUMENT_META_PLACEHOLDER}`,
-      !hasSetLinks && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Links.Links, {}),
-      !hasSetScripts && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Scripts.Scripts, {}),
-      children
-    ]
-  });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("head", { children: [
+    `${import_constants.DOCUMENT_META_PLACEHOLDER}`,
+    !hasSetLinks && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Links.Links, {}),
+    !hasSetScripts && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Scripts.Scripts, {}),
+    children
+  ] });
 }
 function DefaultHead() {
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("head", {
-    children: `${import_constants.DOCUMENT_META_PLACEHOLDER}`
-  });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("head", { children: `${import_constants.DOCUMENT_META_PLACEHOLDER}` });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/document/Html.js

@@ -56,29 +56,31 @@ function Html(props) {
   const notMissMustChild = [
     hasSetHead,
     hasSetBody
+    // hasSetScripts,
+    // hasSetRoot,
   ].every((item) => item);
   if (!notMissMustChild) {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("html", {
-      children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("body", {
-        style: { color: "red" },
-        children: [
-          `Miss the `,
-          [
-            hasSetHead,
-            hasSetBody
-          ].map((item, index) => {
-            return item ? null : [
-              "Head",
-              "Body"
-            ][index];
-          }),
-          ` Element`
-        ]
-      })
-    });
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("html", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("body", { style: { color: "red" }, children: [
+      `Miss the `,
+      [
+        hasSetHead,
+        hasSetBody
+        // hasSetScripts,
+        // hasSetRoot,
+      ].map((item, index) => {
+        return item ? null : [
+          "Head",
+          "Body"
+          // 'Scripts',
+          // 'Root',
+        ][index];
+      }),
+      ` Element`
+    ] }) });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("html", {
-    children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_DocumentStructureContext.DocumentStructureContext.Provider, {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("html", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
+    import_DocumentStructureContext.DocumentStructureContext.Provider,
+    {
       value: {
         hasSetHead,
         hasSetScripts,
@@ -92,8 +94,8 @@ function Html(props) {
         !hasSetBody && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Body.Body, {}),
         children
       ]
-    })
-  });
+    }
+  ) });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/document/Links.js

@@ -23,9 +23,7 @@ module.exports = __toCommonJS(Links_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_constants = require("./constants");
 function Links() {
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
-    children: import_constants.DOCUMENT_LINKS_PLACEHOLDER
-  });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: import_constants.DOCUMENT_LINKS_PLACEHOLDER });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/document/Root.js

@@ -30,25 +30,19 @@ function Root(props) {
   const {
     templateParams: { mountId = "root" }
   } = (0, import_react.useContext)(import_DocumentContext.DocumentContext);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-    id: `${rootId || mountId}`,
-    children: [
-      `${import_constants.DOCUMENT_SSR_PLACEHOLDER}`,
-      children
-    ]
-  });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { id: `${rootId || mountId}`, children: [
+    `${import_constants.DOCUMENT_SSR_PLACEHOLDER}`,
+    children
+  ] });
 }
 function DefaultRoot(props) {
   const {
     templateParams: { mountId = "root" }
   } = (0, import_react.useContext)(import_DocumentContext.DocumentContext);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-    id: `${mountId}`,
-    children: [
-      `${import_constants.DOCUMENT_SSR_PLACEHOLDER}`,
-      props.children
-    ]
-  });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { id: `${mountId}`, children: [
+    `${import_constants.DOCUMENT_SSR_PLACEHOLDER}`,
+    props.children
+  ] });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/document/Script.js

@@ -26,13 +26,11 @@ function Script(props) {
   const { content } = props;
   const contentStr = content.toString();
   const contentIIFE = encodeURIComponent(`(${contentStr})()`);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
-    children: [
-      `${import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_START}`,
-      `${contentIIFE}`,
-      `${import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_END}`
-    ]
-  });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+    `${import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_START}`,
+    `${contentIIFE}`,
+    `${import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_END}`
+  ] });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/document/Scripts.js

@@ -23,9 +23,7 @@ module.exports = __toCommonJS(Scripts_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_constants = require("./constants");
 function Scripts() {
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
-    children: `${import_constants.DOCUMENT_SCRIPTS_PLACEHOLDER}`
-  });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: `${import_constants.DOCUMENT_SCRIPTS_PLACEHOLDER}` });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/document/cli/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
 ));
@@ -107,6 +111,7 @@ var cli_default = () => ({
           entryPoints: [documentFilePath],
           outfile: htmlOutputFile,
           platform: "node",
+          // change esbuild use the rootDir tsconfig.json as default to tempTsConfigFile
           tsconfig: tempTsConfigFile,
           target: "es6",
           loader: {
@@ -163,7 +168,7 @@ var cli_default = () => ({
               `${import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_START}(.*?)${import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_END}`,
               "g"
             ),
-            (_scriptStr, $1) => `<script>${decodeURIComponent($1)}<\/script>`
+            (_scriptStr, $1) => `<script>${decodeURIComponent($1)}</script>`
           );
         }
         const finalHtml = `<!DOCTYPE html>${html}`.replace(import_constants.DOCUMENT_META_PLACEHOLDER, metas).replace(import_constants.DOCUMENT_SSR_PLACEHOLDER, import_constants.HTML_SEPARATOR).replace(import_constants.DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(import_constants.DOCUMENT_LINKS_PLACEHOLDER, links).replace(
@@ -189,6 +194,7 @@ var cli_default = () => ({
               ) : { ...options == null ? void 0 : options.templateParameters };
               const templateContent = documentEntry(
                 entry.entryName,
+                // options,
                 hackParameters
               );
               const documentHtmlOptions = templateContent ? {

package/dist/cjs/exports/head.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 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/exports/loadable.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 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/exports/styled.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 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/router/cli/index.js

@@ -23,10 +23,6 @@ module.exports = __toCommonJS(cli_exports);
 var import_utils = require("@modern-js/utils");
 const PLUGIN_IDENTIFIER = "router";
 const ROUTES_IDENTIFIER = "routes";
-const isV5 = (config) => {
-  var _a, _b;
-  return ((_b = (_a = config == null ? void 0 : config.runtime) == null ? void 0 : _a.router) == null ? void 0 : _b.mode) === "react-router-5";
-};
 var cli_default = () => ({
   name: "@modern-js/plugin-router",
   required: ["@modern-js/runtime"],
@@ -63,7 +59,7 @@ var cli_default = () => ({
         );
         runtimeConfigMap.set(entryName, runtimeConfig);
         if (runtimeConfig == null ? void 0 : runtimeConfig.router) {
-          if (!isV5(userConfig)) {
+          if (!(0, import_utils.isRouterV5)(userConfig)) {
             imports.push({
               value: "@modern-js/runtime/plugins",
               specifiers: [{ imported: PLUGIN_IDENTIFIER }]
@@ -84,7 +80,7 @@ var cli_default = () => ({
         const { serverRoutes } = api.useAppContext();
         const userConfig = api.useResolvedConfigContext();
         const runtimeConfig = runtimeConfigMap.get(entryName);
-        if (runtimeConfig.router && !isV5(userConfig)) {
+        if (runtimeConfig.router && !(0, import_utils.isRouterV5)(userConfig)) {
           const serverBase = serverRoutes.filter((route) => route.entryName === entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
           plugins.push({
             name: PLUGIN_IDENTIFIER,
@@ -105,7 +101,7 @@ var cli_default = () => ({
       },
       addRuntimeExports() {
         const userConfig = api.useResolvedConfigContext();
-        if (!isV5(userConfig)) {
+        if (!(0, import_utils.isRouterV5)(userConfig)) {
           pluginsExportsUtils.addExport(
             `export { default as router } from '@modern-js/runtime/router'`
           );

package/dist/cjs/router/index.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 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/router/runtime/DefaultNotFound.js

@@ -21,16 +21,19 @@ __export(DefaultNotFound_exports, {
 });
 module.exports = __toCommonJS(DefaultNotFound_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-const DefaultNotFound = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-  style: {
-    margin: "150px auto",
-    textAlign: "center",
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "center"
-  },
-  children: "404"
-});
+const DefaultNotFound = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+  "div",
+  {
+    style: {
+      margin: "150px auto",
+      textAlign: "center",
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center"
+    },
+    children: "404"
+  }
+);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DefaultNotFound

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

@@ -18,65 +18,16 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var runtime_exports = {};
 __export(runtime_exports, {
-  Form: () => import_react_router_dom.Form,
-  Outlet: () => import_react_router_dom.Outlet,
   default: () => runtime_default,
-  defer: () => import_remix_router.defer,
-  isRouteErrorResponse: () => import_react_router_dom.isRouteErrorResponse,
-  modifyRoutes: () => import_plugin2.modifyRoutes,
-  unstable_useBlocker: () => import_react_router_dom.unstable_useBlocker,
-  unstable_usePrompt: () => import_react_router_dom.unstable_usePrompt,
-  useAsyncError: () => import_react_router_dom.useAsyncError,
-  useAsyncValue: () => import_react_router_dom.useAsyncValue,
-  useBeforeUnload: () => import_react_router_dom.useBeforeUnload,
-  useFormAction: () => import_react_router_dom.useFormAction,
-  useHref: () => import_react_router_dom.useHref,
-  useLocation: () => import_react_router_dom.useLocation,
-  useNavigate: () => import_react_router_dom.useNavigate,
-  useNavigation: () => import_react_router_dom.useNavigation,
-  useNavigationType: () => import_react_router_dom.useNavigationType,
-  useOutlet: () => import_react_router_dom.useOutlet,
-  useOutletContext: () => import_react_router_dom.useOutletContext,
-  useParams: () => import_react_router_dom.useParams,
-  useResolvedPath: () => import_react_router_dom.useResolvedPath,
-  useRevalidator: () => import_react_router_dom.useRevalidator,
-  useRouteError: () => import_react_router_dom.useRouteError,
-  useRouteLoaderData: () => import_react_router_dom.useRouteLoaderData,
-  useSearchParams: () => import_react_router_dom.useSearchParams,
-  useSubmit: () => import_react_router_dom.useSubmit
+  modifyRoutes: () => import_plugin2.modifyRoutes
 });
 module.exports = __toCommonJS(runtime_exports);
 var import_plugin = require("./plugin");
 var import_plugin2 = require("./plugin");
+__reExport(runtime_exports, require("react-router-dom"), module.exports);
 __reExport(runtime_exports, require("./withRouter"), module.exports);
-var import_react_router_dom = require("react-router-dom");
-var import_remix_router = require("@modern-js/utils/remix-router");
 var runtime_default = import_plugin.routerPlugin;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Form,
-  Outlet,
-  defer,
-  isRouteErrorResponse,
-  modifyRoutes,
-  unstable_useBlocker,
-  unstable_usePrompt,
-  useAsyncError,
-  useAsyncValue,
-  useBeforeUnload,
-  useFormAction,
-  useHref,
-  useLocation,
-  useNavigate,
-  useNavigation,
-  useNavigationType,
-  useOutlet,
-  useOutletContext,
-  useParams,
-  useResolvedPath,
-  useRevalidator,
-  useRouteError,
-  useRouteLoaderData,
-  useSearchParams,
-  useSubmit
+  modifyRoutes
 });