feat: move modifyServerRoutes hook to plugin v2

web-infra-dev · Feb 7, 2025 · be25cfb · be25cfb
1 parent 38cc78b
commit be25cfb
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 6 deletions.
diff --git a/.changeset/rotten-numbers-heal.md b/.changeset/rotten-numbers-heal.md
@@ -0,0 +1,8 @@
+---
+'@modern-js/app-tools': patch
+'@modern-js/plugin-v2': patch
+---
+
+feat: move modifyServerRoutes hook to plugin v2
+
+feat: 将 modifyServerRoutes 钩子函数移动到 plugin v2 中
diff --git a/packages/solutions/app-tools/src/index.ts b/packages/solutions/app-tools/src/index.ts
@@ -39,7 +39,6 @@ import type {
   GenerateEntryCodeFn,
   ModifyEntrypointsFn,
   ModifyFileSystemRoutesFn,
-  ModifyServerRoutesFn,
   RegisterBuildPlatformFn,
   RegisterDevFn,
 } from './types/new';
@@ -91,7 +90,6 @@ export const appTools = (
     checkEntryPoint: createAsyncHook<CheckEntryPointFn>(),
     modifyEntrypoints: createAsyncHook<ModifyEntrypointsFn>(),
     modifyFileSystemRoutes: createAsyncHook<ModifyFileSystemRoutesFn>(),
-    modifyServerRoutes: createAsyncHook<ModifyServerRoutesFn>(),
     generateEntryCode: createAsyncHook<GenerateEntryCodeFn>(),
     onBeforeGenerateRoutes: createAsyncHook<BeforeGenerateRoutesFn>(),
     onBeforePrintInstructions: createAsyncHook<BeforePrintInstructionsFn>(),

diff --git a/packages/solutions/app-tools/src/types/new.ts b/packages/solutions/app-tools/src/types/new.ts
@@ -36,7 +36,6 @@ export type ModifyFileSystemRoutesFn = TransformFunction<{
   entrypoint: Entrypoint;
   routes: RouteLegacy[] | (NestedRouteForCli | PageRoute)[];
 }>;
-export type ModifyServerRoutesFn = TransformFunction<{ routes: ServerRoute[] }>;
 export type DeplpoyFn = () => Promise<void> | void;
 export type GenerateEntryCodeFn = (params: {
   entrypoints: Entrypoint[];
@@ -61,7 +60,6 @@ export interface AppToolsExtendAPI<B extends Bundler = 'webpack'> {
   checkEntryPoint: PluginHookTap<CheckEntryPointFn>;
   modifyEntrypoints: PluginHookTap<ModifyEntrypointsFn>;
   modifyFileSystemRoutes: PluginHookTap<ModifyFileSystemRoutesFn>;
-  modifyServerRoutes: PluginHookTap<ModifyServerRoutesFn>;
 
   generateEntryCode: PluginHookTap<GenerateEntryCodeFn>;
   onBeforeGenerateRoutes: PluginHookTap<BeforeGenerateRoutesFn>;
@@ -109,7 +107,6 @@ export interface AppToolsExtendHooks
   checkEntryPoint: AsyncHook<CheckEntryPointFn>;
   modifyEntrypoints: AsyncHook<ModifyEntrypointsFn>;
   modifyFileSystemRoutes: AsyncHook<ModifyFileSystemRoutesFn>;
-  modifyServerRoutes: AsyncHook<ModifyServerRoutesFn>;
   generateEntryCode: AsyncHook<GenerateEntryCodeFn>;
   onBeforeGenerateRoutes: AsyncHook<BeforeGenerateRoutesFn>;
   /**

diff --git a/packages/toolkit/plugin-v2/src/cli/api.ts b/packages/toolkit/plugin-v2/src/cli/api.ts
@@ -1,4 +1,5 @@
 import { merge } from '@modern-js/utils/lodash';
+import { modifyBundlerChain } from '@rsbuild/core/dist-types/configChain';
 import type { PluginHook } from '../types';
 import type {
   AllKeysForCLIPluginExtendsAPI,
@@ -116,6 +117,7 @@ export function initPluginAPI<Extends extends CLIPluginExtends>({
     onBeforeExit: hooks.onBeforeExit.tap,
     _internalRuntimePlugins: hooks._internalRuntimePlugins.tap,
     _internalServerPlugins: hooks._internalServerPlugins.tap,
+    modifyServerRoutes: hooks.modifyServerRoutes.tap,
     ...extendsPluginApi,
   };
 

diff --git a/packages/toolkit/plugin-v2/src/cli/hooks.ts b/packages/toolkit/plugin-v2/src/cli/hooks.ts
@@ -18,6 +18,7 @@ import type {
   ModifyResolvedConfigFn,
   ModifyRsbuildConfigFn,
   ModifyRspackConfigFn,
+  ModifyServerRoutesFn,
   ModifyWebpackChainFn,
   ModifyWebpackConfigFn,
   OnAfterDeployFn,
@@ -60,6 +61,7 @@ export type {
   OnPrepareFn,
   InternalRuntimePluginsFn,
   InternalServerPluginsFn,
+  ModifyServerRoutesFn,
   RuntimePluginConfig,
   ServerPluginConfig,
 };
@@ -118,6 +120,7 @@ export function initHooks<
     onBeforeExit: createAsyncHook<OnBeforeExitFn>(),
     _internalRuntimePlugins: createAsyncHook<InternalRuntimePluginsFn>(),
     _internalServerPlugins: createAsyncHook<InternalServerPluginsFn>(),
+    modifyServerRoutes: createAsyncHook<ModifyServerRoutesFn>(),
   };
 }
 

diff --git a/packages/toolkit/plugin-v2/src/cli/index.ts b/packages/toolkit/plugin-v2/src/cli/index.ts
@@ -29,6 +29,7 @@ export {
   type OnPrepareFn,
   type InternalRuntimePluginsFn,
   type InternalServerPluginsFn,
+  type ModifyServerRoutesFn,
   type RuntimePluginConfig,
   type ServerPluginConfig,
 } from './hooks';

diff --git a/packages/toolkit/plugin-v2/src/types/cli/api.ts b/packages/toolkit/plugin-v2/src/types/cli/api.ts
@@ -21,6 +21,7 @@ import type {
   ModifyResolvedConfigFn,
   ModifyRsbuildConfigFn,
   ModifyRspackConfigFn,
+  ModifyServerRoutesFn,
   ModifyWebpackChainFn,
   ModifyWebpackConfigFn,
   OnAfterDeployFn,
@@ -110,6 +111,7 @@ export type CLIPluginAPI<Extends extends CLIPluginExtends> = Readonly<
     onBeforeExit: PluginHookTap<OnBeforeExitFn>;
     _internalRuntimePlugins: PluginHookTap<InternalRuntimePluginsFn>;
     _internalServerPlugins: PluginHookTap<InternalServerPluginsFn>;
+    modifyServerRoutes: PluginHookTap<ModifyServerRoutesFn>;
   } & CLIPluginExtendsAPI<Extends>
 >;
 

diff --git a/packages/toolkit/plugin-v2/src/types/cli/hooks.ts b/packages/toolkit/plugin-v2/src/types/cli/hooks.ts
@@ -1,4 +1,7 @@
-import type { ServerPlugin as ServerPluginConfig } from '@modern-js/types';
+import type {
+  ServerPlugin as ServerPluginConfig,
+  ServerRoute,
+} from '@modern-js/types';
 import type { WebpackConfig } from '@modern-js/uni-builder';
 import type { Command } from '@modern-js/utils/commander';
 import type {
@@ -125,3 +128,4 @@ export type InternalRuntimePluginsFn = TransformFunction<{
 export type InternalServerPluginsFn = TransformFunction<{
   plugins: ServerPluginConfig[];
 }>;
+export type ModifyServerRoutesFn = TransformFunction<{ routes: ServerRoute[] }>;