Fix/filter server plugins (#5858)

web-infra-dev · Jun 21, 2024 · f8ba62c · f8ba62c
1 parent 29aeb3c
commit f8ba62c
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/.changeset/hungry-squids-drum.md b/.changeset/hungry-squids-drum.md
@@ -0,0 +1,7 @@
+---
+'@modern-js/plugin-testing': patch
+'@modern-js/app-tools': patch
+---
+
+fix: filter server plugin by metaName
+fix: 用 metaName 来过滤 server plugin
diff --git a/packages/runtime/plugin-testing/src/cli/test.ts b/packages/runtime/plugin-testing/src/cli/test.ts
@@ -22,9 +22,14 @@ const test = async (
       plugins: [],
     })) || {};
 
+  // filter plugins by metaName
+  const filtedPlugins = plugins?.filter((plugin: any) =>
+    plugin.name.includes(appContext.metaName || 'modern-js'),
+  );
+
   api.setAppContext({
     ...api.useAppContext(),
-    serverPlugins: plugins,
+    serverPlugins: filtedPlugins,
   });
 
   userConfig.testing = userConfig.testing || {};

diff --git a/packages/solutions/app-tools/src/commands/build.ts b/packages/solutions/app-tools/src/commands/build.ts
@@ -21,7 +21,7 @@ export const build = async (
   const hookRunners = api.useHookRunners();
 
   // we need load server plugin to appContext for ssg & deploy commands.
-  await loadServerPlugins(api, appContext.appDirectory);
+  await loadServerPlugins(api, appContext.appDirectory, appContext.metaName);
 
   await registerCompiler(
     appContext.appDirectory,

diff --git a/packages/solutions/app-tools/src/commands/dev.ts b/packages/solutions/app-tools/src/commands/dev.ts
@@ -72,7 +72,7 @@ export const dev = async (
 
   await generateRoutes(appContext);
 
-  const pluginInstances = await loadServerPlugins(api, appDirectory);
+  const pluginInstances = await loadServerPlugins(api, appDirectory, metaName);
 
   const serverOptions = {
     metaName,

diff --git a/packages/solutions/app-tools/src/commands/serve.ts b/packages/solutions/app-tools/src/commands/serve.ts
@@ -45,7 +45,7 @@ export const start = async (api: PluginAPI<AppTools<'shared'>>) => {
     `${meta}.server`,
   );
 
-  const pluginInstances = await loadServerPlugins(api, appDirectory);
+  const pluginInstances = await loadServerPlugins(api, appDirectory, metaName);
 
   const app = await createProdServer({
     metaName,

diff --git a/packages/solutions/app-tools/src/utils/loadPlugins.ts b/packages/solutions/app-tools/src/utils/loadPlugins.ts
@@ -5,23 +5,30 @@ import { AppTools, PluginAPI } from '../types';
 
 export async function getServerPlugins(
   api: PluginAPI<AppTools<'shared'>>,
+  metaName = 'modern-js',
 ): Promise<ServerPlugin[]> {
   const runner = api.useHookRunners();
   const { plugins } = await runner._internalServerPlugins({ plugins: [] });
 
+  // filter plugins by metaName
+  const filtedPlugins = plugins.filter(plugin =>
+    plugin.name.includes(metaName),
+  );
+
   api.setAppContext({
     ...api.useAppContext(),
-    serverPlugins: plugins,
+    serverPlugins: filtedPlugins,
   });
 
-  return plugins;
+  return filtedPlugins;
 }
 
 export async function loadServerPlugins(
   api: PluginAPI<AppTools<'shared'>>,
   appDirectory: string,
+  metaName: string,
 ): Promise<ServerPluginInstance[]> {
-  const plugins = await getServerPlugins(api);
+  const plugins = await getServerPlugins(api, metaName);
 
   const instances = loadServerPluginInstances(plugins, appDirectory);