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

package/dist/esm/runtime/plugin.js

@@ -1,56 +1,56 @@
-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 { jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
 import { createBrowserHistory, createHashHistory } from "history";
 import { Router, StaticRouter, useRouteMatch, useLocation } from "react-router-dom";
@@ -58,85 +58,84 @@ import hoistNonReactStatics from "hoist-non-react-statics";
 import { RuntimeReactContext, isBrowser } from "@modern-js/runtime";
 import { parsedJSONFromElement } from "@modern-js/utils/runtime";
 import { renderRoutes, getLocation, urlJoin } from "./utils";
-var routerPlugin = function(param) {
-    var _param_serverBase = param.serverBase, serverBase = _param_serverBase === void 0 ? [] : _param_serverBase, customHistory = param.history, _param_supportHtml5History = param.supportHtml5History, supportHtml5History = _param_supportHtml5History === void 0 ? true : _param_supportHtml5History, routesConfig = param.routesConfig, createRoutes = param.createRoutes, _param_historyOptions = param.historyOptions, historyOptions = _param_historyOptions === void 0 ? {} : _param_historyOptions;
-    var isBrow = isBrowser();
-    var select = function(pathname) {
-        return serverBase.find(function(baseUrl) {
-            return pathname.search(baseUrl) === 0;
-        }) || "/";
-    };
-    if (isBrow) {
-        window._SERVER_DATA = parsedJSONFromElement("__MODERN_SERVER_DATA__");
-    }
-    return {
-        name: "@modern-js/plugin-router",
-        setup: function() {
-            return {
-                init: function init(param, next) {
-                    var context = param.context;
-                    context.router = {
-                        useRouteMatch: useRouteMatch,
-                        useLocation: useLocation
-                    };
-                    return next({
-                        context: context
-                    });
-                },
-                hoc: function(param, next) {
-                    var App = param.App;
-                    var getRouteApp = function() {
-                        if (isBrow) {
-                            var _window__SERVER_DATA;
-                            var baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
-                            historyOptions.basename = baseUrl === "/" ? urlJoin(baseUrl, historyOptions.basename) : baseUrl;
-                            var history = customHistory || (supportHtml5History ? createBrowserHistory(historyOptions) : createHashHistory(historyOptions));
-                            return function(props) {
-                                return /* @__PURE__ */ jsx(Router, {
-                                    history: history,
-                                    children: createRoutes ? /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
-                                        Component: createRoutes()
-                                    })) : /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
-                                        children: renderRoutes(routesConfig, props)
-                                    }))
-                                });
-                            };
-                        }
-                        return function(props) {
-                            var runtimeContext = useContext(RuntimeReactContext);
-                            var ssrContext = runtimeContext.ssrContext;
-                            var location2 = getLocation(ssrContext);
-                            var routerContext = (ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.redirection) || {};
-                            var request = ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.request;
-                            var baseUrl = request === null || request === void 0 ? void 0 : request.baseUrl;
-                            var basename = baseUrl === "/" ? urlJoin(baseUrl, historyOptions.basename) : baseUrl;
-                            return /* @__PURE__ */ jsx(StaticRouter, {
-                                basename: basename === "/" ? "" : basename,
-                                location: location2,
-                                context: routerContext,
-                                children: createRoutes ? /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
-                                    Component: createRoutes()
-                                })) : /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
-                                    children: renderRoutes(routesConfig, props)
-                                }))
-                            });
-                        };
-                    };
-                    var RouteApp = getRouteApp();
-                    if (App) {
-                        RouteApp = hoistNonReactStatics(RouteApp, App);
-                    }
-                    if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
-                        return next({
-                            App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
-                        });
-                    }
-                    return next({
-                        App: RouteApp
-                    });
-                }
+export var routerPlugin = function(param) {
+  var _param_serverBase = param.serverBase, serverBase = _param_serverBase === void 0 ? [] : _param_serverBase, customHistory = param.history, _param_supportHtml5History = param.supportHtml5History, supportHtml5History = _param_supportHtml5History === void 0 ? true : _param_supportHtml5History, routesConfig = param.routesConfig, createRoutes = param.createRoutes, _param_historyOptions = param.historyOptions, historyOptions = _param_historyOptions === void 0 ? {} : _param_historyOptions;
+  var isBrow = isBrowser();
+  var select = function(pathname) {
+    return serverBase.find(function(baseUrl) {
+      return pathname.search(baseUrl) === 0;
+    }) || "/";
+  };
+  if (isBrow) {
+    window._SERVER_DATA = parsedJSONFromElement("__MODERN_SERVER_DATA__");
+  }
+  return {
+    name: "@modern-js/plugin-router",
+    setup: function() {
+      return {
+        init: function init(param2, next) {
+          var context = param2.context;
+          context.router = {
+            useRouteMatch,
+            useLocation
+          };
+          return next({
+            context
+          });
+        },
+        hoc: function(param2, next) {
+          var App = param2.App;
+          var getRouteApp = function() {
+            if (isBrow) {
+              var _window__SERVER_DATA;
+              var baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
+              historyOptions.basename = baseUrl === "/" ? urlJoin(baseUrl, historyOptions.basename) : baseUrl;
+              var history = customHistory || (supportHtml5History ? createBrowserHistory(historyOptions) : createHashHistory(historyOptions));
+              return function(props) {
+                return /* @__PURE__ */ _jsx(Router, {
+                  history,
+                  children: createRoutes ? /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
+                    Component: createRoutes()
+                  })) : /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
+                    children: renderRoutes(routesConfig, props)
+                  }))
+                });
+              };
+            }
+            return function(props) {
+              var runtimeContext = useContext(RuntimeReactContext);
+              var ssrContext = runtimeContext.ssrContext;
+              var _$location = getLocation(ssrContext);
+              var routerContext = (ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.redirection) || {};
+              var request = ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.request;
+              var baseUrl2 = request === null || request === void 0 ? void 0 : request.baseUrl;
+              var basename = baseUrl2 === "/" ? urlJoin(baseUrl2, historyOptions.basename) : baseUrl2;
+              return /* @__PURE__ */ _jsx(StaticRouter, {
+                basename: basename === "/" ? "" : basename,
+                location: _$location,
+                context: routerContext,
+                children: createRoutes ? /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
+                  Component: createRoutes()
+                })) : /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
+                  children: renderRoutes(routesConfig, props)
+                }))
+              });
             };
