@modern-js/plugin-router-v5 2.63.3 → 2.63.5

package/dist/cjs/cli/index.js

@@ -31,51 +31,49 @@ const routerPlugin = () => ({
   ],
   setup: (api) => {
     let routerExportsUtils;
-    return {
-      _internalRuntimePlugins({ entrypoint, plugins }) {
-        const userConfig = api.useResolvedConfigContext();
-        const { serverRoutes, metaName, packageName } = api.useAppContext();
-        if ((0, import_utils.isRouterV5)(userConfig)) {
-          var _getEntryOptions;
-          const routerConfig = (_getEntryOptions = (0, import_utils.getEntryOptions)(entrypoint.entryName, entrypoint.isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.router;
-          const serverBase = serverRoutes.filter((route) => route.entryName === entrypoint.entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
-          plugins.push({
-            name: "router",
-            path: `@${metaName}/plugin-router-v5/runtime`,
-            config: typeof routerConfig === "boolean" ? {
-              serverBase
-            } : {
-              ...routerConfig,
-              serverBase
-            }
-          });
-        }
-        return {
-          entrypoint,
-          plugins
-        };
-      },
-      config() {
-        const { internalDirectory, metaName } = api.useAppContext();
-        routerExportsUtils = (0, import_utils.createRuntimeExportsUtils)(internalDirectory, "router");
-        return {
-          source: {
-            alias: {
-              [`@${metaName}/runtime/router-v5`]: routerExportsUtils.getPath()
-            }
+    api._internalRuntimePlugins(({ entrypoint, plugins }) => {
+      const userConfig = api.getNormalizedConfig();
+      const { serverRoutes, metaName, packageName } = api.getAppContext();
+      if ((0, import_utils.isRouterV5)(userConfig)) {
+        var _getEntryOptions;
+        const routerConfig = (_getEntryOptions = (0, import_utils.getEntryOptions)(entrypoint.entryName, entrypoint.isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.router;
+        const serverBase = serverRoutes.filter((route) => route.entryName === entrypoint.entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
+        plugins.push({
+          name: "router",
+          path: `@${metaName}/plugin-router-v5/runtime`,
+          config: typeof routerConfig === "boolean" ? {
+            serverBase
+          } : {
+            ...routerConfig,
+            serverBase
+          }
+        });
+      }
+      return {
+        entrypoint,
+        plugins
+      };
+    });
+    api.config(() => {
+      const { internalDirectory, metaName } = api.getAppContext();
+      routerExportsUtils = (0, import_utils.createRuntimeExportsUtils)(internalDirectory, "router");
+      return {
+        source: {
+          alias: {
+            [`@${metaName}/runtime/router-v5`]: routerExportsUtils.getPath()
           }
-        };
-      },
-      addRuntimeExports() {
-        const userConfig = api.useResolvedConfigContext();
-        const { internalDirectory, metaName } = api.useAppContext();
-        const pluginsExportsUtils = (0, import_utils.createRuntimeExportsUtils)(internalDirectory, "plugins");
-        if ((0, import_utils.isRouterV5)(userConfig)) {
-          pluginsExportsUtils.addExport(`export { default as router } from '@${metaName}/plugin-router-v5/runtime'`);
-          routerExportsUtils === null || routerExportsUtils === void 0 ? void 0 : routerExportsUtils.addExport(`export * from '@${metaName}/plugin-router-v5/runtime'`);
         }
+      };
+    });
+    api.addRuntimeExports(() => {
+      const userConfig = api.getNormalizedConfig();
+      const { internalDirectory, metaName } = api.getAppContext();
+      const pluginsExportsUtils = (0, import_utils.createRuntimeExportsUtils)(internalDirectory, "plugins");
+      if ((0, import_utils.isRouterV5)(userConfig)) {
+        pluginsExportsUtils.addExport(`export { default as router } from '@${metaName}/plugin-router-v5/runtime'`);
+        routerExportsUtils === null || routerExportsUtils === void 0 ? void 0 : routerExportsUtils.addExport(`export * from '@${metaName}/plugin-router-v5/runtime'`);
       }
-    };
+    });
   }
 });
 var cli_default = routerPlugin;

package/dist/cjs/runtime/plugin.js

@@ -25,7 +25,6 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_runtime = require("@meta/runtime");
 var import_context = require("@meta/runtime/context");
 var import_merge = require("@modern-js/runtime-utils/merge");
-var import_parsed = require("@modern-js/runtime-utils/parsed");
 var import_history = require("history");
 var import_react = require("react");
 var import_react_router_dom = require("react-router-dom");
@@ -63,15 +62,11 @@ const routerPlugin = (userConfig = {}) => {
           const originRoutes = finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes;
           const isBrow = (0, import_runtime.isBrowser)();
           const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
-          if (isBrow) {
-            window._SERVER_DATA = (0, import_parsed.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
-          }
           const getRouteApp = () => {
             if (isBrow) {
               return (props) => {
-                var _window__SERVER_DATA;
                 const runtimeContext = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
-                const baseUrl = (((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname)).replace(/^\/*/, "/");
+                const baseUrl = select(location.pathname).replace(/^\/*/, "/");
                 const basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, runtimeContext._internalRouterBaseName || historyOptions.basename) : baseUrl;
                 historyOptions.basename = basename;
                 const history = customHistory || (supportHtml5History ? (0, import_history.createBrowserHistory)(historyOptions) : (0, import_history.createHashHistory)(historyOptions));

package/dist/esm/cli/index.js

@@ -11,55 +11,53 @@ var routerPlugin = function() {
     ],
     setup: function(api) {
       var routerExportsUtils;
-      return {
-        _internalRuntimePlugins: function _internalRuntimePlugins(param) {
-          var entrypoint = param.entrypoint, plugins = param.plugins;
-          var userConfig = api.useResolvedConfigContext();
-          var _api_useAppContext = api.useAppContext(), serverRoutes = _api_useAppContext.serverRoutes, metaName = _api_useAppContext.metaName, packageName = _api_useAppContext.packageName;
-          if (isV5(userConfig)) {
-            var _getEntryOptions;
-            var routerConfig = (_getEntryOptions = getEntryOptions(entrypoint.entryName, entrypoint.isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.router;
-            var serverBase = serverRoutes.filter(function(route) {
-              return route.entryName === entrypoint.entryName;
-            }).map(function(route) {
-              return route.urlPath;
-            }).sort(function(a, b) {
-              return a.length - b.length > 0 ? -1 : 1;
-            });
-            plugins.push({
-              name: "router",
-              path: "@".concat(metaName, "/plugin-router-v5/runtime"),
-              config: typeof routerConfig === "boolean" ? {
-                serverBase
-              } : _object_spread_props(_object_spread({}, routerConfig), {
-                serverBase
-              })
-            });
-          }
-          return {
-            entrypoint,
-            plugins
-          };
-        },
-        config: function config() {
-          var _api_useAppContext = api.useAppContext(), internalDirectory = _api_useAppContext.internalDirectory, metaName = _api_useAppContext.metaName;
-          routerExportsUtils = createRuntimeExportsUtils(internalDirectory, "router");
-          return {
-            source: {
-              alias: _define_property({}, "@".concat(metaName, "/runtime/router-v5"), routerExportsUtils.getPath())
-            }
-          };
-        },
-        addRuntimeExports: function addRuntimeExports() {
-          var userConfig = api.useResolvedConfigContext();
-          var _api_useAppContext = api.useAppContext(), internalDirectory = _api_useAppContext.internalDirectory, metaName = _api_useAppContext.metaName;
-          var pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
-          if (isV5(userConfig)) {
-            pluginsExportsUtils.addExport("export { default as router } from '@".concat(metaName, "/plugin-router-v5/runtime'"));
-            routerExportsUtils === null || routerExportsUtils === void 0 ? void 0 : routerExportsUtils.addExport("export * from '@".concat(metaName, "/plugin-router-v5/runtime'"));
+      api._internalRuntimePlugins(function(param) {
+        var entrypoint = param.entrypoint, plugins = param.plugins;
+        var userConfig = api.getNormalizedConfig();
+        var _api_getAppContext = api.getAppContext(), serverRoutes = _api_getAppContext.serverRoutes, metaName = _api_getAppContext.metaName, packageName = _api_getAppContext.packageName;
+        if (isV5(userConfig)) {
+          var _getEntryOptions;
+          var routerConfig = (_getEntryOptions = getEntryOptions(entrypoint.entryName, entrypoint.isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.router;
+          var serverBase = serverRoutes.filter(function(route) {
+            return route.entryName === entrypoint.entryName;
+          }).map(function(route) {
+            return route.urlPath;
+          }).sort(function(a, b) {
+            return a.length - b.length > 0 ? -1 : 1;
+          });
+          plugins.push({
+            name: "router",
+            path: "@".concat(metaName, "/plugin-router-v5/runtime"),
+            config: typeof routerConfig === "boolean" ? {
+              serverBase
+            } : _object_spread_props(_object_spread({}, routerConfig), {
+              serverBase
+            })
+          });
+        }
+        return {
+          entrypoint,
+          plugins
+        };
+      });
+      api.config(function() {
+        var _api_getAppContext = api.getAppContext(), internalDirectory = _api_getAppContext.internalDirectory, metaName = _api_getAppContext.metaName;
+        routerExportsUtils = createRuntimeExportsUtils(internalDirectory, "router");
+        return {
+          source: {
+            alias: _define_property({}, "@".concat(metaName, "/runtime/router-v5"), routerExportsUtils.getPath())
           }
+        };
+      });
+      api.addRuntimeExports(function() {
+        var userConfig = api.getNormalizedConfig();
+        var _api_getAppContext = api.getAppContext(), internalDirectory = _api_getAppContext.internalDirectory, metaName = _api_getAppContext.metaName;
+        var pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
+        if (isV5(userConfig)) {
+          pluginsExportsUtils.addExport("export { default as router } from '@".concat(metaName, "/plugin-router-v5/runtime'"));
+          routerExportsUtils === null || routerExportsUtils === void 0 ? void 0 : routerExportsUtils.addExport("export * from '@".concat(metaName, "/plugin-router-v5/runtime'"));
         }
-      };
+      });
     }
   };
 };

package/dist/esm/runtime/plugin.js

@@ -3,7 +3,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { RuntimeReactContext, isBrowser } from "@meta/runtime";
 import { getGlobalLayoutApp, getGlobalRoutes } from "@meta/runtime/context";
 import { merge } from "@modern-js/runtime-utils/merge";
-import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
 import { createBrowserHistory, createHashHistory } from "history";
 import { useContext } from "react";
 import { Router, StaticRouter, useHistory, useLocation, useRouteMatch } from "react-router-dom";
@@ -45,15 +44,11 @@ var routerPlugin = function() {
               return pathname.search(baseUrl) === 0;
             }) || "/";
           };
-          if (isBrow) {
-            window._SERVER_DATA = parsedJSONFromElement("__MODERN_SERVER_DATA__");
-          }
           var getRouteApp = function() {
             if (isBrow) {
               return function(props) {
-                var _window__SERVER_DATA;
                 var runtimeContext = useContext(RuntimeReactContext);
-                var baseUrl = (((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname)).replace(/^\/*/, "/");
+                var baseUrl = select(location.pathname).replace(/^\/*/, "/");
                 var basename = baseUrl === "/" ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || historyOptions.basename) : baseUrl;
                 historyOptions.basename = basename;
                 var history = customHistory || (supportHtml5History ? createBrowserHistory(historyOptions) : createHashHistory(historyOptions));

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

@@ -7,51 +7,49 @@ const routerPlugin = () => ({
   ],
   setup: (api) => {
     let routerExportsUtils;
-    return {
-      _internalRuntimePlugins({ entrypoint, plugins }) {
-        const userConfig = api.useResolvedConfigContext();
-        const { serverRoutes, metaName, packageName } = api.useAppContext();
-        if (isV5(userConfig)) {
-          var _getEntryOptions;
-          const routerConfig = (_getEntryOptions = getEntryOptions(entrypoint.entryName, entrypoint.isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.router;
-          const serverBase = serverRoutes.filter((route) => route.entryName === entrypoint.entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
-          plugins.push({
-            name: "router",
-            path: `@${metaName}/plugin-router-v5/runtime`,
-            config: typeof routerConfig === "boolean" ? {
-              serverBase
-            } : {
-              ...routerConfig,
-              serverBase
-            }
-          });
-        }
-        return {
-          entrypoint,
-          plugins
-        };
-      },
-      config() {
-        const { internalDirectory, metaName } = api.useAppContext();
-        routerExportsUtils = createRuntimeExportsUtils(internalDirectory, "router");
-        return {
-          source: {
-            alias: {
-              [`@${metaName}/runtime/router-v5`]: routerExportsUtils.getPath()
-            }
+    api._internalRuntimePlugins(({ entrypoint, plugins }) => {
+      const userConfig = api.getNormalizedConfig();
+      const { serverRoutes, metaName, packageName } = api.getAppContext();
+      if (isV5(userConfig)) {
+        var _getEntryOptions;
+        const routerConfig = (_getEntryOptions = getEntryOptions(entrypoint.entryName, entrypoint.isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.router;
+        const serverBase = serverRoutes.filter((route) => route.entryName === entrypoint.entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
+        plugins.push({
+          name: "router",
+          path: `@${metaName}/plugin-router-v5/runtime`,
+          config: typeof routerConfig === "boolean" ? {
+            serverBase
+          } : {
+            ...routerConfig,
+            serverBase
+          }
+        });
+      }
+      return {
+        entrypoint,
+        plugins
+      };
+    });
+    api.config(() => {
+      const { internalDirectory, metaName } = api.getAppContext();
+      routerExportsUtils = createRuntimeExportsUtils(internalDirectory, "router");
+      return {
+        source: {
+          alias: {
+            [`@${metaName}/runtime/router-v5`]: routerExportsUtils.getPath()
           }
-        };
-      },
-      addRuntimeExports() {
-        const userConfig = api.useResolvedConfigContext();
-        const { internalDirectory, metaName } = api.useAppContext();
-        const pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
-        if (isV5(userConfig)) {
-          pluginsExportsUtils.addExport(`export { default as router } from '@${metaName}/plugin-router-v5/runtime'`);
-          routerExportsUtils === null || routerExportsUtils === void 0 ? void 0 : routerExportsUtils.addExport(`export * from '@${metaName}/plugin-router-v5/runtime'`);
         }
+      };
+    });
+    api.addRuntimeExports(() => {
+      const userConfig = api.getNormalizedConfig();
+      const { internalDirectory, metaName } = api.getAppContext();
+      const pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
+      if (isV5(userConfig)) {
+        pluginsExportsUtils.addExport(`export { default as router } from '@${metaName}/plugin-router-v5/runtime'`);
+        routerExportsUtils === null || routerExportsUtils === void 0 ? void 0 : routerExportsUtils.addExport(`export * from '@${metaName}/plugin-router-v5/runtime'`);
       }
-    };
+    });
   }
 });
 var cli_default = routerPlugin;

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

@@ -2,7 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { RuntimeReactContext, isBrowser } from "@meta/runtime";
 import { getGlobalLayoutApp, getGlobalRoutes } from "@meta/runtime/context";
 import { merge } from "@modern-js/runtime-utils/merge";
-import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
 import { createBrowserHistory, createHashHistory } from "history";
 import { useContext } from "react";
 import { Router, StaticRouter, useHistory, useLocation, useRouteMatch } from "react-router-dom";
@@ -40,15 +39,11 @@ const routerPlugin = (userConfig = {}) => {
           const originRoutes = finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes;
           const isBrow = isBrowser();
           const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
-          if (isBrow) {
-            window._SERVER_DATA = parsedJSONFromElement("__MODERN_SERVER_DATA__");
-          }
           const getRouteApp = () => {
             if (isBrow) {
               return (props) => {
-                var _window__SERVER_DATA;
                 const runtimeContext = useContext(RuntimeReactContext);
-                const baseUrl = (((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname)).replace(/^\/*/, "/");
+                const baseUrl = select(location.pathname).replace(/^\/*/, "/");
                 const basename = baseUrl === "/" ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || historyOptions.basename) : baseUrl;
                 historyOptions.basename = basename;
                 const history = customHistory || (supportHtml5History ? createBrowserHistory(historyOptions) : createHashHistory(historyOptions));

package/dist/types/cli/index.d.ts

@@ -1,4 +1,4 @@
-import type { AppTools, CliPlugin } from '@modern-js/app-tools';
+import type { AppTools, CliPluginFuture } from '@modern-js/app-tools';
 import './types';
-export declare const routerPlugin: () => CliPlugin<AppTools>;
+export declare const routerPlugin: () => CliPluginFuture<AppTools>;
 export default routerPlugin;

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

@@ -2,16 +2,6 @@ import type { Plugin } from '@modern-js/runtime';
 import { type BrowserHistoryBuildOptions, type HashHistoryBuildOptions, type History } from 'history';
 import type React from 'react';
 import { type RouteProps } from 'react-router-dom';
-declare global {
-    interface Window {
-        _SERVER_DATA?: {
-            router: {
-                baseUrl: string;
-                params: Record<string, string>;
-            };
-        };
-    }
-}
 export type SingleRouteConfig = RouteProps & {
     redirect?: string;
     routes?: SingleRouteConfig[];

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.3",
+  "version": "2.63.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -59,15 +59,16 @@
     "@types/react-router-dom": "^5.1.8",
     "history": "^4.7.9",
     "react-router-dom": "^5.3.4",
-    "@modern-js/plugin": "2.63.3",
-    "@modern-js/runtime-utils": "2.63.3",
-    "@modern-js/types": "2.63.3",
-    "@modern-js/utils": "2.63.3"
+    "@modern-js/plugin": "2.63.5",
+    "@modern-js/plugin-v2": "2.63.5",
+    "@modern-js/runtime-utils": "2.63.5",
+    "@modern-js/types": "2.63.5",
+    "@modern-js/utils": "2.63.5"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17",
-    "@modern-js/runtime": "^2.63.3"
+    "@modern-js/runtime": "^2.63.5"
   },
   "devDependencies": {
     "@testing-library/react": "^13.4.0",
@@ -79,11 +80,11 @@
     "react-dom": "^18.3.1",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.63.3",
-    "@modern-js/core": "2.63.3",
-    "@modern-js/runtime": "2.63.3",
-    "@scripts/build": "2.63.3",
-    "@scripts/jest-config": "2.63.3"
+    "@modern-js/core": "2.63.5",
+    "@modern-js/app-tools": "2.63.5",
+    "@modern-js/runtime": "2.63.5",
+    "@scripts/build": "2.63.5",
+    "@scripts/jest-config": "2.63.5"
   },
   "sideEffects": false,
   "publishConfig": {