@modern-js/plugin-router-v5 2.5.0 → 2.7.0

package/dist/cjs/cli/index.js

@@ -24,10 +24,6 @@ var import_utils = require("@modern-js/utils");
 var import_types2 = require("./types");
 const PLUGIN_IDENTIFIER = "router";
 const ROUTES_IDENTIFIER = "routes";
-const isV5 = (config) => {
-  var _a, _b, _c;
-  return typeof ((_a = config.runtime) == null ? void 0 : _a.router) !== "boolean" && ((_c = (_b = config == null ? void 0 : config.runtime) == null ? void 0 : _b.router) == null ? void 0 : _c.mode) === "react-router-5";
-};
 var cli_default = () => ({
   name: "@modern-js/plugin-router-v5",
   required: ["@modern-js/runtime"],
@@ -69,7 +65,7 @@ var cli_default = () => ({
           packageName
         );
         runtimeConfigMap.set(entryName, runtimeConfig);
-        if (isV5(userConfig)) {
+        if ((0, import_utils.isRouterV5)(userConfig)) {
           imports.push({
             value: "@modern-js/runtime/plugins",
             specifiers: [{ imported: PLUGIN_IDENTIFIER }]
@@ -89,7 +85,7 @@ var cli_default = () => ({
         const { serverRoutes } = api.useAppContext();
         const runtimeConfig = runtimeConfigMap.get(entryName);
         const userConfig = api.useResolvedConfigContext();
-        if (isV5(userConfig)) {
+        if ((0, import_utils.isRouterV5)(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,
@@ -110,7 +106,7 @@ var cli_default = () => ({
       },
       addRuntimeExports() {
         const userConfig = api.useResolvedConfigContext();
-        if (isV5(userConfig)) {
+        if ((0, import_utils.isRouterV5)(userConfig)) {
           pluginsExportsUtils.addExport(
             `export { default as router } from '@modern-js/plugin-router-v5/runtime'`
           );

package/dist/cjs/index.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/runtime/DefaultNotFound.js

@@ -21,16 +21,19 @@ __export(DefaultNotFound_exports, {
 });
 module.exports = __toCommonJS(DefaultNotFound_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-const DefaultNotFound = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-  style: {
-    margin: "150px auto",
-    textAlign: "center",
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "center"
-  },
-  children: "404"
-});
+const DefaultNotFound = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+  "div",
+  {
+    style: {
+      margin: "150px auto",
+      textAlign: "center",
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center"
+    },
+    children: "404"
+  }
+);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DefaultNotFound

package/dist/cjs/runtime/plugin.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -61,16 +65,7 @@ const routerPlugin = ({
               const baseUrl = ((_a = window._SERVER_DATA) == null ? void 0 : _a.router.baseUrl) || select(location.pathname);
               historyOptions.basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, historyOptions.basename) : baseUrl;
               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: 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) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Router, { history, 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) => {
               const runtimeContext = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
@@ -80,18 +75,15 @@ const routerPlugin = ({
               const request = ssrContext == null ? void 0 : ssrContext.request;
               const baseUrl = request == null ? void 0 : request.baseUrl;
               const basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, historyOptions.basename) : baseUrl;
-              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.StaticRouter, {
-                basename: basename === "/" ? "" : basename,
-                location: location2,
-                context: routerContext,
-                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 /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+                import_react_router_dom.StaticRouter,
+                {
+                  basename: basename === "/" ? "" : basename,
+                  location: location2,
+                  context: routerContext,
+                  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) })
+                }
+              );
             };
           };
           let RouteApp = getRouteApp();

package/dist/cjs/runtime/utils.js

@@ -33,14 +33,9 @@ function renderRoutes(routesConfig, extraProps = {}) {
   const Layout = ({ Component, ...props }) => {
     const GlobalLayout = routesConfig == null ? void 0 : routesConfig.globalApp;
     if (!GlobalLayout) {
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
-        ...props
-      });
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props });
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, {
-      Component,
-      ...props
-    });
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, { Component, ...props });
   };
   const findMatchedRoute = (pathname) => {
     var _a;
@@ -53,25 +48,34 @@ 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: "/",
+      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, 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
-        })
-      });
     }
-  });
+  );
 }
 function getLocation(serverContext) {
   var _a;

package/dist/esm/cli/index.js

@@ -50,14 +50,10 @@ function _objectSpreadProps(target, source) {
     }
     return target;
 }
