@modern-js/runtime 1.21.5 → 2.0.0-beta.1

package/dist/js/node/document/cli/index.js

@@ -0,0 +1,140 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _path = _interopRequireDefault(require("path"));
+var _react = _interopRequireDefault(require("react"));
+var _server = _interopRequireDefault(require("react-dom/server"));
+var _esbuild = require("esbuild");
+var _utils = require("@modern-js/utils");
+var _DocumentContext = require("../DocumentContext");
+var _constants = require("../constants");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const debug = (0, _utils.createDebugger)('html_genarate');
+const getDocumenByEntryName = function getDocumenByEntryName(entrypoints, entryName) {
+  var _entrypoints$find;
+  const entryDir = (_entrypoints$find = entrypoints.find(item => item.entryName === entryName)) === null || _entrypoints$find === void 0 ? void 0 : _entrypoints$find.absoluteEntryDir;
+  const docFile = (0, _utils.findExists)(_constants.DOC_EXT.map(item => `${entryDir}${_path.default.sep}${_constants.DOCUMENT_FILE_NAME}.${item}`));
+  return docFile || undefined;
+};
+var _default = () => ({
+  name: '@modern-js/plugin-document',
+  pre: ['@modern-js/plugin-analyze'],
+  setup: async api => {
+    // get params for document.tsx
+    function getDocParams(params) {
+      const {
+        config,
+        templateParameters,
+        entryName
+      } = params;
+      // for enough params, devide as：process, config, templateParams
+      return {
+        processEnv: process.env,
+        config: {
+          output: config.output
+        },
+        entryName,
+        templateParams: templateParameters
+      };
+    }
+    const documentEntry = (entryName, templateParameters) => {
+      const {
+        entrypoints,
+        internalDirectory
+      } = api.useAppContext();
+      // search the document.[tsx|jsx|js|ts] under entry
+      // if not, use main as default
+      let documentFilePath = getDocumenByEntryName(entrypoints, entryName);
+      if (!documentFilePath) {
+        documentFilePath = getDocumenByEntryName(entrypoints, 'main');
+      }
+      // if no document file, do nothing as default
+      if (!documentFilePath) {
+        return null;
+      }
+      return async ({
+        htmlWebpackPlugin
+      }) => {
+        const documentParams = getDocParams({
+          config: api.useConfigContext(),
+          entryName,
+          templateParameters
+        });
+        const htmlOutputFile = _path.default.join(internalDirectory, `./document/_${entryName}.html.js`);
+        // transform document file to html string
+        await (0, _esbuild.build)({
+          entryPoints: [documentFilePath],
+          // write: false,
+          outfile: htmlOutputFile,
+          platform: 'node',
+          target: 'es6',
+          loader: {
+            '.ts': 'ts',
+            '.tsx': 'tsx'
+          },
+          bundle: true,
+          plugins: [{
+            name: 'make-all-packages-external',
+            setup(build) {
+              // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
+              build.onResolve({
+                filter: /^[^./]|^\.[^./]|^\.\.[^/]/
+              }, args => {
+                let external = true;
+                // FIXME: windows external entrypoint
+                if (args.kind === 'entry-point') {
+                  external = false;
+                }
+                return {
+                  path: args.path,
+                  external
+                };
+              });
+            }
+          }]
+        });
+        const Document = (await Promise.resolve(`${htmlOutputFile}`).then(s => _interopRequireWildcard(require(s)))).default;
+        const HTMLElement = /*#__PURE__*/_react.default.createElement(_DocumentContext.DocumentContext.Provider, {
+          value: documentParams
+        }, /*#__PURE__*/_react.default.createElement(Document, null));
+        const html = _server.default.renderToStaticMarkup(HTMLElement);
+        debug("entry %s's document jsx rendered html: %o", entryName, html);
+        const scripts = [htmlWebpackPlugin.tags.headTags.filter(item => item.tagName === 'script').join(''), htmlWebpackPlugin.tags.bodyTags.toString()].join('');
+        const metas = [templateParameters.meta, htmlWebpackPlugin.tags.headTags.filter(item => item.tagName !== 'script').join('')].join('');
+
+        // replace the html placeholder while transfer string to jsx component is not a easy way
+        return `<!DOCTYPE html>${html}`.replace(_constants.DOCUMENT_META_PLACEHOLDER, metas).replace(_constants.DOCUMENT_SSR_PLACEHOLDER, _constants.HTML_SEPARATOR).replace(_constants.DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER, _constants.PLACEHOLDER_REPLACER_MAP[_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, _constants.PLACEHOLDER_REPLACER_MAP[_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]);
+      };
+    };
+    return {
+      config: () => {
+        return {
+          tools: {
+            htmlPlugin: (options, entry) => {
+              // just for reuse the baseParames calculate by builder:
+              // https://github.com/modern-js-dev/modern.js/blob/1abb452a87ae1adbcf8da47d62c05da39cbe4d69/packages/builder/builder-webpack-provider/src/plugins/html.ts#L69-L103
+              const hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === 'function' ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : _objectSpread({}, options === null || options === void 0 ? void 0 : options.templateParameters);
+              const templateContent = documentEntry(entry.entryName,
+              // options,
+              hackParameters);
+              const documentHtmlOptions = templateContent ? {
+                templateContent,
+                inject: false
+              } : {};
+              return _objectSpread(_objectSpread({}, options), documentHtmlOptions);
+            }
+          }
+        };
+      }
+    };
+  }
+});
+exports.default = _default;

package/dist/js/node/document/constants.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PLACEHOLDER_REPLACER_MAP = exports.HTML_SSRDATASCRIPT_SEPARATOR = exports.HTML_SEPARATOR = exports.HTML_CHUNKSMAP_SEPARATOR = exports.DOC_EXT = exports.DOCUMENT_SSR_PLACEHOLDER = exports.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = exports.DOCUMENT_SCRIPTS_PLACEHOLDER = exports.DOCUMENT_NO_SCRIPTE_PLACEHOLDER = exports.DOCUMENT_META_PLACEHOLDER = exports.DOCUMENT_FILE_NAME = exports.DOCUMENT_CHUNKSMAP_PLACEHOLDER = void 0;
+const DOC_EXT = ['jsx', 'tsx', 'ts', 'js'];
+exports.DOC_EXT = DOC_EXT;
+const DOCUMENT_META_PLACEHOLDER = encodeURIComponent('<%= meta %>');
+exports.DOCUMENT_META_PLACEHOLDER = DOCUMENT_META_PLACEHOLDER;
+const HTML_SEPARATOR = '<!--<?- html ?>-->';
+exports.HTML_SEPARATOR = HTML_SEPARATOR;
+const HTML_CHUNKSMAP_SEPARATOR = '<!--<?- chunksMap.js ?>-->';
+exports.HTML_CHUNKSMAP_SEPARATOR = HTML_CHUNKSMAP_SEPARATOR;
+const HTML_SSRDATASCRIPT_SEPARATOR = '<!--<?- SSRDataScript ?>-->';
+// export const HTML_BOTTOMTPL_SEPARATOR = '<!--<?- bottomTemplate ?>-->'; // document jsx not need bottom
+exports.HTML_SSRDATASCRIPT_SEPARATOR = HTML_SSRDATASCRIPT_SEPARATOR;
+const DOCUMENT_SSR_PLACEHOLDER = encodeURIComponent(HTML_SEPARATOR);
+exports.DOCUMENT_SSR_PLACEHOLDER = DOCUMENT_SSR_PLACEHOLDER;
+const DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(HTML_CHUNKSMAP_SEPARATOR);
+exports.DOCUMENT_CHUNKSMAP_PLACEHOLDER = DOCUMENT_CHUNKSMAP_PLACEHOLDER;
+const DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = encodeURIComponent(HTML_SSRDATASCRIPT_SEPARATOR);
+exports.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = DOCUMENT_SSRDATASCRIPT_PLACEHOLDER;
+const DOCUMENT_FILE_NAME = 'document';
+exports.DOCUMENT_FILE_NAME = DOCUMENT_FILE_NAME;
+const DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent('<!-- chunk scripts placeholder -->');
+exports.DOCUMENT_SCRIPTS_PLACEHOLDER = DOCUMENT_SCRIPTS_PLACEHOLDER;
+const DOCUMENT_NO_SCRIPTE_PLACEHOLDER = encodeURIComponent('<!-- no-script -->');
+exports.DOCUMENT_NO_SCRIPTE_PLACEHOLDER = DOCUMENT_NO_SCRIPTE_PLACEHOLDER;
+const PLACEHOLDER_REPLACER_MAP = {
+  [DOCUMENT_NO_SCRIPTE_PLACEHOLDER]: `We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.`,
+  [DOCUMENT_SSR_PLACEHOLDER]: HTML_SEPARATOR,
+  [DOCUMENT_CHUNKSMAP_PLACEHOLDER]: HTML_CHUNKSMAP_SEPARATOR,
+  [DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]: HTML_SSRDATASCRIPT_SEPARATOR
+};
+exports.PLACEHOLDER_REPLACER_MAP = PLACEHOLDER_REPLACER_MAP;

package/dist/js/node/document/index.js

@@ -0,0 +1,93 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _Html = require("./Html");
+Object.keys(_Html).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _Html[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _Html[key];
+    }
+  });
+});
+var _DocumentContext = require("./DocumentContext");
+Object.keys(_DocumentContext).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _DocumentContext[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _DocumentContext[key];
+    }
+  });
+});
+var _DocumentStructrueContext = require("./DocumentStructrueContext");
+Object.keys(_DocumentStructrueContext).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _DocumentStructrueContext[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _DocumentStructrueContext[key];
+    }
+  });
+});
+var _Head = require("./Head");
+Object.keys(_Head).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _Head[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _Head[key];
+    }
+  });
+});
+var _Body = require("./Body");
+Object.keys(_Body).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _Body[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _Body[key];
+    }
+  });
+});
+var _Root = require("./Root");
+Object.keys(_Root).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _Root[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _Root[key];
+    }
+  });
+});
+var _Scripts = require("./Scripts");
+Object.keys(_Scripts).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _Scripts[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _Scripts[key];
+    }
+  });
+});
+var _constants = require("./constants");
+Object.keys(_constants).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _constants[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _constants[key];
+    }
+  });
+});

