@modern-js/plugin-router-v5 2.37.1 → 2.37.2-fix.0

package/dist/esm/runtime/plugin.js

@@ -1,108 +1,91 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useContext } from "react";
+import { RuntimeReactContext, isBrowser } from "@meta/runtime";
+import { getGlobalLayoutApp, getGlobalRoutes } from "@meta/runtime/context";
+import { merge } from "@modern-js/runtime-utils/merge";
 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/runtime-utils/browser";
-import { renderRoutes, getLocation, urlJoin } from "./utils";
+import { useContext } from "react";
+import { Router, StaticRouter, useHistory, useLocation, useRouteMatch } from "react-router-dom";
 import { modifyRoutesHook } from "./hooks";
-var routerPlugin = function(param) {
-  var _param_serverBase = param.serverBase, serverBase = _param_serverBase === void 0 ? [] : _param_serverBase, customHistory = param.history, _param_supportHtml5History = param.supportHtml5History, supportHtml5History = _param_supportHtml5History === void 0 ? true : _param_supportHtml5History, routesConfig = param.routesConfig, createRoutes = param.createRoutes, _param_historyOptions = param.historyOptions, historyOptions = _param_historyOptions === void 0 ? {} : _param_historyOptions;
-  var originRoutes = (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.routes) || [];
-  var isBrow = isBrowser();
-  var select = function(pathname) {
-    return serverBase.find(function(baseUrl) {
-      return pathname.search(baseUrl) === 0;
-    }) || "/";
-  };
-  var routes = [];
-  if (isBrow) {
-    window._SERVER_DATA = parsedJSONFromElement("__MODERN_SERVER_DATA__");
-  }
+import { getLocation, renderRoutes, urlJoin } from "./utils";
+var routes = [];
+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 {
-        init: function init(param2, next) {
-          var context = param2.context;
-          context.router = {
-            useRouteMatch,
-            useLocation
-          };
-          Object.defineProperty(context, "routes", {
-            get: function get() {
-              return routes;
-            }
-          });
-          return next({
-            context
-          });
-        },
-        hoc: function(param2, next) {
-          var App = param2.App;
-          var getRouteApp = function() {
-            if (isBrow) {
-              var _window__SERVER_DATA;
-              var 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;
-              var history = customHistory || (supportHtml5History ? createBrowserHistory(historyOptions) : createHashHistory(historyOptions));
-              return function(props) {
-                var runner = api.useHookRunners();
-                routes = runner.modifyRoutes(originRoutes);
-                routesConfig && (routesConfig.routes = routes);
-                return /* @__PURE__ */ _jsx(Router, {
-                  history,
-                  children: createRoutes ? /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
-                    Component: createRoutes()
-                  })) : /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
-                    children: renderRoutes(routesConfig, 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 runtimeContext = useContext(RuntimeReactContext);
-              var ssrContext = runtimeContext.ssrContext;
-              var _$location = 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 baseUrl2 = request === null || request === void 0 ? void 0 : request.baseUrl;
-              var basename = baseUrl2 === "/" ? urlJoin(baseUrl2, historyOptions.basename) : baseUrl2;
-              var runner = api.useHookRunners();
-              var routes2 = runner.modifyRoutes(originRoutes);
-              routesConfig && (routesConfig.routes = routes2);
-              return /* @__PURE__ */ _jsx(StaticRouter, {
-                basename: basename === "/" ? "" : basename,
-                location: _$location,
-                context: routerContext,
-                children: createRoutes ? /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
+              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 hooks = api.getHooks();
+              routes = hooks.modifyRoutes.call(originRoutes);
+              finalRouteConfig && (finalRouteConfig.routes = routes);
+              return /* @__PURE__ */ _jsx(Router, {
+                history,
+                children: createRoutes ? /* @__PURE__ */ _jsx(App, {
                   Component: createRoutes()
-                })) : /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
-                  children: renderRoutes(routesConfig, props)
-                }))
+                }) : App && !(finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes) ? /* @__PURE__ */ _jsx(App, _object_spread({}, props)) : renderRoutes(finalRouteConfig, props)
               });
             };
-          };
-          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 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, _object_spread({
+                Component: createRoutes()
+              }, props)) : App && !(finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes) ? /* @__PURE__ */ _jsx(App, _object_spread({}, props)) : renderRoutes(finalRouteConfig, props)
             });
-          }
-          return next({
-            App: RouteApp
-          });
-        }
-      };
+          };
+        };
+        return getRouteApp();
+      });
     }
   };
 };

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

@@ -1,95 +1,51 @@
-import { getEntryOptions, createRuntimeExportsUtils, isRouterV5 as isV5 } from "@modern-js/utils";
+import { createRuntimeExportsUtils, getEntryOptions } from "@modern-js/utils";
 import "./types";