-import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
+import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS, isRouterV5 as isV5 } from "@modern-js/utils";
 import "./types";
 var PLUGIN_IDENTIFIER = "router";
 var ROUTES_IDENTIFIER = "routes";
-var isV5 = function(config) {
-    var _config_runtime, _config_runtime1, _config_runtime_router;
-    return typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && (config === null || config === void 0 ? void 0 : (_config_runtime1 = config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
-};
 var cli_default = function() {
     return {
         name: "@modern-js/plugin-router-v5",

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

@@ -1,15 +1,12 @@
 import {
   getEntryOptions,
   createRuntimeExportsUtils,
-  PLUGIN_SCHEMAS
+  PLUGIN_SCHEMAS,
+  isRouterV5 as isV5
 } from "@modern-js/utils";
 import "./types";
 const PLUGIN_IDENTIFIER = "router";
 const ROUTES_IDENTIFIER = "routes";
-const isV5 = (config) => {
-  var _a, _b, _c;
-  return typeof ((_a = config.runtime) == null ? void 0 : _a.router) !== "boolean" && ((_c = (_b = config == null ? void 0 : config.runtime) == null ? void 0 : _b.router) == null ? void 0 : _c.mode) === "react-router-5";
-};
 var cli_default = () => ({
   name: "@modern-js/plugin-router-v5",
   required: ["@modern-js/runtime"],

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

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

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

@@ -41,16 +41,7 @@ const routerPlugin = ({
               const baseUrl = ((_a = window._SERVER_DATA) == null ? void 0 : _a.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);
@@ -60,18 +51,15 @@ const routerPlugin = ({
               const request = ssrContext == null ? void 0 : ssrContext.request;
               const baseUrl = request == null ? 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: location2,
+                  context: routerContext,
+                  children: createRoutes ? /* @__PURE__ */ jsx(App, { ...props, Component: createRoutes() }) : /* @__PURE__ */ jsx(App, { ...props, children: renderRoutes(routesConfig, props) })
+                }
+              );
             };
           };
           let RouteApp = getRouteApp();

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

@@ -8,14 +8,9 @@ function renderRoutes(routesConfig, extraProps = {}) {
   const Layout = ({ Component, ...props }) => {
     const GlobalLayout = routesConfig == null ? 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;
@@ -28,25 +23,34 @@ 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: "/",
+      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: matchedRoute.path,
-        exact: matchedRoute.exact,
-        sensitive: matchedRoute.sensitive,
-        render: (routeProps) => /* @__PURE__ */ jsx(Layout, {
-          Component: matchedRoute.component,
-          ...routeProps,
-          ...extraProps
-        })
-      });
     }
-  });
+  );
 }
 function getLocation(serverContext) {
   var _a;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.5.0",
+  "version": "2.7.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -47,37 +47,37 @@
     }
   },
   "dependencies": {
-    "history": "^4.7.9",
-    "react-router-dom": "^5.1.2",
-    "hoist-non-react-statics": "^3.3.2",
     "@types/history": "^4.7.9",
     "@types/react-router-dom": "^5.1.8",
-    "@modern-js/utils": "2.5.0",
-    "@modern-js/types": "2.5.0"
+    "history": "^4.7.9",
+    "hoist-non-react-statics": "^3.3.2",
+    "react-router-dom": "^5.3.4",
+    "@modern-js/types": "2.7.0",
+    "@modern-js/utils": "2.7.0"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17"
   },
   "devDependencies": {
-    "react": "^18",
-    "react-dom": "^18",
-    "ts-jest": "^27.0.4",
-    "typescript": "^4",
-    "jest": "^27",
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@types/jest": "^27",
-    "@types/node": "^14",
     "@testing-library/react": "^13.4.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/invariant": "^2.2.30",
-    "@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"
+    "@types/jest": "^27",
+    "@types/node": "^14",
+    "jest": "^27",
+    "react": "^18",
+    "react-dom": "^18",
+    "ts-jest": "^27.0.4",
+    "typescript": "^4",
+    "@modern-js/app-tools": "2.7.0",
+    "@modern-js/core": "2.7.0",
+    "@modern-js/runtime": "2.7.0",
+    "@modern-js/utils": "2.7.0",
+    "@scripts/build": "2.7.0",
+    "@scripts/jest-config": "2.7.0"
   },
   "sideEffects": false,
   "modernConfig": {},