@modern-js/plugin-router-v5 2.14.0 → 2.16.0

package/dist/cjs/runtime/utils.js

@@ -1,46 +1,49 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var utils_exports = {};
-__export(utils_exports, {
-  getLocation: () => getLocation,
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
   renderRoutes: () => renderRoutes,
-  standardSlash: () => standardSlash,
-  urlJoin: () => urlJoin
+  getLocation: () => getLocation,
+  urlJoin: () => urlJoin,
+  standardSlash: () => standardSlash
 });
-module.exports = __toCommonJS(utils_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_react_router_dom = require("react-router-dom");
-var import_DefaultNotFound = require("./DefaultNotFound");
+const _jsxruntime = require("react/jsx-runtime");
+const _react = /* @__PURE__ */ _interop_require_default(require("react"));
+const _reactrouterdom = require("react-router-dom");
+const _DefaultNotFound = require("./DefaultNotFound");
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
 function renderRoutes(routesConfig, extraProps = {}) {
   if (!routesConfig) {
     return null;
   }
   const Layout = ({ Component, ...props }) => {
-    const GlobalLayout = routesConfig == null ? void 0 : routesConfig.globalApp;
+    const GlobalLayout = routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp;
     if (!GlobalLayout) {
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props });
+      return /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {
+        ...props
+      });
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, { Component, ...props });
+    return /* @__PURE__ */ (0, _jsxruntime.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 = (0, import_react_router_dom.matchPath)(pathname, {
+    var _routesConfig_routes;
+    return routesConfig === null || routesConfig === void 0 ? void 0 : (_routesConfig_routes = routesConfig.routes) === null || _routesConfig_routes === void 0 ? void 0 : _routesConfig_routes.find((route) => {
+      const info = (0, _reactrouterdom.matchPath)(pathname, {
         path: route.path,
         exact: route.exact,
         sensitive: route.sensitive
@@ -48,39 +51,30 @@ 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: 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, _jsxruntime.jsx)(_reactrouterdom.Route, {
+    path: "/",
+    render: (props) => {
+      const matchedRoute = findMatchedRoute(props.location.pathname);
+      if (!matchedRoute) {
+        return /* @__PURE__ */ (0, _jsxruntime.jsx)(_DefaultNotFound.DefaultNotFound, {});
       }
+      return /* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.Route, {
+        path: matchedRoute.path,
+        exact: matchedRoute.exact,
+        sensitive: matchedRoute.sensitive,
+        render: (routeProps) => /* @__PURE__ */ (0, _jsxruntime.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://", "");
+  var _url_replace;
+  const { pathname, url } = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {};
+  const cleanUrl = (_url_replace = url === null || url === void 0 ? void 0 : url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
   const index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;
@@ -108,10 +102,3 @@ function standardSlash(str) {
   }
   return addr;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getLocation,
-  renderRoutes,
-  standardSlash,
-  urlJoin
-});

package/dist/esm/cli/index.js

@@ -1,147 +1,147 @@
-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 _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
 }
-function _objectSpread(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function(key) {
-            _defineProperty(target, key, source[key]);
-        });
+function _object_spread(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i] != null ? arguments[i] : {};
+    var ownKeys2 = Object.keys(source);
+    if (typeof Object.getOwnPropertySymbols === "function") {
+      ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+      }));
     }
-    return target;
+    ownKeys2.forEach(function(key) {
+      _define_property(target, key, source[key]);
+    });
+  }
+  return target;
 }
 function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-    if (Object.getOwnPropertySymbols) {
-        var symbols = Object.getOwnPropertySymbols(object);
-        if (enumerableOnly) {
-            symbols = symbols.filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-            });
-        }
-        keys.push.apply(keys, symbols);
+  var keys = Object.keys(object);
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    if (enumerableOnly) {
+      symbols = symbols.filter(function(sym) {
+        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+      });
     }
-    return keys;
+    keys.push.apply(keys, symbols);
+  }
+  return keys;
 }
