@modern-js/plugin-router-v5 2.63.6 → 2.64.0

package/dist/cjs/runtime/hooks.js

@@ -21,8 +21,8 @@ __export(hooks_exports, {
   modifyRoutesHook: () => modifyRoutesHook
 });
 module.exports = __toCommonJS(hooks_exports);
-var import_plugin = require("@modern-js/plugin");
-const modifyRoutesHook = (0, import_plugin.createWaterfall)();
+var import_plugin_v2 = require("@modern-js/plugin-v2");
+const modifyRoutesHook = (0, import_plugin_v2.createSyncHook)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   modifyRoutesHook

package/dist/cjs/runtime/plugin.js

@@ -34,71 +34,46 @@ let routes = [];
 const routerPlugin = (userConfig = {}) => {
   return {
     name: "@modern-js/plugin-router",
-    registerHook: {
+    registryHooks: {
       modifyRoutes: import_hooks.modifyRoutesHook
     },
     setup: (api) => {
-      return {
-        beforeRender(context) {
-          context.router = {
-            useRouteMatch: import_react_router_dom.useRouteMatch,
-            useLocation: import_react_router_dom.useLocation,
-            useHistory: import_react_router_dom.useHistory
-          };
-          Object.defineProperty(context, "routes", {
-            get() {
-              return routes;
-            }
-          });
-        },
-        wrapRoot: (App) => {
-          const pluginConfig = api.useRuntimeConfigContext();
-          const { serverBase = [], history: customHistory, supportHtml5History = true, routesConfig, createRoutes, historyOptions = {} } = (0, import_merge.merge)(pluginConfig.router || {}, userConfig);
-          const finalRouteConfig = {
-            routes: (0, import_context.getGlobalRoutes)(),
-            globalApp: (0, import_context.getGlobalLayoutApp)(),
-            ...routesConfig
-          };
-          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) || "/";
-          const getRouteApp = () => {
-            if (isBrow) {
-              return (props) => {
-                const runtimeContext = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
-                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));
-                const runner = api.useHookRunners();
-                routes = runner.modifyRoutes(originRoutes);
-                finalRouteConfig && (finalRouteConfig.routes = routes);
-                return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Router, {
-                  history,
-                  children: createRoutes ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
-                    Component: createRoutes()
-                  }) : App && !(finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes) ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
-                    ...props
-                  }) : (0, import_utils.renderRoutes)(finalRouteConfig, props)
-                });
-              };
-            }
+      api.onBeforeRender((context) => {
+        context.router = {
+          useRouteMatch: import_react_router_dom.useRouteMatch,
+          useLocation: import_react_router_dom.useLocation,
+          useHistory: import_react_router_dom.useHistory
+        };
+        Object.defineProperty(context, "routes", {
+          get() {
+            return routes;
+          }
+        });
+      });
+      api.wrapRoot((App) => {
+        const pluginConfig = api.getRuntimeConfig();
+        const { serverBase = [], history: customHistory, supportHtml5History = true, routesConfig, createRoutes, historyOptions = {} } = (0, import_merge.merge)(pluginConfig.router || {}, userConfig);
+        const finalRouteConfig = {
+          routes: (0, import_context.getGlobalRoutes)(),
+          globalApp: (0, import_context.getGlobalLayoutApp)(),
+          ...routesConfig
+        };
+        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) || "/";
+        const getRouteApp = () => {
+          if (isBrow) {
             return (props) => {
-              var _request_baseUrl;
               const runtimeContext = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
-              const { ssrContext } = runtimeContext;
-              const location1 = (0, import_utils.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 = request.baseUrl) === null || _request_baseUrl === void 0 ? void 0 : _request_baseUrl.replace(/^\/*/, "/");
+              const baseUrl = select(location.pathname).replace(/^\/*/, "/");
               const basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, runtimeContext._internalRouterBaseName || historyOptions.basename) : baseUrl;
-              const runner = api.useHookRunners();
-              const routes2 = runner.modifyRoutes(originRoutes);
-              finalRouteConfig && (finalRouteConfig.routes = routes2);
-              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.StaticRouter, {
-                basename: basename === "/" ? "" : basename,
-                location: location1,
-                context: routerContext,
+              historyOptions.basename = basename;
+              const history = customHistory || (supportHtml5History ? (0, import_history.createBrowserHistory)(historyOptions) : (0, import_history.createHashHistory)(historyOptions));
+              const hooks = api.getHooks();
+              routes = hooks.modifyRoutes.call(originRoutes);
+              finalRouteConfig && (finalRouteConfig.routes = routes);
+              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Router, {
+                history,
                 children: createRoutes ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
                   Component: createRoutes()
                 }) : App && !(finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes) ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
@@ -106,10 +81,33 @@ const routerPlugin = (userConfig = {}) => {
                 }) : (0, import_utils.renderRoutes)(finalRouteConfig, props)
               });
             };
