@modern-js/core 2.8.0 → 2.10.0

package/CHANGELOG.md

@@ -1,5 +1,51 @@
 # @modern-js/core
 
+## 2.10.0
+
+### Minor Changes
+
+- a16b9b0: feat: warning when user registe plugin duplication
+  feat: 当用户重复注册插件时进行 warning 提示
+
+### Patch Changes
+
+- 0da32d0: chore: upgrade jest and puppeteer
+  chore: 升级 jest 和 puppeteer 到 latest
+- d3f0642: feat(core): throw warnings when config file is not found
+
+  feat(core): 找不到配置文件时抛出 warning
+
+- 0d9962b: fix: add types field in package.json
+  fix: 添加 package.json 中的 types 字段
+- fbefa7e: chore(deps): bump webpack from 5.75.0 to 5.76.2
+
+  chore(deps): 将 webpack 从 5.75.0 升级至 5.76.2
+
+- Updated dependencies [0da32d0]
+- Updated dependencies [0d9962b]
+- Updated dependencies [fbefa7e]
+- Updated dependencies [4d54233]
+- Updated dependencies [6db4864]
+  - @modern-js/node-bundle-require@2.10.0
+  - @modern-js/plugin@2.10.0
+  - @modern-js/utils@2.10.0
+
+## 2.9.0
+
+### Patch Changes
+
+- 88328d914b: chore(core): remove legacy transformPlugin option
+
+  chore(core): 移除不再使用的 transformPlugin 选项
+
+- dd56401486: chore: fix some TODO comments
+
+  chore: 处理一些标记 TODO 的问题
+
+  - @modern-js/node-bundle-require@2.9.0
+  - @modern-js/plugin@2.9.0
+  - @modern-js/utils@2.9.0
+
 ## 2.8.0
 
 ### Patch Changes

package/dist/config/createLoadedConfig.js

