@modern-js/core 2.20.0 → 2.21.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @modern-js/core
 
+## 2.21.0
+
+### Patch Changes
+
+- df43559: fix(core): toolsType is overridden when install multiple solutions
+
+  fix(core): 修复安装多个 solutions 时 toolsType 被覆盖的问题
+
+- 26dcf3a: chore: bump typescript to v5 in devDependencies
+
+  chore: 升级 devDependencies 中的 typescript 版本到 v5
+
+- ad78387: chore(deps): bump babel-related dependencies to latest version
+
+  chore(deps): 升级 babel 相关依赖到最新版本
+
+- Updated dependencies [e81eeaf]
+- Updated dependencies [26dcf3a]
+- Updated dependencies [056627f]
+- Updated dependencies [0fc15ca]
+- Updated dependencies [43b4e83]
+- Updated dependencies [ad78387]
+  - @modern-js/utils@2.21.0
+  - @modern-js/node-bundle-require@2.21.0
+  - @modern-js/plugin@2.21.0
+
 ## 2.20.0
 
 ### Patch Changes

package/dist/context.d.ts

@@ -1,7 +1,7 @@
-import type { CliPlugin, UserConfig, IAppContext, InternalPlugins, NormalizedConfig, ToolsType } from './types';
+import type { CliPlugin, UserConfig, IAppContext, InternalPlugins, NormalizedConfig } from './types';
 export declare const AppContext: import("@modern-js/plugin").Context<IAppContext>;
-export declare const ConfigContext: import("@modern-js/plugin").Context<UserConfig<any, {}, {}, {}>>;
-export declare const ResolvedConfigContext: import("@modern-js/plugin").Context<NormalizedConfig<any, {}, {}, {}>>;
+export declare const ConfigContext: import("@modern-js/plugin").Context<UserConfig<any>>;
+export declare const ResolvedConfigContext: import("@modern-js/plugin").Context<NormalizedConfig<any>>;
 /**
  * Set app context.
  * @param value new app context. It will override previous app context.
@@ -19,7 +19,7 @@ export declare const useConfigContext: <Extends extends Record<string, any>>() =
  * Get normalized content of user config.
  */
 export declare const useResolvedConfigContext: <Extends extends Record<string, any>>() => NormalizedConfig<Extends>;
-export declare const initAppContext: ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, toolsType, }: {
+export declare const initAppContext: ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, }: {
     appDirectory: string;
     plugins: CliPlugin[];
     configFile: string | false;
@@ -32,5 +32,4 @@ export declare const initAppContext: ({ appDirectory, plugins, configFile, optio
     } | undefined;
     serverConfigFile: string;
     serverInternalPlugins: InternalPlugins;
-    toolsType?: ToolsType | undefined;
 }) => IAppContext;

package/dist/context.js

@@ -31,7 +31,7 @@ exports.useConfigContext = useConfigContext;
  */
 const useResolvedConfigContext = () => exports.ResolvedConfigContext.use().value;
 exports.useResolvedConfigContext = useResolvedConfigContext;