package/dist/js/node/exports/head.js

@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {};
 exports.default = void 0;
-
 var _reactHelmet = _interopRequireWildcard(require("react-helmet"));
-
 Object.keys(_reactHelmet).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -19,10 +17,7 @@ Object.keys(_reactHelmet).forEach(function (key) {
     }
   });
 });
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var _default = _reactHelmet.default;
 exports.default = _default;

package/dist/js/node/exports/loadable.js

@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {};
 exports.default = void 0;
-
 var _component = _interopRequireWildcard(require("@loadable/component"));
-
 Object.keys(_component).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -19,10 +17,7 @@ Object.keys(_component).forEach(function (key) {
     }
   });
 });
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var _default = _component.default;
 exports.default = _default;

package/dist/js/node/exports/server.js

@@ -4,7 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.hook = void 0;
-
 const hook = attacher => attacher;
-
 exports.hook = hook;

package/dist/js/node/exports/styled.js

@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {};
 exports.default = void 0;
-
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
 Object.keys(_styledComponents).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -19,10 +17,7 @@ Object.keys(_styledComponents).forEach(function (key) {
     }
   });
 });
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var _default = _styledComponents.default;
 exports.default = _default;

package/dist/js/node/index.js

@@ -33,16 +33,16 @@ Object.defineProperty(exports, "defineConfig", {
     return _core.defineConfig;
   }
 });