+          }
+          return (props) => {
+            var _request_baseUrl;
+            const runtimeContext = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
+            const { ssrContext } = runtimeContext;
+            const location1 = (0, import_utils.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 = request.baseUrl) === null || _request_baseUrl === void 0 ? void 0 : _request_baseUrl.replace(/^\/*/, "/");
+            const basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, runtimeContext._internalRouterBaseName || historyOptions.basename) : baseUrl;
+            const hooks = api.getHooks();
+            const routes2 = hooks.modifyRoutes.call(originRoutes);
+            finalRouteConfig && (finalRouteConfig.routes = routes2);
+            return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.StaticRouter, {
+              basename: basename === "/" ? "" : basename,
+              location: location1,
+              context: routerContext,
+              children: createRoutes ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+                Component: createRoutes()
+              }) : App && !(finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes) ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+                ...props
+              }) : (0, import_utils.renderRoutes)(finalRouteConfig, props)
+            });
           };
-          return getRouteApp();
-        }
-      };
+        };
+        return getRouteApp();
+      });
     }
   };
 };

package/dist/esm/runtime/hooks.js

@@ -1,5 +1,5 @@
-import { createWaterfall } from "@modern-js/plugin";
-var modifyRoutesHook = createWaterfall();
+import { createSyncHook } from "@modern-js/plugin-v2";
+var modifyRoutesHook = createSyncHook();
 export {
   modifyRoutesHook
 };

package/dist/esm/runtime/plugin.js

@@ -13,81 +13,79 @@ var routerPlugin = function() {
   var userConfig = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
   return {
     name: "@modern-js/plugin-router",
-    registerHook: {
+    registryHooks: {
       modifyRoutes: modifyRoutesHook
     },
     setup: function(api) {
-      return {
-        beforeRender: function beforeRender(context) {
-          context.router = {
-            useRouteMatch,
-            useLocation,
-            useHistory
-          };
-          Object.defineProperty(context, "routes", {
-            get: function get() {
-              return routes;
-            }
-          });
-        },
-        wrapRoot: function(App) {
-          var pluginConfig = api.useRuntimeConfigContext();
-          var _merge = merge(pluginConfig.router || {}, userConfig), _merge_serverBase = _merge.serverBase, serverBase = _merge_serverBase === void 0 ? [] : _merge_serverBase, customHistory = _merge.history, _merge_supportHtml5History = _merge.supportHtml5History, supportHtml5History = _merge_supportHtml5History === void 0 ? true : _merge_supportHtml5History, routesConfig = _merge.routesConfig, createRoutes = _merge.createRoutes, _merge_historyOptions = _merge.historyOptions, historyOptions = _merge_historyOptions === void 0 ? {} : _merge_historyOptions;
-          var finalRouteConfig = _object_spread({
-            routes: getGlobalRoutes(),
-            globalApp: getGlobalLayoutApp()
-          }, routesConfig);
-          var originRoutes = finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes;
-          var isBrow = isBrowser();
-          var select = function(pathname) {
-            return serverBase.find(function(baseUrl) {
-              return pathname.search(baseUrl) === 0;
-            }) || "/";
-          };
-          var getRouteApp = function() {
-            if (isBrow) {
-              return function(props) {
-                var runtimeContext = useContext(RuntimeReactContext);
-                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));
-                var runner = api.useHookRunners();
-                routes = runner.modifyRoutes(originRoutes);
-                finalRouteConfig && (finalRouteConfig.routes = routes);
-                return /* @__PURE__ */ _jsx(Router, {
-                  history,
-                  children: createRoutes ? /* @__PURE__ */ _jsx(App, {
-                    Component: createRoutes()
-                  }) : App && !(finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes) ? /* @__PURE__ */ _jsx(App, _object_spread({}, props)) : renderRoutes(finalRouteConfig, props)
-                });
-              };
-            }
+      api.onBeforeRender(function(context) {
+        context.router = {
+          useRouteMatch,
+          useLocation,
+          useHistory
+        };
+        Object.defineProperty(context, "routes", {
+          get: function get() {
+            return routes;
+          }
+        });
+      });
+      api.wrapRoot(function(App) {
+        var pluginConfig = api.getRuntimeConfig();
+        var _merge = merge(pluginConfig.router || {}, userConfig), _merge_serverBase = _merge.serverBase, serverBase = _merge_serverBase === void 0 ? [] : _merge_serverBase, customHistory = _merge.history, _merge_supportHtml5History = _merge.supportHtml5History, supportHtml5History = _merge_supportHtml5History === void 0 ? true : _merge_supportHtml5History, routesConfig = _merge.routesConfig, createRoutes = _merge.createRoutes, _merge_historyOptions = _merge.historyOptions, historyOptions = _merge_historyOptions === void 0 ? {} : _merge_historyOptions;
+        var finalRouteConfig = _object_spread({
+          routes: getGlobalRoutes(),
+          globalApp: getGlobalLayoutApp()
+        }, routesConfig);
+        var originRoutes = finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes;
+        var isBrow = isBrowser();
+        var select = function(pathname) {
+          return serverBase.find(function(baseUrl) {
+            return pathname.search(baseUrl) === 0;
+          }) || "/";
+        };
+        var getRouteApp = function() {
+          if (isBrow) {
             return function(props) {
-              var _request_baseUrl;
               var runtimeContext = useContext(RuntimeReactContext);
-              var ssrContext = runtimeContext.ssrContext;
-              var location1 = 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 = request.baseUrl) === null || _request_baseUrl === void 0 ? void 0 : _request_baseUrl.replace(/^\/*/, "/");
+              var baseUrl = select(location.pathname).replace(/^\/*/, "/");
               var basename = baseUrl === "/" ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || historyOptions.basename) : baseUrl;
-              var runner = api.useHookRunners();
-              var routes2 = runner.modifyRoutes(originRoutes);
-              finalRouteConfig && (finalRouteConfig.routes = routes2);
-              return /* @__PURE__ */ _jsx(StaticRouter, {
-                basename: basename === "/" ? "" : basename,
-                location: location1,
-                context: routerContext,
+              historyOptions.basename = basename;
+              var history = customHistory || (supportHtml5History ? createBrowserHistory(historyOptions) : createHashHistory(historyOptions));
+              var hooks = api.getHooks();
+              routes = hooks.modifyRoutes.call(originRoutes);
+              finalRouteConfig && (finalRouteConfig.routes = routes);
+              return /* @__PURE__ */ _jsx(Router, {
+                history,
                 children: createRoutes ? /* @__PURE__ */ _jsx(App, {
                   Component: createRoutes()
                 }) : App && !(finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes) ? /* @__PURE__ */ _jsx(App, _object_spread({}, props)) : renderRoutes(finalRouteConfig, props)
               });
             };
+          }
+          return function(props) {
+            var _request_baseUrl;
+            var runtimeContext = useContext(RuntimeReactContext);
+            var ssrContext = runtimeContext.ssrContext;
+            var location1 = 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 = request.baseUrl) === null || _request_baseUrl === void 0 ? void 0 : _request_baseUrl.replace(/^\/*/, "/");
+            var basename = baseUrl === "/" ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || historyOptions.basename) : baseUrl;
+            var hooks = api.getHooks();
+            var routes2 = hooks.modifyRoutes.call(originRoutes);
+            finalRouteConfig && (finalRouteConfig.routes = routes2);
+            return /* @__PURE__ */ _jsx(StaticRouter, {
+              basename: basename === "/" ? "" : basename,
+              location: location1,
+              context: routerContext,
+              children: createRoutes ? /* @__PURE__ */ _jsx(App, {
+                Component: createRoutes()
+              }) : App && !(finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes) ? /* @__PURE__ */ _jsx(App, _object_spread({}, props)) : renderRoutes(finalRouteConfig, props)
+            });
           };
-          return getRouteApp();
-        }
-      };
+        };
+        return getRouteApp();
+      });
     }
   };
 };

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

