@modern-js/plugin-router-v5 2.4.1-beta.0 → 2.6.0

package/dist/{js/node → cjs}/cli/index.js

@@ -1,24 +1,7 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -41,10 +24,6 @@ var import_utils = require("@modern-js/utils");
 var import_types2 = require("./types");
 const PLUGIN_IDENTIFIER = "router";
 const ROUTES_IDENTIFIER = "routes";
-const isV5 = (config) => {
-  var _a, _b, _c;
-  return 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";
-};
 var cli_default = () => ({
   name: "@modern-js/plugin-router-v5",
   required: ["@modern-js/runtime"],
@@ -86,7 +65,7 @@ var cli_default = () => ({
           packageName
         );
         runtimeConfigMap.set(entryName, runtimeConfig);
-        if (isV5(userConfig)) {
+        if ((0, import_utils.isRouterV5)(userConfig)) {
           imports.push({
             value: "@modern-js/runtime/plugins",
             specifiers: [{ imported: PLUGIN_IDENTIFIER }]
@@ -106,15 +85,15 @@ var cli_default = () => ({
         const { serverRoutes } = api.useAppContext();
         const runtimeConfig = runtimeConfigMap.get(entryName);
         const userConfig = api.useResolvedConfigContext();
-        if (isV5(userConfig)) {
+        if ((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,
-            options: JSON.stringify(__spreadProps(__spreadValues({
-              serverBase
-            }, runtimeConfig.router), {
+            options: JSON.stringify({
+              serverBase,
+              ...runtimeConfig.router,
               routesConfig: fileSystemRoutes ? `{ ${ROUTES_IDENTIFIER}, globalApp: App }` : void 0
-            })).replace(
+            }).replace(
               /"routesConfig"\s*:\s*"((\S|\s)+)"/g,
               '"routesConfig": $1,'
             )
@@ -127,7 +106,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/plugin-router-v5/runtime'`
           );

package/dist/{js/node → cjs}/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/{js/node → cjs}/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/{js/node → cjs}/runtime/plugin.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -34,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
 ));
@@ -78,12 +65,7 @@ const routerPlugin = ({
               const baseUrl = ((_a = window._SERVER_DATA) == null ? void 0 : _a.router.baseUrl) || select(location.pathname);
               historyOptions.basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, historyOptions.basename) : baseUrl;
               const history = customHistory || (supportHtml5History ? (0, import_history.createBrowserHistory)(historyOptions) : (0, import_history.createHashHistory)(historyOptions));
-              return (props) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Router, {
-                history,
-                children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadProps(__spreadValues({}, props), {
-                  children: createRoutes ? createRoutes() : (0, import_utils.renderRoutes)(routesConfig, props)
-                }))
-              });
+              return (props) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Router, { history, children: createRoutes ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { ...props, Component: createRoutes() }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { ...props, children: (0, import_utils.renderRoutes)(routesConfig, props) }) });
             }
             return (props) => {
               const runtimeContext = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
@@ -93,14 +75,15 @@ const routerPlugin = ({
               const request = ssrContext == null ? void 0 : ssrContext.request;
               const baseUrl = request == null ? void 0 : request.baseUrl;
               const basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, historyOptions.basename) : baseUrl;
-              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.StaticRouter, {
-                basename: basename === "/" ? "" : basename,
-                location: location2,
-                context: routerContext,
-                children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadProps(__spreadValues({}, props), {
-                  children: createRoutes ? createRoutes() : (0, import_utils.renderRoutes)(routesConfig, props)
-                }))
-              });
+              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+                import_react_router_dom.StaticRouter,
+                {
+                  basename: basename === "/" ? "" : basename,
+                  location: location2,
+                  context: routerContext,
+                  children: createRoutes ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { ...props, Component: createRoutes() }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { ...props, children: (0, import_utils.renderRoutes)(routesConfig, props) })
+                }
+              );
             };
           };
           let RouteApp = getRouteApp();

package/dist/{js/node → cjs}/runtime/utils.js

@@ -1,33 +1,7 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -56,15 +30,12 @@ function renderRoutes(routesConfig, extraProps = {}) {
   if (!routesConfig) {
     return null;
   }
-  const Layout = (_a) => {
-    var _b = _a, { Component } = _b, props = __objRest(_b, ["Component"]);
+  const Layout = ({ Component, ...props }) => {
     const GlobalLayout = routesConfig == null ? void 0 : routesConfig.globalApp;
     if (!GlobalLayout) {
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, __spreadValues({}, props));
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props });
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, __spreadValues({
-      Component
-    }, props));
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, { Component, ...props });
   };
   const findMatchedRoute = (pathname) => {
     var _a;
@@ -77,23 +48,34 @@ function renderRoutes(routesConfig, extraProps = {}) {
       return Boolean(info);
     });
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, {
-    path: "/",
-    render: (props) => {
-      const matchedRoute = findMatchedRoute(props.location.pathname);
-      if (!matchedRoute) {
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_DefaultNotFound.DefaultNotFound, {});
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    import_react_router_dom.Route,
+    {
+      path: "/",
+      render: (props) => {
+        const matchedRoute = findMatchedRoute(props.location.pathname);
+        if (!matchedRoute) {
+          return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_DefaultNotFound.DefaultNotFound, {});
+        }
+        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          import_react_router_dom.Route,
+          {
+            path: matchedRoute.path,
+            exact: matchedRoute.exact,
+            sensitive: matchedRoute.sensitive,
+            render: (routeProps) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+              Layout,
+              {
+                Component: matchedRoute.component,
+                ...routeProps,
+                ...extraProps
+              }
+            )
+          }
+        );
       }
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, {
-        path: matchedRoute.path,
-        exact: matchedRoute.exact,
-        sensitive: matchedRoute.sensitive,
-        render: (routeProps) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Layout, __spreadValues(__spreadValues({
-          Component: matchedRoute.component
-        }, routeProps), extraProps))
-      });
     }