-Object.defineProperty(exports, "registerInit", {
+Object.defineProperty(exports, "isBrowser", {
   enumerable: true,
   get: function () {
-    return _core.registerInit;
+    return _common.isBrowser;
   }
 });
-Object.defineProperty(exports, "registerPrefetch", {
+Object.defineProperty(exports, "registerInit", {
   enumerable: true,
   get: function () {
-    return _core.registerPrefetch;
+    return _core.registerInit;
   }
 });
 Object.defineProperty(exports, "useLoader", {
@@ -57,5 +57,5 @@ Object.defineProperty(exports, "useRuntimeContext", {
     return _core.useRuntimeContext;
   }
 });
-
+var _common = require("./common");
 var _core = require("./core");

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

@@ -4,18 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _utils = require("@modern-js/utils");
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 const PLUGIN_IDENTIFIER = 'router';
 const ROUTES_IDENTIFIER = 'routes';
-
 var _default = () => ({
   name: '@modern-js/plugin-router',
   required: ['@modern-js/runtime'],
@@ -34,47 +28,47 @@ var _default = () => ({
           }
         };
       },
-
       validateSchema() {
         return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-router'];
       },
-
       modifyEntryImports({
         entrypoint,
         imports
       }) {
+        var _userConfig$runtime, _userConfig$runtime$r;
         const {
           entryName,
           fileSystemRoutes
         } = entrypoint;
         const userConfig = api.useResolvedConfigContext();
+        const isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$runtime = userConfig.runtime) === null || _userConfig$runtime === void 0 ? void 0 : (_userConfig$runtime$r = _userConfig$runtime.router) === null || _userConfig$runtime$r === void 0 ? void 0 : _userConfig$runtime$r.legacy);
         const {
           packageName
         } = api.useAppContext();
         const runtimeConfig = (0, _utils.getEntryOptions)(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
         runtimeConfigMap.set(entryName, runtimeConfig);
-
         if (runtimeConfig !== null && runtimeConfig !== void 0 && runtimeConfig.router) {
-          imports.push({
-            value: '@modern-js/runtime/plugins',
-            specifiers: [{
-              imported: PLUGIN_IDENTIFIER
-            }]
-          });
+          if (!isLegacy) {
+            imports.push({
+              value: '@modern-js/runtime/plugins',
+              specifiers: [{
+                imported: PLUGIN_IDENTIFIER
+              }]
+            });
+          }
         } else if (fileSystemRoutes) {
           throw new Error(`should enable runtime.router for entry ${entryName}`);
         }
-
         return {
           entrypoint,
           imports
         };
       },
-
       modifyEntryRuntimePlugins({
         entrypoint,
         plugins
       }) {
+        var _userConfig$runtime2, _userConfig$runtime2$;
         const {
           entryName,
           fileSystemRoutes
@@ -82,9 +76,10 @@ var _default = () => ({
         const {
           serverRoutes
         } = api.useAppContext();
+        const userConfig = api.useResolvedConfigContext();
+        const isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$runtime2 = userConfig.runtime) === null || _userConfig$runtime2 === void 0 ? void 0 : (_userConfig$runtime2$ = _userConfig$runtime2.router) === null || _userConfig$runtime2$ === void 0 ? void 0 : _userConfig$runtime2$.legacy);
         const runtimeConfig = runtimeConfigMap.get(entryName);
-
-        if (runtimeConfig.router) {
+        if (runtimeConfig.router && !isLegacy) {
           // Todo: plugin-router best to only handle manage client route.
           // here support base server route usage, part for compatibility
           const serverBase = serverRoutes.filter(route => route.entryName === entryName).map(route => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
@@ -97,19 +92,20 @@ var _default = () => ({
             })).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
           });
         }
-
         return {
           entrypoint,
           plugins
         };
       },
-
       addRuntimeExports() {
-        pluginsExportsUtils.addExport(`export { default as router } from '@modern-js/runtime/router'`);
+        var _userConfig$runtime3, _userConfig$runtime3$;
+        const userConfig = api.useResolvedConfigContext();
+        const isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$runtime3 = userConfig.runtime) === null || _userConfig$runtime3 === void 0 ? void 0 : (_userConfig$runtime3$ = _userConfig$runtime3.router) === null || _userConfig$runtime3$ === void 0 ? void 0 : _userConfig$runtime3$.legacy);
+        if (!isLegacy) {
+          pluginsExportsUtils.addExport(`export { default as router } from '@modern-js/runtime/router'`);
+        }
       }
-
     };
   }
 });
