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

package/dist/esm-node/cli/index.js

@@ -1,106 +1,86 @@
-import {
-  getEntryOptions,
-  createRuntimeExportsUtils,
-  PLUGIN_SCHEMAS,
-  isRouterV5 as isV5
-} from "@modern-js/utils";
+import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS, isRouterV5 as isV5 } from "@modern-js/utils";
 import "./types";
 const PLUGIN_IDENTIFIER = "router";
 const ROUTES_IDENTIFIER = "routes";
-var cli_default = () => ({
-  name: "@modern-js/plugin-router-v5",
-  required: ["@modern-js/runtime"],
-  setup: (api) => {
-    const runtimeConfigMap = /* @__PURE__ */ new Map();
-    let pluginsExportsUtils;
-    let routerExportsUtils;
-    return {
-      config() {
-        const 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()
+export default () => {
+  return {
+    name: "@modern-js/plugin-router-v5",
+    required: [
+      "@modern-js/runtime"
+    ],
+    setup: (api) => {
+      const runtimeConfigMap = /* @__PURE__ */ new Map();
+      let pluginsExportsUtils;
+      let routerExportsUtils;
+      return {
+        config() {
+          const 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() {
+          return PLUGIN_SCHEMAS["@modern-js/plugin-router"];
+        },
+        modifyEntryImports({ entrypoint, imports }) {
+          const { entryName } = entrypoint;
+          const userConfig = api.useResolvedConfigContext();
+          const { packageName } = api.useAppContext();
+          const 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 ${entryName}`);
+          }
+          return {
+            entrypoint,
+            imports
+          };
+        },
+        modifyEntryRuntimePlugins({ entrypoint, plugins }) {
+          const { entryName, fileSystemRoutes } = entrypoint;
+          const { serverRoutes } = api.useAppContext();
+          const runtimeConfig = runtimeConfigMap.get(entryName);
+          const userConfig = api.useResolvedConfigContext();
+          if (isV5(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({
+                serverBase,
+                ...runtimeConfig.router,
+                routesConfig: fileSystemRoutes ? `{ ${ROUTES_IDENTIFIER}, globalApp: App }` : void 0
+              }).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
+            });
+          }
+          return {
+            entrypoint,
+            plugins
+          };
+        },
+        addRuntimeExports() {
+          const 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'`);
           }
-        };
-      },
-      validateSchema() {
-        return PLUGIN_SCHEMAS["@modern-js/plugin-router"];
-      },
-      modifyEntryImports({ entrypoint, imports }) {
-        const { entryName } = entrypoint;
-        const userConfig = api.useResolvedConfigContext();
-        const { packageName } = api.useAppContext();
-        const 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 ${entryName}`
-          );
-        }
-        return {
-          entrypoint,
-          imports
-        };
-      },
-      modifyEntryRuntimePlugins({ entrypoint, plugins }) {
-        const { entryName, fileSystemRoutes } = entrypoint;
-        const { serverRoutes } = api.useAppContext();
-        const runtimeConfig = runtimeConfigMap.get(entryName);
-        const userConfig = api.useResolvedConfigContext();
-        if (isV5(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({
-              serverBase,
-              ...runtimeConfig.router,
-              routesConfig: fileSystemRoutes ? `{ ${ROUTES_IDENTIFIER}, globalApp: App }` : void 0
-            }).replace(
-              /"routesConfig"\s*:\s*"((\S|\s)+)"/g,
-              '"routesConfig": $1,'
-            )
-          });
-        }
-        return {
-          entrypoint,
-          plugins
-        };
-      },
-      addRuntimeExports() {
-        const userConfig = api.useResolvedConfigContext();
-        if (isV5(userConfig)) {
-          pluginsExportsUtils.addExport(
-            `export { default as router } from '@modern-js/plugin-router-v5/runtime'`
-          );
-          routerExportsUtils == null ? void 0 : routerExportsUtils.addExport(
-            `export * from '@modern-js/plugin-router-v5/runtime'`
-          );
         }
-      }
-    };
-  }
-});
-export {
-  cli_default as default
+      };
+    }
+  };
 };

package/dist/esm-node/cli/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm-node/index.js

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

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

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

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

@@ -1,7 +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
-};

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

@@ -1,27 +1,12 @@
-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";
+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 { parsedJSONFromElement } from "@modern-js/utils/runtime";
 import { renderRoutes, getLocation, urlJoin } from "./utils";
-const routerPlugin = ({
-  serverBase = [],
-  history: customHistory,
-  supportHtml5History = true,
-  routesConfig,
-  createRoutes,
-  historyOptions = {}
-}) => {
+export const routerPlugin = ({ serverBase = [], history: customHistory, supportHtml5History = true, routesConfig, createRoutes, historyOptions = {} }) => {
   const isBrow = isBrowser();
   const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
   if (isBrow) {
@@ -36,41 +21,55 @@ const routerPlugin = ({
             useRouteMatch,
             useLocation
           };
-          return next({ context });
+          return next({
+            context
+          });
         },
         hoc: ({ App }, next) => {
           const getRouteApp = () => {
-            var _a;
             if (isBrow) {
-              const baseUrl = ((_a = window._SERVER_DATA) == null ? void 0 : _a.router.baseUrl) || select(location.pathname);
+              var _window__SERVER_DATA;
+              const 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;
               const history = customHistory || (supportHtml5History ? createBrowserHistory(historyOptions) : createHashHistory(historyOptions));
-              return (props) => /* @__PURE__ */ jsx(Router, { history, children: createRoutes ? /* @__PURE__ */ jsx(App, { ...props, Component: createRoutes() }) : /* @__PURE__ */ jsx(App, { ...props, children: 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);
               const { ssrContext } = runtimeContext;
-              const location2 = getLocation(ssrContext);
-              const routerContext = (ssrContext == null ? void 0 : ssrContext.redirection) || {};
-              const request = ssrContext == null ? void 0 : ssrContext.request;
-              const baseUrl = request == null ? void 0 : request.baseUrl;
+              const location1 = getLocation(ssrContext);
+              const routerContext = (ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.redirection) || {};
+              const request = ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.request;
+              const baseUrl = request === null || request === void 0 ? void 0 : request.baseUrl;
               const basename = baseUrl === "/" ? urlJoin(baseUrl, historyOptions.basename) : baseUrl;
-              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) })
-                }
-              );
+              return /* @__PURE__ */ _jsx(StaticRouter, {
+                basename: basename === "/" ? "" : basename,
+                location: location1,
+                context: routerContext,
+                children: createRoutes ? /* @__PURE__ */ _jsx(App, {
+                  ...props,
+                  Component: createRoutes()
+                }) : /* @__PURE__ */ _jsx(App, {
+                  ...props,
+                  children: renderRoutes(routesConfig, props)
+                })
+              });
             };
           };
           let RouteApp = getRouteApp();
           if (App) {
             RouteApp = hoistNonReactStatics(RouteApp, App);
           }
-          if (routesConfig == null ? void 0 : routesConfig.globalApp) {
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });
@@ -83,6 +82,3 @@ const routerPlugin = ({
     }
   };
 };
-export {
-  routerPlugin
-};

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

@@ -1,20 +1,25 @@
-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, extraProps = {}) {
+export 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__ */ jsx(Component, { ...props });
+      return /* @__PURE__ */ _jsx(Component, {
+        ...props
+      });
     }
-    return /* @__PURE__ */ jsx(GlobalLayout, { 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) => {
+    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 = matchPath(pathname, {
         path: route.path,
         exact: route.exact,
@@ -23,51 +28,42 @@ function renderRoutes(routesConfig, extraProps = {}) {
       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
-              }
-            )
-          }
-        );
+  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://", "");
+export function getLocation(serverContext) {
+  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;
   }
   return cleanUrl.substring(index);
 }
-const urlJoin = (...parts) => {
+export const urlJoin = (...parts) => {
   const separator = "/";
   const replace = new RegExp(`${separator}{1,}`, "g");
   return standardSlash(parts.join(separator).replace(replace, separator));
 };
-function standardSlash(str) {
+export function standardSlash(str) {
   let addr = str;
   if (!addr || typeof addr !== "string") {
     return addr;
@@ -83,9 +79,3 @@ function standardSlash(str) {
   }
   return addr;
 }
-export {
-  getLocation,
-  renderRoutes,
-  standardSlash,
-  urlJoin
-};

package/package.json

@@ -3,7 +3,11 @@
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/web-infra-dev/modern.js/issues",
-  "repository": "web-infra-dev/modern.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/runtime/plugin-router-v5"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.14.0",
+  "version": "2.16.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -55,8 +59,8 @@
     "history": "^4.7.9",
     "hoist-non-react-statics": "^3.3.2",
     "react-router-dom": "^5.3.4",
-    "@modern-js/types": "2.14.0",
-    "@modern-js/utils": "2.14.0"
+    "@modern-js/types": "2.16.0",
+    "@modern-js/utils": "2.16.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -66,7 +70,6 @@
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
     "@testing-library/react": "^13.4.0",
-    "@testing-library/react-hooks": "^8.0.1",
     "@types/invariant": "^2.2.30",
     "@types/jest": "^29",
     "@types/node": "^14",
@@ -75,12 +78,12 @@
     "react-dom": "^18",
     "ts-jest": "^29.0.4",
     "typescript": "^4",
-    "@modern-js/app-tools": "2.14.0",
-    "@modern-js/core": "2.14.0",
-    "@modern-js/runtime": "2.14.0",
-    "@modern-js/utils": "2.14.0",
-    "@scripts/build": "2.14.0",
-    "@scripts/jest-config": "2.14.0"
+    "@modern-js/app-tools": "2.16.0",
+    "@modern-js/core": "2.16.0",
+    "@modern-js/runtime": "2.16.0",
+    "@modern-js/utils": "2.16.0",
+    "@scripts/build": "2.16.0",
+    "@scripts/jest-config": "2.16.0"
   },
   "sideEffects": false,
   "modernConfig": {},