-const PLUGIN_IDENTIFIER = "router";
-const ROUTES_IDENTIFIER = "routes";
 const routerPlugin = () => ({
   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 [
-          {
-            target: "runtime.router",
-            schema: {
-              type: [
-                "boolean",
-                "object"
-              ]
-            }
-          }
-        ];
-      },
-      modifyEntryImports({ entrypoint, imports }) {
-        const { entryName, isMainEntry } = entrypoint;
-        const userConfig = api.useResolvedConfigContext();
-        const { packageName } = api.useAppContext();
-        const runtimeConfig = getEntryOptions(entryName, isMainEntry, 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}`);
+    api._internalRuntimePlugins(({ entrypoint, plugins }) => {
+      var _getEntryOptions;
+      const userConfig = api.getNormalizedConfig();
+      const { serverRoutes, metaName, packageName } = api.getAppContext();
+      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,
-          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'`);
+      });
+      return {
+        entrypoint,
+        plugins
+      };
+    });
+    api.config(() => {
+      const { internalDirectory, metaName } = api.getAppContext();
+      routerExportsUtils = createRuntimeExportsUtils(internalDirectory, "router");
+      return {
+        source: {
+          alias: {
+            [`@${metaName}/runtime/router-v5`]: routerExportsUtils.getPath()
+          }
         }
-      }
-    };
+      };
+    });
+    api.addRuntimeExports(() => {
+      const userConfig = api.getNormalizedConfig();
+      const { internalDirectory, metaName } = api.getAppContext();
+      const pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
+      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/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/index.js

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

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

@@ -1,103 +1,91 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useContext } from "react";
+import { RuntimeReactContext, isBrowser } from "@meta/runtime";
+import { getGlobalLayoutApp, getGlobalRoutes } from "@meta/runtime/context";
+import { merge } from "@modern-js/runtime-utils/merge";
 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/runtime-utils/browser";
-import { renderRoutes, getLocation, urlJoin } from "./utils";
+import { useContext } from "react";
+import { Router, StaticRouter, useHistory, useLocation, useRouteMatch } from "react-router-dom";
 import { modifyRoutesHook } from "./hooks";
-const routerPlugin = ({ serverBase = [], history: customHistory, supportHtml5History = true, routesConfig, createRoutes, historyOptions = {} }) => {
-  const originRoutes = (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.routes) || [];
-  const isBrow = isBrowser();
-  const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
-  let routes = [];
-  if (isBrow) {
-    window._SERVER_DATA = parsedJSONFromElement("__MODERN_SERVER_DATA__");
-  }
+import { getLocation, renderRoutes, urlJoin } from "./utils";
+let routes = [];
+const routerPlugin = (userConfig = {}) => {
   return {
     name: "@modern-js/plugin-router",
-    registerHook: {
+    registryHooks: {
       modifyRoutes: modifyRoutesHook
     },
     setup: (api) => {
-      return {
-        init({ context }, next) {
-          context.router = {
-            useRouteMatch,
-            useLocation
-          };
-          Object.defineProperty(context, "routes", {
-            get() {
-              return routes;
-            }
-          });
-          return next({
-            context
-          });
-        },
-        hoc: ({ App }, next) => {
-          const getRouteApp = () => {
-            if (isBrow) {
-              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) => {
-                const runner = api.useHookRunners();
-                routes = runner.modifyRoutes(originRoutes);
-                routesConfig && (routesConfig.routes = routes);
-                return /* @__PURE__ */ _jsx(Router, {
-                  history,
-                  children: createRoutes ? /* @__PURE__ */ _jsx(App, {
-                    ...props,
-                    Component: createRoutes()
-                  }) : /* @__PURE__ */ _jsx(App, {
-                    ...props,
-                    children: renderRoutes(routesConfig, 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) => {
               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;
-              const basename = baseUrl === "/" ? urlJoin(baseUrl, historyOptions.basename) : baseUrl;
-              const runner = api.useHookRunners();
-              const routes2 = runner.modifyRoutes(originRoutes);
-              routesConfig && (routesConfig.routes = routes2);
-              return /* @__PURE__ */ _jsx(StaticRouter, {
-                basename: basename === "/" ? "" : basename,
-                location: location1,
-                context: routerContext,
+              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 hooks = api.getHooks();
+              routes = hooks.modifyRoutes.call(originRoutes);
+              finalRouteConfig && (finalRouteConfig.routes = routes);
+              return /* @__PURE__ */ _jsx(Router, {
+                history,
                 children: createRoutes ? /* @__PURE__ */ _jsx(App, {
-                  ...props,
                   Component: createRoutes()
-                }) : /* @__PURE__ */ _jsx(App, {
-                  ...props,
-                  children: renderRoutes(routesConfig, props)
-                })
+                }) : App && !(finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes) ? /* @__PURE__ */ _jsx(App, {
+                  ...props
+                }) : renderRoutes(finalRouteConfig, props)
               });
             };
-          };
-          let 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 (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(),
+                ...props
+              }) : App && !(finalRouteConfig === null || finalRouteConfig === void 0 ? void 0 : finalRouteConfig.routes) ? /* @__PURE__ */ _jsx(App, {
+                ...props
+              }) : renderRoutes(finalRouteConfig, props)
             });
-          }
-          return next({
-            App: RouteApp
-          });
-        }
-      };
+          };
+        };
+        return getRouteApp();
+      });
     }
   };
 };

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 default routerPlugin;
+export declare const routerPlugin: () => CliPluginFuture<AppTools>;
+export default routerPlugin;

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

@@ -1,6 +1,6 @@
-import { RouterConfig } from '../runtime/plugin';
+import type { RouterConfig } from '../runtime/plugin';
 declare module '@modern-js/app-tools' {
-  interface RuntimeUserConfig {
-    router?: RouterConfig | boolean;
-  }
-}
+    interface RuntimeUserConfig {
+        router?: RouterConfig | boolean;
+    }
+}

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
 export { default } from './runtime';
-export * from './runtime';
+export * from './runtime';

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

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare const DefaultNotFound: () => JSX.Element;
+import React from 'react';
+export declare const DefaultNotFound: () => React.JSX.Element;

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

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

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

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