@modern-js/plugin-router-v5 2.18.0 → 2.18.2-alpha.0

package/dist/js/treeshaking/runtime/index.js

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

package/dist/js/treeshaking/runtime/plugin.js

@@ -0,0 +1,134 @@
+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 _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]);
+        });
+    }
+    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);
+    }
+    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;
+}
+import { jsx } from "react/jsx-runtime";
+import { useContext } from "react";
+import { createBrowserHistory, createHashHistory } from "history";
+import { Router, StaticRouter, useRouteMatch, useLocation } from "react-router-dom";
+import hoistNonReactStatics from "hoist-non-react-statics";
+import { RuntimeReactContext, isBrowser } from "@modern-js/runtime";
+import { renderRoutes, getLocation, urlJoin } from "./utils";
+var routerPlugin = function(param) {
+    var _serverBase = param.serverBase, serverBase = _serverBase === void 0 ? [] : _serverBase, customHistory = param.history, _supportHtml5History = param.supportHtml5History, supportHtml5History = _supportHtml5History === void 0 ? true : _supportHtml5History, routesConfig = param.routesConfig, _historyOptions = param.historyOptions, historyOptions = _historyOptions === void 0 ? {} : _historyOptions;
+    var isBrow = isBrowser();
+    var select = function(pathname) {
+        return serverBase.find(function(baseUrl) {
+            return pathname.search(baseUrl) === 0;
+        }) || "/";
+    };
+    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 ref;
+                            var baseUrl = ((ref = window._SERVER_DATA) === null || ref === void 0 ? void 0 : ref.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: /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
+                                        children: routesConfig ? renderRoutes(routesConfig, props) : null
+                                    }))
+                                });
+                            };
+                        }
+                        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: /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
+                                    children: routesConfig ? renderRoutes(routesConfig, props) : null
+                                }))
+                            });
+                        };
+                    };
+                    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/js/treeshaking/runtime/utils.js

@@ -0,0 +1,138 @@
+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 _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]);
+        });
+    }
+    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];
+        }
+    }
+    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;
+}
+import { 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] : {};
+    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 ref;
+        return routesConfig === null || routesConfig === void 0 ? void 0 : (ref = routesConfig.routes) === null || ref === void 0 ? void 0 : ref.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));
+                }
+            });
+        }
+    });
+}
+function getLocation(serverContext) {
+    var ref;
+    var ref1 = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {}, pathname = ref1.pathname, url = ref1.url;
+    var cleanUrl = (ref = url === null || url === void 0 ? void 0 : url.replace("http://", "")) === null || ref === void 0 ? void 0 : ref.replace("https://", "");
+    var index = (cleanUrl || "").indexOf(pathname);
+    if (index === -1) {
+        return pathname;
+    }
+    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));
+};
+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 };

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

@@ -0,0 +1,5 @@
+import { RouteProps } from 'react-router-dom';
+declare const modifyRoutesHook: import("@modern-js/plugin").Waterfall<RouteProps<string, {
+  [x: string]: string | undefined;
+}>[]>;
+export { modifyRoutesHook };

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

@@ -36,7 +36,7 @@ export type HistoryConfig = {
 };
 export type RouterConfig = Partial<HistoryConfig> & {
   mode?: 'react-router-5';
-  routesConfig?: {
+  routesConfig: {
     globalApp?: React.ComponentType<any>;
     routes?: SingleRouteConfig[];
   };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.18.0",
+  "version": "2.18.2-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -59,8 +59,9 @@
     "history": "^4.7.9",
     "hoist-non-react-statics": "^3.3.2",
     "react-router-dom": "^5.3.4",
-    "@modern-js/types": "2.18.0",
-    "@modern-js/utils": "2.18.0"
+    "@modern-js/plugin": "2.18.1",
+    "@modern-js/types": "2.18.1",
+    "@modern-js/utils": "2.18.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -78,12 +79,12 @@
     "react-dom": "^18",
     "ts-jest": "^29.0.4",
     "typescript": "^4",
-    "@modern-js/app-tools": "2.18.0",
-    "@modern-js/core": "2.18.0",
-    "@modern-js/runtime": "2.18.0",
-    "@modern-js/utils": "2.18.0",
-    "@scripts/build": "2.18.0",
-    "@scripts/jest-config": "2.18.0"
+    "@modern-js/app-tools": "2.18.1",
+    "@modern-js/runtime": "2.18.1",
+    "@modern-js/core": "2.18.1",
+    "@scripts/build": "2.18.1",
+    "@modern-js/utils": "2.18.1",
+    "@scripts/jest-config": "2.18.1"
   },
   "sideEffects": false,
   "modernConfig": {},