-const initAppContext = ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, toolsType, }) => {
+const initAppContext = ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, }) => {
     const { metaName = 'modern-js', srcDir = 'src', distDir = '', apiDir = 'api', sharedDir = 'shared', } = options || {};
     return {
         metaName,
@@ -57,7 +57,6 @@ const initAppContext = ({ appDirectory, plugins, configFile, options, serverConf
         apiOnly: false,
         internalDirAlias: `@_${metaName.replace(/-/g, '_')}_internal`,
         internalSrcAlias: `@_${metaName.replace(/-/g, '_')}_src`,
-        toolsType,
     };
 };
 exports.initAppContext = initAppContext;

package/dist/createCli.d.ts

@@ -4,7 +4,7 @@ export declare const mergeOptions: (options?: CoreOptions) => CoreOptions & {
 };
 export declare const createCli: () => {
     init: (options?: CoreOptions) => Promise<{
-        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+        resolved: import("./types").NormalizedConfig<{}>;
         appContext: import("./types").IAppContext;
     }>;
     run: (options?: CoreOptions) => Promise<void>;

package/dist/createCli.js

@@ -44,7 +44,6 @@ const createCli = () => {
         (0, checkIsDuplicationPlugin_1.checkIsDuplicationPlugin)(plugins.map(plugin => plugin.name), loaded.config.autoLoadPlugins);
         plugins.forEach(plugin => plugin && manager_1.manager.usePlugin(plugin));
         const appContext = (0, context_1.initAppContext)({
-            toolsType: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.toolsType,
             appDirectory,
             plugins,
             configFile: loaded.filePath,

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export { manager, createPlugin, registerHook } from './manager';
 export { AppContext, ConfigContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, initAppContext, } from './context';
 export declare const cli: {
     init: (options?: import("./types").CoreOptions | undefined) => Promise<{
-        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+        resolved: import("./types").NormalizedConfig<{}>;
         appContext: import("./types").IAppContext;
     }>;
     run: (options?: import("./types").CoreOptions | undefined) => Promise<void>;

package/dist/loadPlugins.d.ts

@@ -12,4 +12,4 @@ export declare const loadPlugins: (appDirectory: string, userConfig: UserConfig,
     internalPlugins?: InternalPlugins;
     autoLoad?: InternalPlugins;
     forceAutoLoadPlugins?: boolean;
-}) => Promise<CliPlugin<{}, {}, {}, {}>[]>;
+}) => Promise<CliPlugin[]>;

package/dist/manager.d.ts

@@ -1,14 +1,14 @@
 import { BasePluginAPI } from './types';
 export declare const manager: import("@modern-js/plugin").AsyncManager<{
     beforeConfig: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
+    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}>>;
     resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
-        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+        resolved: import("./types").NormalizedConfig<{}>;
     }>;
-    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void>;
     fileChange: import("@modern-js/plugin").AsyncWorkflow<{
         filename: string;
         eventType: "add" | "unlink" | "change";
@@ -18,17 +18,17 @@ export declare const manager: import("@modern-js/plugin").AsyncManager<{
     }, void>;
     beforeExit: import("@modern-js/plugin").Workflow<void, void>;
     addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
-}, BasePluginAPI<{}, {}, {}, {}>>;
+}, BasePluginAPI<{}>>;
 export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSetup<{
     beforeConfig: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
+    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}>>;
     resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
-        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+        resolved: import("./types").NormalizedConfig<{}>;
     }>;
-    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void>;
     fileChange: import("@modern-js/plugin").AsyncWorkflow<{
         filename: string;
         eventType: "add" | "unlink" | "change";
@@ -38,16 +38,16 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     }, void>;
     beforeExit: import("@modern-js/plugin").Workflow<void, void>;
     addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
-}, BasePluginAPI<{}, {}, {}, {}>> | undefined, options?: import("@modern-js/plugin").PluginOptions<{
+}, BasePluginAPI<{}>> | undefined, options?: import("@modern-js/plugin").PluginOptions<{
     beforeConfig: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
+    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}>>;
     resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
-        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+        resolved: import("./types").NormalizedConfig<{}>;
     }>;
-    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void>;
     fileChange: import("@modern-js/plugin").AsyncWorkflow<{
         filename: string;
         eventType: "add" | "unlink" | "change";
@@ -59,14 +59,14 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
 }, import("@modern-js/plugin").AsyncSetup<{
     beforeConfig: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
+    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}>>;
     resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
-        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+        resolved: import("./types").NormalizedConfig<{}>;
     }>;
-    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void>;
     fileChange: import("@modern-js/plugin").AsyncWorkflow<{
         filename: string;
         eventType: "add" | "unlink" | "change";
@@ -76,16 +76,16 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     }, void>;
     beforeExit: import("@modern-js/plugin").Workflow<void, void>;
     addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
-}, BasePluginAPI<{}, {}, {}, {}>>, Record<string, unknown>> | undefined) => import("@modern-js/plugin").AsyncPlugin<{
+}, BasePluginAPI<{}>>> | undefined) => import("@modern-js/plugin").AsyncPlugin<{
     beforeConfig: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
+    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}>>;
     resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