-  });
+  );
 }
 function getLocation(serverContext) {
   var _a;

package/dist/{js/treeshaking → esm}/cli/index.js

@@ -50,14 +50,10 @@ function _objectSpreadProps(target, source) {
     }
     return target;
 }
-import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
+import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS, isRouterV5 as isV5 } from "@modern-js/utils";
 import "./types";
 var PLUGIN_IDENTIFIER = "router";
 var ROUTES_IDENTIFIER = "routes";
-var isV5 = function(config) {
-    var _config_runtime, _config_runtime1, _config_runtime_router;
-    return 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";
-};
 var cli_default = function() {
     return {
         name: "@modern-js/plugin-router-v5",

package/dist/{js/treeshaking → esm}/runtime/plugin.js

@@ -90,8 +90,10 @@ var routerPlugin = function(param) {
                             return function(props) {
                                 return /* @__PURE__ */ jsx(Router, {
                                     history: history,
-                                    children: /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
-                                        children: createRoutes ? createRoutes() : renderRoutes(routesConfig, props)
+                                    children: createRoutes ? /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
+                                        Component: createRoutes()
+                                    })) : /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
+                                        children: renderRoutes(routesConfig, props)
                                     }))
                                 });
                             };
@@ -108,8 +110,10 @@ var routerPlugin = function(param) {
                                 basename: basename === "/" ? "" : basename,
                                 location: location2,
                                 context: routerContext,
-                                children: /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
-                                    children: createRoutes ? createRoutes() : renderRoutes(routesConfig, props)
+                                children: createRoutes ? /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
+                                    Component: createRoutes()
+                                })) : /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
+                                    children: renderRoutes(routesConfig, props)
                                 }))
                             });
                         };

package/dist/{js/modern → esm-node}/cli/index.js

@@ -1,34 +1,12 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import {
   getEntryOptions,
   createRuntimeExportsUtils,
-  PLUGIN_SCHEMAS
+  PLUGIN_SCHEMAS,
+  isRouterV5 as isV5
 } from "@modern-js/utils";
 import "./types";
 const PLUGIN_IDENTIFIER = "router";
 const ROUTES_IDENTIFIER = "routes";