-
 exports.default = _default;

package/dist/js/node/router/index.js

@@ -18,9 +18,7 @@ Object.defineProperty(exports, "router", {
     return _runtime.default;
   }
 });
-
 var _runtime = _interopRequireWildcard(require("./runtime"));
-
 Object.keys(_runtime).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -32,7 +30,5 @@ Object.keys(_runtime).forEach(function (key) {
     }
   });
 });
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/dist/js/node/router/runtime/DefaultNotFound.js

@@ -4,14 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DefaultNotFound = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _jsxRuntime = require("react/jsx-runtime");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
 const DefaultNotFound = () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
   style: {
     margin: '150px auto',
@@ -22,5 +19,4 @@ const DefaultNotFound = () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
   },
   children: "404"
 });
-
 exports.DefaultNotFound = DefaultNotFound;

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

@@ -5,11 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {};
 exports.default = void 0;
-
 var _plugin = require("./plugin");
-
 var _reactRouterDom = require("react-router-dom");
-
 Object.keys(_reactRouterDom).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -21,17 +18,15 @@ Object.keys(_reactRouterDom).forEach(function (key) {
     }
   });
 });
-
-var _history = require("history");
-
-Object.keys(_history).forEach(function (key) {
+var _withRouter = require("./withRouter");
+Object.keys(_withRouter).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _history[key]) return;
+  if (key in exports && exports[key] === _withRouter[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _history[key];
+      return _withRouter[key];
     }
   });
 });