fix(core): toolsType is overridden when install multiple solutions (#3717)

Author: chenjiahan

.changeset/cool-ants-complain.md

@@ -0,0 +1,11 @@
+---
+'@modern-js/monorepo-tools': patch
+'@modern-js/module-tools': patch
+'@modern-js/app-tools': patch
+'@modern-js/doc-tools': patch
+'@modern-js/core': patch
+---
+
+fix(core): toolsType is overridden when install multiple solutions
+
+fix(core): 修复安装多个 solutions 时 toolsType 被覆盖的问题

packages/cli/core/src/context.ts

@@ -7,7 +7,6 @@ import type {
   IAppContext,
   InternalPlugins,
   NormalizedConfig,
-  ToolsType,
 } from './types';
 
 export const AppContext = createContext<IAppContext>({} as IAppContext);
@@ -50,7 +49,6 @@ export const initAppContext = ({
   options,
   serverConfigFile,
   serverInternalPlugins,
-  toolsType,
 }: {
   appDirectory: string;
   plugins: CliPlugin[];
@@ -64,7 +62,6 @@ export const initAppContext = ({
   };
   serverConfigFile: string;
   serverInternalPlugins: InternalPlugins;
-  toolsType?: ToolsType;
 }): IAppContext => {
   const {
     metaName = 'modern-js',
@@ -100,6 +97,5 @@ export const initAppContext = ({
     apiOnly: false,
     internalDirAlias: `@_${metaName.replace(/-/g, '_')}_internal`,
     internalSrcAlias: `@_${metaName.replace(/-/g, '_')}_src`,
-    toolsType,
   };
 };

packages/cli/core/src/createCli.ts

@@ -79,7 +79,6 @@ export const createCli = () => {
     plugins.forEach(plugin => plugin && manager.usePlugin(plugin));
 
     const appContext = initAppContext({
-      toolsType: mergedOptions?.toolsType,
       appDirectory,
       plugins,
       configFile: loaded.filePath,

packages/cli/core/src/types/coreOptions.ts

@@ -1,6 +1,5 @@
 import type { ErrorObject } from '@modern-js/utils/compiled/ajv';
 import type { InternalPlugins } from './plugin';
-import type { ToolsType } from './context';
 import type { UserConfig } from './config';
 
 export interface CoreOptions {
@@ -21,7 +20,6 @@ export interface CoreOptions {
     distDir?: string;
     sharedDir?: string;
   };
-  toolsType?: ToolsType;
 
   /** force the modern-js core auto register plugin exist in the package.json  */
   forceAutoLoadPlugins?: boolean;

packages/solutions/app-tools/bin/modern.js

@@ -11,5 +11,4 @@ require('@modern-js/core/runBin').run({
     server: INTERNAL_SERVER_PLUGINS,
     autoLoad: INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
   },
-  toolsType: 'app-tools',
 });

packages/solutions/app-tools/src/index.ts

@@ -150,6 +150,12 @@ export default (
   ],
 
   setup: api => {
+    const appContext = api.useAppContext();
+    api.setAppContext({
+      ...appContext,
+      toolsType: 'app-tools',
+    });
+
     const locale = getLocaleLanguage();
     i18n.changeLanguage({ locale });
 

packages/solutions/app-tools/tests/helper.ts

@@ -29,7 +29,6 @@ export const runCli = async (options: {
           internalPlugins: {
             cli: plugins,
           },
-          toolsType: 'app-tools',
           forceAutoLoadPlugins: true,
         },
         disableWatcher: true,

packages/solutions/doc-tools/bin/modern.js

@@ -5,5 +5,4 @@ require('@modern-js/core/runBin').run({
   internalPlugins: {
     cli: INTERNAL_DOC_TOOLS_PLUGINS,
   },
-  toolsType: 'doc-tools',
 });

packages/solutions/doc-tools/src/index.ts

@@ -36,6 +36,12 @@ const WATCH_FILE_TYPES = ['.md', '.mdx', '.tsx', '.jsx', '.ts', '.js'];
 export default (options: DocToolsOptions = {}): CliPlugin => ({
   name: '@modern-js/doc-tools',
   setup: async api => {
+    const appContext = api.useAppContext();
+    api.setAppContext({
+      ...appContext,
+      toolsType: 'doc-tools',
+    });
+
     const { configFiles = MODERN_CONFIG_FILES, extraDocConfig = {} } = options;
     const { dev, build, serve } = await import('@modern-js/doc-core');
     let server: ServerInstance | undefined;

packages/solutions/module-tools/bin/modern.js

@@ -5,5 +5,4 @@ require('@modern-js/core/runBin').run({
   internalPlugins: {
     cli: INTERNAL_MODULE_TOOLS_PLUGINS,
   },
-  toolsType: 'module-tools',
 });