-const isV5 = (config) => {
-  var _a, _b, _c;
-  return 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";
-};
 var cli_default = () => ({
   name: "@modern-js/plugin-router-v5",
   required: ["@modern-js/runtime"],
@@ -94,11 +72,11 @@ var cli_default = () => ({
           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,
-            options: JSON.stringify(__spreadProps(__spreadValues({
-              serverBase
-            }, runtimeConfig.router), {
+            options: JSON.stringify({
+              serverBase,
+              ...runtimeConfig.router,
               routesConfig: fileSystemRoutes ? `{ ${ROUTES_IDENTIFIER}, globalApp: App }` : void 0
-            })).replace(
+            }).replace(
               /"routesConfig"\s*:\s*"((\S|\s)+)"/g,
               '"routesConfig": $1,'
             )

package/dist/esm-node/runtime/DefaultNotFound.js

@@ -0,0 +1,17 @@
+import { jsx } from "react/jsx-runtime";
+const DefaultNotFound = () => /* @__PURE__ */ jsx(
+  "div",
+  {
+    style: {
+      margin: "150px auto",
+      textAlign: "center",
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center"
+    },
+    children: "404"
+  }
+);
+export {
+  DefaultNotFound
+};

package/dist/{js/modern → esm-node}/runtime/plugin.js

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { jsx } from "react/jsx-runtime";
 import { useContext } from "react";
 import {
@@ -60,12 +41,7 @@ const routerPlugin = ({
               const baseUrl = ((_a = window._SERVER_DATA) == null ? void 0 : _a.router.baseUrl) || select(location.pathname);
               historyOptions.basename = baseUrl === "/" ? urlJoin(baseUrl, historyOptions.basename) : baseUrl;
               const history = customHistory || (supportHtml5History ? createBrowserHistory(historyOptions) : createHashHistory(historyOptions));
-              return (props) => /* @__PURE__ */ jsx(Router, {
-                history,
-                children: /* @__PURE__ */ jsx(App, __spreadProps(__spreadValues({}, props), {
-                  children: createRoutes ? createRoutes() : renderRoutes(routesConfig, props)
-                }))
-              });
+              return (props) => /* @__PURE__ */ jsx(Router, { history, children: createRoutes ? /* @__PURE__ */ jsx(App, { ...props, Component: createRoutes() }) : /* @__PURE__ */ jsx(App, { ...props, children: renderRoutes(routesConfig, props) }) });
             }
             return (props) => {
               const runtimeContext = useContext(RuntimeReactContext);
@@ -75,14 +51,15 @@ const routerPlugin = ({
               const request = ssrContext == null ? void 0 : ssrContext.request;
               const baseUrl = request == null ? void 0 : request.baseUrl;
               const basename = baseUrl === "/" ? urlJoin(baseUrl, historyOptions.basename) : baseUrl;
-              return /* @__PURE__ */ jsx(StaticRouter, {
-                basename: basename === "/" ? "" : basename,
-                location: location2,
-                context: routerContext,
-                children: /* @__PURE__ */ jsx(App, __spreadProps(__spreadValues({}, props), {
-                  children: createRoutes ? createRoutes() : renderRoutes(routesConfig, props)
-                }))
-              });
+              return /* @__PURE__ */ jsx(
+                StaticRouter,
+                {
+                  basename: basename === "/" ? "" : basename,
+                  location: location2,
+                  context: routerContext,
+                  children: createRoutes ? /* @__PURE__ */ jsx(App, { ...props, Component: createRoutes() }) : /* @__PURE__ */ jsx(App, { ...props, children: renderRoutes(routesConfig, props) })
+                }
+              );
             };
           };
           let RouteApp = getRouteApp();

package/dist/esm-node/runtime/utils.js

@@ -0,0 +1,91 @@
+import { jsx } from "react/jsx-runtime";
+import { Route, matchPath } from "react-router-dom";
+import { DefaultNotFound } from "./DefaultNotFound";
+function renderRoutes(routesConfig, extraProps = {}) {
+  if (!routesConfig) {
+    return null;
+  }
+  const Layout = ({ Component, ...props }) => {
+    const GlobalLayout = routesConfig == null ? void 0 : routesConfig.globalApp;
+    if (!GlobalLayout) {
+      return /* @__PURE__ */ jsx(Component, { ...props });
+    }
+    return /* @__PURE__ */ jsx(GlobalLayout, { Component, ...props });
+  };
+  const findMatchedRoute = (pathname) => {
+    var _a;
+    return (_a = routesConfig == null ? void 0 : routesConfig.routes) == null ? void 0 : _a.find((route) => {
+      const info = matchPath(pathname, {
+        path: route.path,
+        exact: route.exact,
+        sensitive: route.sensitive
+      });
+      return Boolean(info);
+    });
+  };
+  return /* @__PURE__ */ jsx(
+    Route,
+    {
+      path: "/",
+      render: (props) => {
+        const matchedRoute = findMatchedRoute(props.location.pathname);
+        if (!matchedRoute) {
+          return /* @__PURE__ */ jsx(DefaultNotFound, {});
+        }
+        return /* @__PURE__ */ jsx(
+          Route,
+          {
+            path: matchedRoute.path,
+            exact: matchedRoute.exact,
+            sensitive: matchedRoute.sensitive,
+            render: (routeProps) => /* @__PURE__ */ jsx(
+              Layout,
+              {
+                Component: matchedRoute.component,
+                ...routeProps,
+                ...extraProps
+              }
+            )
+          }
+        );
+      }
+    }
+  );
+}
+function getLocation(serverContext) {
+  var _a;
+  const { pathname, url } = (serverContext == null ? void 0 : serverContext.request) || {};
+  const cleanUrl = (_a = url == null ? void 0 : url.replace("http://", "")) == null ? void 0 : _a.replace("https://", "");
+  const index = (cleanUrl || "").indexOf(pathname);
+  if (index === -1) {
+    return pathname;
+  }
+  return cleanUrl.substring(index);
+}
+const urlJoin = (...parts) => {
+  const separator = "/";
+  const replace = new RegExp(`${separator}{1,}`, "g");
+  return standardSlash(parts.join(separator).replace(replace, separator));
+};
+function standardSlash(str) {
+  let addr = str;
+  if (!addr || typeof addr !== "string") {
+    return addr;
+  }
+  if (addr.startsWith(".")) {
+    addr = addr.slice(1);
+  }
+  if (!addr.startsWith("/")) {
+    addr = `/${addr}`;
+  }
+  if (addr.endsWith("/") && addr !== "/") {
+    addr = addr.slice(0, addr.length - 1);
+  }
+  return addr;
+}
+export {
+  getLocation,
+  renderRoutes,
+  standardSlash,
+  urlJoin
+};

package/dist/types/runtime/plugin.d.ts

@@ -40,7 +40,7 @@ export type RouterConfig = Partial<HistoryConfig> & {
     globalApp?: React.ComponentType<any>;
     routes?: SingleRouteConfig[];
   };
-  createRoutes?: () => JSX.Element;
+  createRoutes?: () => React.ComponentType<any> | null;
   history?: History;
   serverBase?: string[];
 };

package/package.json

@@ -11,24 +11,23 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-beta.0",
+  "version": "2.6.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
-  "main": "./dist/js/node/cli/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/cli/index.js",
+  "main": "./dist/cjs/cli/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
+      "default": "./dist/cjs/cli/index.js"
     },
     "./runtime": {
       "jsnext:source": "./src/runtime/index.ts",
-      "default": "./dist/js/treeshaking/runtime/index.js"
+      "default": "./dist/esm/runtime/index.js"
     },
     "./cli": {
       "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
+      "default": "./dist/cjs/cli/index.js"
     }
   },
   "typesVersions": {
@@ -53,8 +52,8 @@
     "hoist-non-react-statics": "^3.3.2",
     "@types/history": "^4.7.9",
     "@types/react-router-dom": "^5.1.8",
-    "@modern-js/utils": "2.4.1-beta.0",
-    "@modern-js/types": "2.4.0"
+    "@modern-js/utils": "2.6.0",
+    "@modern-js/types": "2.6.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -73,12 +72,12 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/invariant": "^2.2.30",
-    "@modern-js/runtime": "2.4.1-beta.0",
-    "@modern-js/core": "2.4.1-beta.0",
-    "@modern-js/utils": "2.4.1-beta.0",
-    "@scripts/build": "2.4.0",
-    "@modern-js/app-tools": "3.0.0-beta.0",
-    "@scripts/jest-config": "2.4.0"
+    "@modern-js/runtime": "2.6.0",
+    "@modern-js/core": "2.6.0",
+    "@modern-js/utils": "2.6.0",
+    "@scripts/build": "2.6.0",
+    "@modern-js/app-tools": "2.6.0",
+    "@scripts/jest-config": "2.6.0"
   },
   "sideEffects": false,
   "modernConfig": {},

package/dist/js/modern/runtime/DefaultNotFound.js

@@ -1,14 +0,0 @@
-import { jsx } from "react/jsx-runtime";
-const DefaultNotFound = () => /* @__PURE__ */ jsx("div", {
-  style: {
-    margin: "150px auto",
-    textAlign: "center",
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "center"
-  },
-  children: "404"
-});
-export {
-  DefaultNotFound
-};

package/dist/js/modern/runtime/utils.js

@@ -1,111 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-import { jsx } from "react/jsx-runtime";
-import { Route, matchPath } from "react-router-dom";
-import { DefaultNotFound } from "./DefaultNotFound";
-function renderRoutes(routesConfig, extraProps = {}) {
-  if (!routesConfig) {
-    return null;
-  }
-  const Layout = (_a) => {
-    var _b = _a, { Component } = _b, props = __objRest(_b, ["Component"]);
-    const GlobalLayout = routesConfig == null ? void 0 : routesConfig.globalApp;
-    if (!GlobalLayout) {
-      return /* @__PURE__ */ jsx(Component, __spreadValues({}, props));
-    }
-    return /* @__PURE__ */ jsx(GlobalLayout, __spreadValues({
-      Component
-    }, props));
-  };
-  const findMatchedRoute = (pathname) => {
-    var _a;
-    return (_a = routesConfig == null ? void 0 : routesConfig.routes) == null ? void 0 : _a.find((route) => {
-      const info = matchPath(pathname, {
-        path: route.path,
-        exact: route.exact,
-        sensitive: route.sensitive
-      });
-      return Boolean(info);
-    });
-  };
-  return /* @__PURE__ */ jsx(Route, {
-    path: "/",
-    render: (props) => {
-      const matchedRoute = findMatchedRoute(props.location.pathname);
-      if (!matchedRoute) {
-        return /* @__PURE__ */ jsx(DefaultNotFound, {});
-      }
-      return /* @__PURE__ */ jsx(Route, {
-        path: matchedRoute.path,
-        exact: matchedRoute.exact,
-        sensitive: matchedRoute.sensitive,
-        render: (routeProps) => /* @__PURE__ */ jsx(Layout, __spreadValues(__spreadValues({
-          Component: matchedRoute.component
-        }, routeProps), extraProps))
-      });
-    }
-  });
-}
-function getLocation(serverContext) {
-  var _a;
-  const { pathname, url } = (serverContext == null ? void 0 : serverContext.request) || {};
-  const cleanUrl = (_a = url == null ? void 0 : url.replace("http://", "")) == null ? void 0 : _a.replace("https://", "");
-  const index = (cleanUrl || "").indexOf(pathname);
-  if (index === -1) {
-    return pathname;
-  }
-  return cleanUrl.substring(index);
-}
-const urlJoin = (...parts) => {
-  const separator = "/";
-  const replace = new RegExp(`${separator}{1,}`, "g");
-  return standardSlash(parts.join(separator).replace(replace, separator));
-};
-function standardSlash(str) {
-  let addr = str;
-  if (!addr || typeof addr !== "string") {
-    return addr;
-  }
-  if (addr.startsWith(".")) {
-    addr = addr.slice(1);
-  }
-  if (!addr.startsWith("/")) {
-    addr = `/${addr}`;
-  }
-  if (addr.endsWith("/") && addr !== "/") {
-    addr = addr.slice(0, addr.length - 1);
-  }
-  return addr;
-}
-export {
-  getLocation,
-  renderRoutes,
-  standardSlash,
-  urlJoin
-};