@modern-js/plugin-router-v5 2.4.1-beta.0 → 2.5.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 });
@@ -110,11 +93,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/{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 });
@@ -80,9 +63,13 @@ const routerPlugin = ({
               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)
-                }))
+                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) => {
@@ -97,9 +84,13 @@ const routerPlugin = ({
                 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)
-                }))
+                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)
+                })
               });
             };
           };

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,17 @@ 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;
@@ -88,9 +64,11 @@ function renderRoutes(routesConfig, extraProps = {}) {
         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))
+        render: (routeProps) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Layout, {
+          Component: matchedRoute.component,
+          ...routeProps,
+          ...extraProps
+        })
       });
     }
   });

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,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 {
   getEntryOptions,
   createRuntimeExportsUtils,
@@ -94,11 +75,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/{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 {
@@ -62,9 +43,13 @@ const routerPlugin = ({
               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)
-                }))
+                children: createRoutes ? /* @__PURE__ */ jsx(App, {
+                  ...props,
+                  Component: createRoutes()
+                }) : /* @__PURE__ */ jsx(App, {
+                  ...props,
+                  children: renderRoutes(routesConfig, props)
+                })
               });
             }
             return (props) => {
@@ -79,9 +64,13 @@ const routerPlugin = ({
                 basename: basename === "/" ? "" : basename,
                 location: location2,
                 context: routerContext,
-                children: /* @__PURE__ */ jsx(App, __spreadProps(__spreadValues({}, props), {
-                  children: createRoutes ? createRoutes() : renderRoutes(routesConfig, props)
-                }))
+                children: createRoutes ? /* @__PURE__ */ jsx(App, {
+                  ...props,
+                  Component: createRoutes()
+                }) : /* @__PURE__ */ jsx(App, {
+                  ...props,
+                  children: renderRoutes(routesConfig, props)
+                })
               });
             };
           };

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

@@ -1,31 +1,3 @@
-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";
@@ -33,15 +5,17 @@ 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__ */ jsx(Component, __spreadValues({}, props));
+      return /* @__PURE__ */ jsx(Component, {
+        ...props
+      });
     }
-    return /* @__PURE__ */ jsx(GlobalLayout, __spreadValues({
-      Component
-    }, props));
+    return /* @__PURE__ */ jsx(GlobalLayout, {
+      Component,
+      ...props
+    });
   };
   const findMatchedRoute = (pathname) => {
     var _a;
@@ -65,9 +39,11 @@ function renderRoutes(routesConfig, extraProps = {}) {
         path: matchedRoute.path,
         exact: matchedRoute.exact,
         sensitive: matchedRoute.sensitive,
-        render: (routeProps) => /* @__PURE__ */ jsx(Layout, __spreadValues(__spreadValues({
-          Component: matchedRoute.component
-        }, routeProps), extraProps))
+        render: (routeProps) => /* @__PURE__ */ jsx(Layout, {
+          Component: matchedRoute.component,
+          ...routeProps,
+          ...extraProps
+        })
       });
     }
   });

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.5.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.5.0",
+    "@modern-js/types": "2.5.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.5.0",
+    "@modern-js/core": "2.5.0",
+    "@modern-js/utils": "2.5.0",
+    "@scripts/build": "2.5.0",
+    "@modern-js/app-tools": "2.5.0",
+    "@scripts/jest-config": "2.5.0"
   },
   "sideEffects": false,
   "modernConfig": {},