-        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+        resolved: import("./types").NormalizedConfig<{}>;
     }>;
-    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void>;
     fileChange: import("@modern-js/plugin").AsyncWorkflow<{
         filename: string;
         eventType: "add" | "unlink" | "change";
@@ -95,16 +95,16 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     }, void>;
     beforeExit: import("@modern-js/plugin").Workflow<void, void>;
     addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
-}, BasePluginAPI<{}, {}, {}, {}>>, registerHook: (newHooks: Partial<{
+}, BasePluginAPI<{}>>, registerHook: (newHooks: Partial<{
     beforeConfig: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
+    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}>>;
     resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
-        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+        resolved: import("./types").NormalizedConfig<{}>;
     }>;
-    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void>;
     fileChange: import("@modern-js/plugin").AsyncWorkflow<{
         filename: string;
         eventType: "add" | "unlink" | "change";

package/dist/types/coreOptions.d.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 {
     cwd?: string;
@@ -20,7 +19,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;
     /** config for Node API */

package/dist/utils/mergeConfig.d.ts

@@ -1,2 +1,2 @@
 import { UserConfig, NormalizedConfig } from '../types';
-export declare const mergeConfig: <ExtendConfig extends Record<string, any>>(configs: (UserConfig<ExtendConfig, {}, {}, {}> | NormalizedConfig<ExtendConfig, {}, {}, {}>)[]) => NormalizedConfig<ExtendConfig, {}, {}, {}>;
+export declare const mergeConfig: <ExtendConfig extends Record<string, any>>(configs: (UserConfig<ExtendConfig> | NormalizedConfig<ExtendConfig>)[]) => NormalizedConfig<ExtendConfig>;

package/dist/utils/repeatKeyWarning.d.ts

@@ -1,3 +1,3 @@
 import { UserConfig } from '../types';
 export declare const deepGet: (obj: any, key: string) => any;
-export declare const repeatKeyWarning: <E extends Record<string, any>>(schema: any, jsConfig: UserConfig<E, {}, {}, {}>, pkgConfig: UserConfig<E, {}, {}, {}>) => void;
+export declare const repeatKeyWarning: <E extends Record<string, any>>(schema: any, jsConfig: UserConfig<E>, pkgConfig: UserConfig<E>) => void;

package/package.json

@@ -14,7 +14,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.20.0",
+  "version": "2.21.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -69,30 +69,30 @@
     }
   },
   "dependencies": {
-    "@modern-js/node-bundle-require": "2.20.0",
-    "@modern-js/plugin": "2.20.0",
-    "@modern-js/utils": "2.20.0"
+    "@modern-js/node-bundle-require": "2.21.0",
+    "@modern-js/plugin": "2.21.0",
+    "@modern-js/utils": "2.21.0"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.3",
-    "@types/babel__core": "^7.1.16",
+    "@types/babel__core": "^7.20.0",
     "@types/jest": "^29",
     "@types/less": "^3.0.3",
     "@types/node": "^14",
     "autoprefixer": "10.4.13",
-    "btsm": "2.2.2",
+    "tsm": "2.3.0",
     "html-webpack-plugin": "5.5.0",
     "jest": "^29",
     "postcss": "8.4.21",
     "sass": "^1.45.0",
     "terser-webpack-plugin": "^5.1.4",
-    "typescript": "^4",
+    "typescript": "^5",
     "webpack": "^5.82.1",
-    "@modern-js/builder-shared": "2.20.0",
-    "@modern-js/babel-preset-app": "2.20.0",
-    "@modern-js/types": "2.20.0",
-    "@scripts/build": "2.20.0",
-    "@scripts/jest-config": "2.20.0"
+    "@modern-js/builder-shared": "2.21.0",
+    "@modern-js/babel-preset-app": "2.21.0",
+    "@modern-js/types": "2.21.0",
+    "@scripts/jest-config": "2.21.0",
+    "@scripts/build": "2.21.0"
   },
   "sideEffects": false,
   "publishConfig": {