@@ -1,5 +1,5 @@
-import { createWaterfall } from "@modern-js/plugin";
-const modifyRoutesHook = createWaterfall();
+import { createSyncHook } from "@modern-js/plugin-v2";
+const modifyRoutesHook = createSyncHook();
 export {
   modifyRoutesHook
 };

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

@@ -11,71 +11,46 @@ let routes = [];
 const routerPlugin = (userConfig = {}) => {
   return {
     name: "@modern-js/plugin-router",
-    registerHook: {
+    registryHooks: {
       modifyRoutes: modifyRoutesHook
     },
     setup: (api) => {
-      return {
-        beforeRender(context) {
-          context.router = {
-            useRouteMatch,
-            useLocation,
-            useHistory
-          };
-          Object.defineProperty(context, "routes", {
-            get() {
-              return routes;
-            }
-          });
-        },
-        wrapRoot: (App) => {
-          const pluginConfig = api.useRuntimeConfigContext();
-          const { serverBase = [], history: customHistory, supportHtml5History = true, routesConfig, createRoutes, historyOptions = {} } = merge(pluginConfig.router || {}, userConfig);
-          const finalRouteConfig = {
-            routes: getGlobalRoutes(),
-            globalApp: getGlobalLayoutApp(),
-            ...routesConfig
-          };
-          const originRoutes = finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes;
-          const isBrow = isBrowser();
-          const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
-          const getRouteApp = () => {
-            if (isBrow) {
-              return (props) => {
-                const runtimeContext = useContext(RuntimeReactContext);
-                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));
-                const runner = api.useHookRunners();
-                routes = runner.modifyRoutes(originRoutes);
-                finalRouteConfig && (finalRouteConfig.routes = routes);
-                return /* @__PURE__ */ _jsx(Router, {
-                  history,
-                  children: createRoutes ? /* @__PURE__ */ _jsx(App, {
-                    Component: createRoutes()
-                  }) : App && !(finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes) ? /* @__PURE__ */ _jsx(App, {
-                    ...props
-                  }) : renderRoutes(finalRouteConfig, props)
-                });
-              };
-            }
+      api.onBeforeRender((context) => {
+        context.router = {
+          useRouteMatch,
+          useLocation,
+          useHistory
+        };
+        Object.defineProperty(context, "routes", {
+          get() {
+            return routes;
+          }
+        });
+      });
+      api.wrapRoot((App) => {
+        const pluginConfig = api.getRuntimeConfig();
+        const { serverBase = [], history: customHistory, supportHtml5History = true, routesConfig, createRoutes, historyOptions = {} } = merge(pluginConfig.router || {}, userConfig);
+        const finalRouteConfig = {
+          routes: getGlobalRoutes(),
+          globalApp: getGlobalLayoutApp(),
+          ...routesConfig
+        };
+        const originRoutes = finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes;
+        const isBrow = isBrowser();
+        const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
+        const getRouteApp = () => {
+          if (isBrow) {
             return (props) => {
-              var _request_baseUrl;
               const runtimeContext = useContext(RuntimeReactContext);
-              const { ssrContext } = runtimeContext;
-              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 = request.baseUrl) === null || _request_baseUrl === void 0 ? void 0 : _request_baseUrl.replace(/^\/*/, "/");
+              const baseUrl = select(location.pathname).replace(/^\/*/, "/");
               const basename = baseUrl === "/" ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || historyOptions.basename) : baseUrl;
-              const runner = api.useHookRunners();
-              const routes2 = runner.modifyRoutes(originRoutes);
-              finalRouteConfig && (finalRouteConfig.routes = routes2);
-              return /* @__PURE__ */ _jsx(StaticRouter, {
-                basename: basename === "/" ? "" : basename,
-                location: location1,
-                context: routerContext,
+              historyOptions.basename = basename;
+              const history = customHistory || (supportHtml5History ? createBrowserHistory(historyOptions) : createHashHistory(historyOptions));
+              const hooks = api.getHooks();
+              routes = hooks.modifyRoutes.call(originRoutes);
+              finalRouteConfig && (finalRouteConfig.routes = routes);
+              return /* @__PURE__ */ _jsx(Router, {
+                history,
                 children: createRoutes ? /* @__PURE__ */ _jsx(App, {
                   Component: createRoutes()
                 }) : App && !(finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes) ? /* @__PURE__ */ _jsx(App, {
@@ -83,10 +58,33 @@ const routerPlugin = (userConfig = {}) => {
                 }) : renderRoutes(finalRouteConfig, props)
               });
             };
+          }
+          return (props) => {
+            var _request_baseUrl;
+            const runtimeContext = useContext(RuntimeReactContext);
+            const { ssrContext } = runtimeContext;
+            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 = request.baseUrl) === null || _request_baseUrl === void 0 ? void 0 : _request_baseUrl.replace(/^\/*/, "/");
+            const basename = baseUrl === "/" ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || historyOptions.basename) : baseUrl;
+            const hooks = api.getHooks();
+            const routes2 = hooks.modifyRoutes.call(originRoutes);
+            finalRouteConfig && (finalRouteConfig.routes = routes2);
+            return /* @__PURE__ */ _jsx(StaticRouter, {
+              basename: basename === "/" ? "" : basename,
+              location: location1,
+              context: routerContext,
+              children: createRoutes ? /* @__PURE__ */ _jsx(App, {
+                Component: createRoutes()
+              }) : App && !(finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes) ? /* @__PURE__ */ _jsx(App, {
+                ...props
+              }) : renderRoutes(finalRouteConfig, props)
+            });
           };
-          return getRouteApp();
-        }
-      };
+        };
+        return getRouteApp();
+      });
     }
   };
 };

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

@@ -1,5 +1,4 @@
 import type { RouteProps } from 'react-router-dom';
-declare const modifyRoutesHook: import("@modern-js/plugin").Waterfall<RouteProps<string, {
-    [x: string]: string | undefined;
-}>[]>;
+import type { SingleRouteConfig } from './plugin';
+declare const modifyRoutesHook: import("@modern-js/plugin-v2/src/types/hooks").SyncHook<(routes: RouteProps[]) => SingleRouteConfig[]>;
 export { modifyRoutesHook };

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

@@ -1,5 +1,5 @@
 import { routerPlugin } from './plugin';
-export type { SingleRouteConfig, HistoryConfig, RouterConfig } from './plugin';
+export type { SingleRouteConfig, HistoryConfig, RouterConfig, RouterExtendsHooks, } from './plugin';
 export { routerPlugin } from './plugin';
 export default routerPlugin;
 export * from 'react-router-dom';

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

@@ -1,7 +1,11 @@
-import type { Plugin } from '@modern-js/runtime';
+import type { RuntimePluginFuture } 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';
+import { modifyRoutesHook } from './hooks';
+export type RouterExtendsHooks = {
+    modifyRoutes: typeof modifyRoutesHook;
+};
 export type SingleRouteConfig = RouteProps & {
     redirect?: string;
     routes?: SingleRouteConfig[];
@@ -32,4 +36,6 @@ export type RouterConfig = Partial<HistoryConfig> & {
     history?: History;
     serverBase?: string[];
 };
-export declare const routerPlugin: (userConfig?: RouterConfig) => Plugin;
+export declare const routerPlugin: (userConfig?: RouterConfig) => RuntimePluginFuture<{
+    extendHooks: RouterExtendsHooks;
+}>;

package/package.json

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