+          };
+          var RouteApp = getRouteApp();
+          if (App) {
+            RouteApp = hoistNonReactStatics(RouteApp, App);
+          }
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
+            return next({
+              App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
+            });
+          }
+          return next({
+            App: RouteApp
+          });
         }
-    };
+      };
+    }
+  };
 };
-export { routerPlugin };

package/dist/esm/runtime/utils.js

@@ -1,141 +1,145 @@
-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 ownKeys = Object.keys(source);
+    if (typeof Object.getOwnPropertySymbols === "function") {
+      ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+      }));
     }
-    return target;
+    ownKeys.forEach(function(key) {
+      _define_property(target, key, source[key]);
+    });
+  }
+  return target;
 }
-function _objectWithoutProperties(source, excluded) {
-    if (source == null) return {};
-    var target = _objectWithoutPropertiesLoose(source, excluded);
-    var key, i;
-    if (Object.getOwnPropertySymbols) {
-        var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-        for(i = 0; i < sourceSymbolKeys.length; i++){
-            key = sourceSymbolKeys[i];
-            if (excluded.indexOf(key) >= 0) continue;
-            if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-            target[key] = source[key];
-        }
+function _object_without_properties(source, excluded) {
+  if (source == null)
+    return {};
+  var target = _object_without_properties_loose(source, excluded);
+  var key, i;
+  if (Object.getOwnPropertySymbols) {
+    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+    for (i = 0; i < sourceSymbolKeys.length; i++) {
+      key = sourceSymbolKeys[i];
+      if (excluded.indexOf(key) >= 0)
+        continue;
+      if (!Object.prototype.propertyIsEnumerable.call(source, key))
+        continue;
+      target[key] = source[key];
     }
-    return target;
+  }
+  return target;
 }
-function _objectWithoutPropertiesLoose(source, excluded) {
-    if (source == null) return {};
-    var target = {};
-    var sourceKeys = Object.keys(source);
-    var key, i;
-    for(i = 0; i < sourceKeys.length; i++){
-        key = sourceKeys[i];
-        if (excluded.indexOf(key) >= 0) continue;
-        target[key] = source[key];
-    }
-    return target;
+function _object_without_properties_loose(source, excluded) {
+  if (source == null)
+    return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0)
+      continue;
+    target[key] = source[key];
+  }
+  return target;
 }
-import { jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { Route, matchPath } from "react-router-dom";
 import { DefaultNotFound } from "./DefaultNotFound";
-function renderRoutes(routesConfig) {
-    var extraProps = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    if (!routesConfig) {
-        return null;
+export function renderRoutes(routesConfig) {
+  var extraProps = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  if (!routesConfig) {
+    return null;
+  }
+  var Layout = function(_param) {
+    var Component = _param.Component, props = _object_without_properties(_param, [
+      "Component"
+    ]);
+    var GlobalLayout = routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp;
+    if (!GlobalLayout) {
+      return /* @__PURE__ */ _jsx(Component, _object_spread({}, props));
     }
-    var Layout = function(_param) {
-        var Component = _param.Component, props = _objectWithoutProperties(_param, [
-            "Component"
-        ]);
-        var GlobalLayout = routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp;
-        if (!GlobalLayout) {
-            return /* @__PURE__ */ jsx(Component, _objectSpread({}, props));
-        }
-        return /* @__PURE__ */ jsx(GlobalLayout, _objectSpread({
-            Component: Component
-        }, props));
-    };
-    var findMatchedRoute = function(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(function(route) {
-            var info = matchPath(pathname, {
-                path: route.path,
-                exact: route.exact,
-                sensitive: route.sensitive
-            });
-            return Boolean(info);
-        });
-    };
-    return /* @__PURE__ */ jsx(Route, {
-        path: "/",
-        render: function(props) {
-            var 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: function(routeProps) {
-                    return /* @__PURE__ */ jsx(Layout, _objectSpread({
-                        Component: matchedRoute.component
-                    }, routeProps, extraProps));
-                }
-            });
-        }
+    return /* @__PURE__ */ _jsx(GlobalLayout, _object_spread({
+      Component
+    }, props));
+  };
+  var findMatchedRoute = function(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(function(route) {
+      var info = matchPath(pathname, {
+        path: route.path,
+        exact: route.exact,
+        sensitive: route.sensitive
+      });
+      return Boolean(info);
     });
-}
-function getLocation(serverContext) {
-    var _url_replace;
-    var _ref = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {}, pathname = _ref.pathname, url = _ref.url;
-    var cleanUrl = (_url_replace = url === null || url === void 0 ? void 0 : url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
-    var index = (cleanUrl || "").indexOf(pathname);
-    if (index === -1) {
-        return pathname;
+  };
+  return /* @__PURE__ */ _jsx(Route, {
+    path: "/",
+    render: function(props) {
+      var 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: function(routeProps) {
+          return /* @__PURE__ */ _jsx(Layout, _object_spread({
+            Component: matchedRoute.component
+          }, routeProps, extraProps));
+        }
+      });
     }
-    return cleanUrl.substring(index);
+  });
 }
-var urlJoin = function() {
-    for(var _len = arguments.length, parts = new Array(_len), _key = 0; _key < _len; _key++){
-        parts[_key] = arguments[_key];
-    }
-    var separator = "/";
-    var replace = new RegExp("".concat(separator, "{1,}"), "g");
-    return standardSlash(parts.join(separator).replace(replace, separator));
+export function getLocation(serverContext) {
+  var _url_replace;
+  var _ref = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {}, pathname = _ref.pathname, url = _ref.url;
+  var cleanUrl = (_url_replace = url === null || url === void 0 ? void 0 : url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
+  var index = (cleanUrl || "").indexOf(pathname);
+  if (index === -1) {
+    return pathname;
+  }
+  return cleanUrl.substring(index);
+}
+export var urlJoin = function() {
+  for (var _len = arguments.length, parts = new Array(_len), _key = 0; _key < _len; _key++) {
+    parts[_key] = arguments[_key];
+  }
+  var separator = "/";
+  var replace = new RegExp("".concat(separator, "{1,}"), "g");
+  return standardSlash(parts.join(separator).replace(replace, separator));
 };
-function standardSlash(str) {
-    var addr = str;
-    if (!addr || typeof addr !== "string") {
-        return addr;
-    }
-    if (addr.startsWith(".")) {
-        addr = addr.slice(1);
-    }
-    if (!addr.startsWith("/")) {
-        addr = "/".concat(addr);
-    }
-    if (addr.endsWith("/") && addr !== "/") {
-        addr = addr.slice(0, addr.length - 1);
-    }
+export function standardSlash(str) {
+  var addr = str;
+  if (!addr || typeof addr !== "string") {
     return addr;
+  }
+  if (addr.startsWith(".")) {
+    addr = addr.slice(1);
+  }
+  if (!addr.startsWith("/")) {
+    addr = "/".concat(addr);
+  }
+  if (addr.endsWith("/") && addr !== "/") {
+    addr = addr.slice(0, addr.length - 1);
+  }
+  return addr;
 }
-export { getLocation, renderRoutes, standardSlash, urlJoin };