-function _objectSpreadProps(target, source) {
-    source = source != null ? source : {};
-    if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-        ownKeys(Object(source)).forEach(function(key) {
-            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-    }
-    return target;
+function _object_spread_props(target, source) {
+  source = source != null ? source : {};
+  if (Object.getOwnPropertyDescriptors) {
+    Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+  } else {
+    ownKeys(Object(source)).forEach(function(key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+  return target;
 }
 import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS, isRouterV5 as isV5 } from "@modern-js/utils";
 import "./types";
 var PLUGIN_IDENTIFIER = "router";
 var ROUTES_IDENTIFIER = "routes";
-var cli_default = function() {
-    return {
-        name: "@modern-js/plugin-router-v5",
-        required: [
-            "@modern-js/runtime"
-        ],
-        setup: function(api) {
-            var runtimeConfigMap = /* @__PURE__ */ new Map();
-            var pluginsExportsUtils;
-            var routerExportsUtils;
-            return {
-                config: function config() {
-                    var appContext = api.useAppContext();
-                    pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
-                    routerExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "router");
-                    return {
-                        source: {
-                            alias: {
-                                "@modern-js/runtime/plugins": pluginsExportsUtils.getPath(),
-                                "@modern-js/runtime/router-v5": routerExportsUtils.getPath()
-                            }
-                        }
-                    };
-                },
-                validateSchema: function validateSchema() {
-                    return PLUGIN_SCHEMAS["@modern-js/plugin-router"];
-                },
-                modifyEntryImports: function modifyEntryImports(param) {
-                    var entrypoint = param.entrypoint, imports = param.imports;
-                    var entryName = entrypoint.entryName;
-                    var userConfig = api.useResolvedConfigContext();
-                    var packageName = api.useAppContext().packageName;
-                    var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
-                    runtimeConfigMap.set(entryName, runtimeConfig);
-                    if (isV5(userConfig)) {
-                        imports.push({
-                            value: "@modern-js/runtime/plugins",
-                            specifiers: [
-                                {
-                                    imported: PLUGIN_IDENTIFIER
-                                }
-                            ]
-                        });
-                    } else {
-                        throw new Error("should enable runtime.router.mode for entry ".concat(entryName));
-                    }
-                    return {
-                        entrypoint: entrypoint,
-                        imports: imports
-                    };
-                },
-                modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
-                    var entrypoint = param.entrypoint, plugins = param.plugins;
-                    var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
-                    var serverRoutes = api.useAppContext().serverRoutes;
-                    var runtimeConfig = runtimeConfigMap.get(entryName);
-                    var userConfig = api.useResolvedConfigContext();
-                    if (isV5(userConfig)) {
-                        var serverBase = serverRoutes.filter(function(route) {
-                            return route.entryName === entryName;
-                        }).map(function(route) {
-                            return route.urlPath;
-                        }).sort(function(a, b) {
-                            return a.length - b.length > 0 ? -1 : 1;
-                        });
-                        plugins.push({
-                            name: PLUGIN_IDENTIFIER,
-                            options: JSON.stringify(_objectSpreadProps(_objectSpread({
-                                serverBase: serverBase
-                            }, runtimeConfig.router), {
-                                routesConfig: fileSystemRoutes ? "{ ".concat(ROUTES_IDENTIFIER, ", globalApp: App }") : void 0
-                            })).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
-                        });
-                    }
-                    return {
-                        entrypoint: entrypoint,
-                        plugins: plugins
-                    };
-                },
-                addRuntimeExports: function addRuntimeExports() {
-                    var userConfig = api.useResolvedConfigContext();
-                    if (isV5(userConfig)) {
-                        pluginsExportsUtils.addExport("export { default as router } from '@modern-js/plugin-router-v5/runtime'");
-                        routerExportsUtils === null || routerExportsUtils === void 0 ? void 0 : routerExportsUtils.addExport("export * from '@modern-js/plugin-router-v5/runtime'");
-                    }
+export default function() {
+  return {
+    name: "@modern-js/plugin-router-v5",
+    required: [
+      "@modern-js/runtime"
+    ],
+    setup: function(api) {
+      var runtimeConfigMap = /* @__PURE__ */ new Map();
+      var pluginsExportsUtils;
+      var routerExportsUtils;
+      return {
+        config: function config() {
+          var appContext = api.useAppContext();
+          pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
+          routerExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "router");
+          return {
+            source: {
+              alias: {
+                "@modern-js/runtime/plugins": pluginsExportsUtils.getPath(),
+                "@modern-js/runtime/router-v5": routerExportsUtils.getPath()
+              }
+            }
+          };
+        },
+        validateSchema: function validateSchema() {
+          return PLUGIN_SCHEMAS["@modern-js/plugin-router"];
+        },
+        modifyEntryImports: function modifyEntryImports(param) {
+          var entrypoint = param.entrypoint, imports = param.imports;
+          var entryName = entrypoint.entryName;
+          var userConfig = api.useResolvedConfigContext();
+          var packageName = api.useAppContext().packageName;
+          var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+          runtimeConfigMap.set(entryName, runtimeConfig);
+          if (isV5(userConfig)) {
+            imports.push({
+              value: "@modern-js/runtime/plugins",
+              specifiers: [
+                {
+                  imported: PLUGIN_IDENTIFIER
                 }
-            };
+              ]
+            });
+          } else {
+            throw new Error("should enable runtime.router.mode for entry ".concat(entryName));
+          }
+          return {
+            entrypoint,
+            imports
+          };
+        },
+        modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
+          var entrypoint = param.entrypoint, plugins = param.plugins;
+          var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
+          var serverRoutes = api.useAppContext().serverRoutes;
+          var runtimeConfig = runtimeConfigMap.get(entryName);
+          var userConfig = api.useResolvedConfigContext();
+          if (isV5(userConfig)) {
+            var serverBase = serverRoutes.filter(function(route) {
+              return route.entryName === entryName;
+            }).map(function(route) {
+              return route.urlPath;
+            }).sort(function(a, b) {
+              return a.length - b.length > 0 ? -1 : 1;
+            });
+            plugins.push({
+              name: PLUGIN_IDENTIFIER,
+              options: JSON.stringify(_object_spread_props(_object_spread({
+                serverBase
+              }, runtimeConfig.router), {
+                routesConfig: fileSystemRoutes ? "{ ".concat(ROUTES_IDENTIFIER, ", globalApp: App }") : void 0
+              })).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
+            });
+          }
+          return {
+            entrypoint,
+            plugins
+          };
+        },
+        addRuntimeExports: function addRuntimeExports() {
+          var userConfig = api.useResolvedConfigContext();
+          if (isV5(userConfig)) {
+            pluginsExportsUtils.addExport("export { default as router } from '@modern-js/plugin-router-v5/runtime'");
+            routerExportsUtils === null || routerExportsUtils === void 0 ? void 0 : routerExportsUtils.addExport("export * from '@modern-js/plugin-router-v5/runtime'");
+          }
         }
-    };
-};
-export { cli_default as default };
+      };
+    }
+  };
+}
+;

package/dist/esm/cli/types.js

@@ -1 +1 @@
-"use strict";
+export {};

package/dist/esm/index.js

@@ -1,3 +1,2 @@
-import { default as default2 } from "./runtime";
+export { default } from "./runtime";
 export * from "./runtime";
-export { default2 as default };

package/dist/esm/runtime/DefaultNotFound.js

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

package/dist/esm/runtime/index.js

@@ -1,5 +1,4 @@
 import { routerPlugin } from "./plugin";
-var runtime_default = routerPlugin;
+export default routerPlugin;
 export * from "react-router-dom";
 export * from "history";
-export { runtime_default as default };