@@ -56,6 +56,10 @@ async function loadLocalConfig(appDirectory, configFile) {
 async function createLoadedConfig(appDirectory, filePath, packageJsonConfig) {
     const configFile = (0, loadConfig_1.getConfigFilePath)(appDirectory, filePath);
     const loaded = await (0, loadConfig_1.loadConfig)(appDirectory, configFile, packageJsonConfig);
+    if (!loaded.config && !loaded.pkgConfig) {
+        utils_1.logger.warn(`Can not find any config file in the current project, please check if you have a correct config file.`);
+        utils_1.logger.warn(`Current project path: ${utils_1.chalk.yellow(appDirectory)}`);
+    }
     const config = await getConfigObject(loaded.config);
     let mergedConfig = config;
     if (loaded.pkgConfig) {

package/dist/index.d.ts

@@ -1,11 +1,10 @@
 import type { ErrorObject } from '@modern-js/utils/ajv';
 import { InternalPlugins } from '@modern-js/types';
-import { TransformPlugin } from './loadPlugins';
 import { initAppContext } from './context';
 import type { ToolsType } from './types';
 export * from './types';
 export * from '@modern-js/plugin';
-export { manager, mountHook, createPlugin, registerHook } from './manager';
+export { manager, createPlugin, registerHook } from './manager';
 export { AppContext, ConfigContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, } from './context';
 declare const initAppDir: (cwd?: string) => Promise<string>;
 export interface CoreOptions {
@@ -19,7 +18,6 @@ export interface CoreOptions {
         server?: InternalPlugins;
         autoLoad?: InternalPlugins;
     };
-    transformPlugin?: TransformPlugin;
     onSchemaError?: (error: ErrorObject) => void;
     options?: {
         metaName?: string;
@@ -42,7 +40,6 @@ export declare const mergeOptions: (options?: CoreOptions) => {
         server?: InternalPlugins | undefined;
         autoLoad?: InternalPlugins | undefined;
     } | undefined;
-    transformPlugin?: TransformPlugin | undefined;
     onSchemaError?: ((error: ErrorObject) => void) | undefined;
     options?: {
         metaName?: string | undefined;

package/dist/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initAppContext = exports.initAppDir = exports.cli = exports.mergeOptions = exports.useResolvedConfigContext = exports.useConfigContext = exports.useAppContext = exports.ResolvedConfigContext = exports.ConfigContext = exports.AppContext = exports.registerHook = exports.createPlugin = exports.mountHook = exports.manager = void 0;
+exports.initAppContext = exports.initAppDir = exports.cli = exports.mergeOptions = exports.useResolvedConfigContext = exports.useConfigContext = exports.useAppContext = exports.ResolvedConfigContext = exports.ConfigContext = exports.AppContext = exports.registerHook = exports.createPlugin = exports.manager = void 0;
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("@modern-js/utils");
 const utils_2 = require("./utils");
@@ -27,12 +27,11 @@ Object.defineProperty(exports, "initAppContext", { enumerable: true, get: functi
 const loadEnv_1 = require("./loadEnv");
 const manager_1 = require("./manager");
 const config_1 = require("./config");
+const checkIsDuplicationPlugin_1 = require("./utils/checkIsDuplicationPlugin");
 __exportStar(require("./types"), exports);
 __exportStar(require("@modern-js/plugin"), exports);
-// TODO: remove export after refactor all plugins
 var manager_2 = require("./manager");
 Object.defineProperty(exports, "manager", { enumerable: true, get: function () { return manager_2.manager; } });
-Object.defineProperty(exports, "mountHook", { enumerable: true, get: function () { return manager_2.mountHook; } });
 Object.defineProperty(exports, "createPlugin", { enumerable: true, get: function () { return manager_2.createPlugin; } });
 Object.defineProperty(exports, "registerHook", { enumerable: true, get: function () { return manager_2.registerHook; } });
 var context_2 = require("./context");
@@ -83,10 +82,10 @@ const createCli = () => {
         const loaded = await (0, config_1.createLoadedConfig)(appDirectory, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.configFile, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.packageJsonConfig);
         const plugins = await (0, loadPlugins_1.loadPlugins)(appDirectory, loaded.config, {
             internalPlugins: (_c = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.internalPlugins) === null || _c === void 0 ? void 0 : _c.cli,
-            transformPlugin: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.transformPlugin,
             autoLoad: (_d = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.internalPlugins) === null || _d === void 0 ? void 0 : _d.autoLoad,
             forceAutoLoadPlugins: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.forceAutoLoadPlugins,
         });
+        (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,
@@ -134,6 +133,9 @@ const createCli = () => {
         await hooksRunner.commands({ program: utils_1.program });
         await (0, utils_2.createFileWatcher)(appContext, hooksRunner);
         utils_1.program.parse(process.argv);
+        if (!utils_1.program.commands || !utils_1.program.commands.length) {
+            utils_1.logger.warn('No command found, please make sure you have registered plugins correctly.');
+        }
     }
     async function test(argv, options) {
         const newProgram = new utils_1.Command();

package/dist/loadPlugins.d.ts

@@ -1,18 +1,15 @@
 import { InternalPlugins } from '@modern-js/types';
 import type { CliPlugin, UserConfig, OldPluginConfig, PluginConfig } from './types';
-export type TransformPlugin = (plugin: PluginConfig, resolvedConfig: UserConfig, pluginOptions?: any) => PluginConfig;
 export declare const isOldPluginConfig: (config?: PluginConfig) => config is OldPluginConfig;
 /**
  * Load internal plugins which in @modern-js scope and user's custom plugins.
  * @param appDirectory - Application root directory.
  * @param userConfig - Resolved user config.
  * @param options.internalPlugins - Internal plugins.
- * @param options.transformPlugin - transform plugin before using it. Used for compatible with legacy jupiter plugins.
  * @returns Plugin Objects has been required.
  */
 export declare const loadPlugins: (appDirectory: string, userConfig: UserConfig, options?: {
     internalPlugins?: InternalPlugins;
     autoLoad?: InternalPlugins;
-    transformPlugin?: TransformPlugin;
     forceAutoLoadPlugins?: boolean;
 }) => Promise<CliPlugin<{}, {}, {}, {}>[]>;

package/dist/loadPlugins.js

@@ -4,7 +4,7 @@ exports.loadPlugins = exports.isOldPluginConfig = void 0;
 const utils_1 = require("@modern-js/utils");
 const manager_1 = require("./manager");
 const debug = (0, utils_1.createDebugger)('load-plugins');
-const resolveCliPlugin = async (p, userConfig, appDirectory, transformPlugin) => {
+const resolveCliPlugin = async (p, appDirectory) => {
     const pkg = typeof p === 'string' ? p : p[0];
     const pluginOptions = typeof p === 'string' ? undefined : p[1];
     const path = (0, utils_1.tryResolve)(pkg, appDirectory);
@@ -16,9 +16,6 @@ const resolveCliPlugin = async (p, userConfig, appDirectory, transformPlugin) =>
         // load esm module
         ({ default: module } = await (0, utils_1.dynamicImport)(path));
     }
-    if (transformPlugin) {
-        module = transformPlugin(module, userConfig, pluginOptions);
-    }
     if (typeof module === 'function') {
         const result = module(pluginOptions);
         return (0, manager_1.createPlugin)(result.setup, result);
@@ -35,7 +32,6 @@ exports.isOldPluginConfig = isOldPluginConfig;
  * @param appDirectory - Application root directory.
  * @param userConfig - Resolved user config.
  * @param options.internalPlugins - Internal plugins.
- * @param options.transformPlugin - transform plugin before using it. Used for compatible with legacy jupiter plugins.
  * @returns Plugin Objects has been required.
  */
 const loadPlugins = async (appDirectory, userConfig, options = {}) => {
@@ -50,8 +46,7 @@ const loadPlugins = async (appDirectory, userConfig, options = {}) => {
             : []),
     ];
     const loadedPlugins = await Promise.all(plugins.map(plugin => {
-        const loadedPlugin = resolveCliPlugin(plugin, userConfig, appDirectory, options.transformPlugin);
-        // server plugins don't support to accept params
+        const loadedPlugin = resolveCliPlugin(plugin, appDirectory);
         debug(`resolve plugin %s: %s`, plugin, loadedPlugin);
         return loadedPlugin;
     }));

package/dist/manager.d.ts

@@ -108,22 +108,4 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     }, void>;
     beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
-}>) => void, mountHook: () => import("@modern-js/plugin").ToRunners<{
-    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
-    resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
-        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
-    }>;
-    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
-    prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
-    fileChange: import("@modern-js/plugin").AsyncWorkflow<{
-        filename: string;
-        eventType: "add" | "unlink" | "change";
-    }, void>;
-    commands: import("@modern-js/plugin").AsyncWorkflow<{
-        program: import("@modern-js/utils").Command;
-    }, void>;
-    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
-    addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
-}>;
+}>) => void;

package/dist/manager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mountHook = exports.registerHook = exports.createPlugin = exports.manager = void 0;
+exports.registerHook = exports.createPlugin = exports.manager = void 0;
 const plugin_1 = require("@modern-js/plugin");
 const context_1 = require("./context");
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -24,4 +24,4 @@ const pluginAPI = {
     useResolvedConfigContext: context_1.useResolvedConfigContext,
 };
 exports.manager = (0, plugin_1.createAsyncManager)(baseHooks, pluginAPI);
-exports.createPlugin = exports.manager.createPlugin, exports.registerHook = exports.manager.registerHook, exports.mountHook = exports.manager.useRunner;
+exports.createPlugin = exports.manager.createPlugin, exports.registerHook = exports.manager.registerHook;

package/dist/utils/checkIsDuplicationPlugin.d.ts

@@ -0,0 +1 @@
+export declare function checkIsDuplicationPlugin(plugins: (string | undefined)[], autoLoadPlugin?: boolean): void;

package/dist/utils/checkIsDuplicationPlugin.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkIsDuplicationPlugin = void 0;
+const utils_1 = require("@modern-js/utils");
+function checkIsDuplicationPlugin(plugins, autoLoadPlugin = false) {
+    const set = new Set();
+    const duplicationPlugins = [];
+    plugins
+        .filter(plugin => typeof plugin === 'string')
+        .forEach(plugin => {
+        if (set.has(plugin)) {
+            duplicationPlugins.push(plugin);
+        }
+        else {
+            set.add(plugin);
+        }
+    });
+    if (duplicationPlugins.length > 0) {
+        utils_1.logger.warn(`Duplicate registration plugins: ${duplicationPlugins.join(',')}.`);
+        if (autoLoadPlugin) {
+            utils_1.logger.warn('This is probably because you enabled `autoLoadPlugin` configuration and also registered these plugins manually');
+        }
+    }
+}
+exports.checkIsDuplicationPlugin = checkIsDuplicationPlugin;

package/dist/utils/index.d.ts

@@ -2,3 +2,4 @@ export * from './commander';
 export * from './createFileWatcher';
 export * from './mergeConfig';
 export * from './repeatKeyWarning';
+export * from './checkIsDuplicationPlugin';

package/dist/utils/index.js

@@ -18,3 +18,4 @@ __exportStar(require("./commander"), exports);
 __exportStar(require("./createFileWatcher"), exports);
 __exportStar(require("./mergeConfig"), exports);
 __exportStar(require("./repeatKeyWarning"), exports);
+__exportStar(require("./checkIsDuplicationPlugin"), exports);

package/dist/utils/mergeConfig.js

@@ -6,7 +6,6 @@ const lodash_1 = require("@modern-js/utils/lodash");
 const mergeConfig = (configs) => (0, lodash_1.mergeWith)({}, ...configs, (target, source, key) => {
     // Do not use the following merge logic for source.designSystem and tools.tailwind(css)
     if (key === 'designSystem' ||
-        (key === 'tailwind' && typeof source === 'object') ||
         (key === 'tailwindcss' && typeof source === 'object') ||
         key === 'devServer') {
         return (0, lodash_1.mergeWith)({}, target !== null && target !== void 0 ? target : {}, source !== null && source !== void 0 ? source : {});

package/package.json

@@ -10,7 +10,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.8.0",
+  "version": "2.10.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -28,11 +28,18 @@
       "jsnext:source": "./src/bin.ts",
       "default": "./dist/bin.js"
     },
+    "./config": {
+      "jsnext:source": "./src/config.ts",
+      "types": "./dist/config/types/index.d.ts",
+      "default": "./dist/config/index.js"
+    },
     "./runBin": {
       "jsnext:source": "./src/runBin.ts",
+      "types": "./dist/runBin.d.ts",
       "default": "./dist/runBin.js"
     },
     "./types": {
+      "types": "./dist/types/index.d.ts",
       "default": "./dist/types/index.js"
     }
   },
@@ -50,31 +57,30 @@
     }
   },
   "dependencies": {
-    "@modern-js/node-bundle-require": "2.8.0",
-    "@modern-js/plugin": "2.8.0",
-    "@modern-js/utils": "2.8.0"
+    "@modern-js/node-bundle-require": "2.10.0",
+    "@modern-js/plugin": "2.10.0",
+    "@modern-js/utils": "2.10.0"
   },
   "devDependencies": {
-    "@jest/types": "^27.0.6",
     "@types/babel__code-frame": "^7.0.3",
     "@types/babel__core": "^7.1.16",
-    "@types/jest": "^27",
+    "@types/jest": "^29",
     "@types/less": "^3.0.3",
     "@types/node": "^14",
     "autoprefixer": "10.4.13",
     "btsm": "2.2.2",
     "html-webpack-plugin": "5.5.0",
-    "jest": "^27",
+    "jest": "^29",
     "postcss": "8.4.21",
     "sass": "^1.45.0",
     "terser-webpack-plugin": "^5.1.4",
     "typescript": "^4",
-    "webpack": "^5.75.0",
-    "@modern-js/builder-shared": "2.8.0",
-    "@modern-js/babel-preset-app": "2.8.0",
-    "@modern-js/types": "2.8.0",
-    "@scripts/jest-config": "2.8.0",
-    "@scripts/build": "2.8.0"
+    "webpack": "^5.76.2",
+    "@modern-js/builder-shared": "2.10.0",
+    "@modern-js/babel-preset-app": "2.10.0",
+    "@modern-js/types": "2.10.0",
+    "@scripts/build": "2.10.0",
+    "@scripts/jest-config": "2.10.0"
   },
   "sideEffects": false,
   "publishConfig": {