@modern-js/core 1.12.0 → 1.12.2-beta.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @modern-js/core
 
+## 1.12.1
+
+### Patch Changes
+
+- b255072f2: fix(core): failed to load user plugins in modern.config.js
+- 7975bfa68: fix(core): incorrect type of tools.terser
+- b7302f781: Export some required types
+- Updated dependencies [63c354ad5]
+- Updated dependencies [073e9ad78]
+- Updated dependencies [b7302f781]
+- Updated dependencies [f4a7d49e1]
+- Updated dependencies [e0e708f83]
+  - @modern-js/utils@1.7.8
+  - @modern-js/plugin@1.3.8
+
 ## 1.12.0
 
 ### Minor Changes

package/dist/config/index.d.ts

@@ -8,5 +8,9 @@ export { mergeConfig };
 export * from './types';
 export declare const addServerConfigToDeps: (dependencies: string[], appDirectory: string, serverConfigFile: string) => Promise<void>;
 export declare const defineConfig: (config: ConfigParam) => ConfigParam;
-export declare const loadUserConfig: (appDirectory: string, filePath?: string | undefined, packageJsonConfig?: string | undefined) => Promise<LoadedConfig>;
+/**
+ * Assign the pkg config into the user config.
+ */
+export declare const assignPkgConfig: (userConfig?: UserConfig, pkgConfig?: ConfigParam) => UserConfig & ConfigParam;
+export declare const loadUserConfig: (appDirectory: string, filePath?: string, packageJsonConfig?: string) => Promise<LoadedConfig>;
 export declare const resolveConfig: (loaded: LoadedConfig, configs: UserConfig[], schemas: PluginValidateSchema[], restartWithExistingPort: number, argv: string[], onSchemaError?: (error: ErrorObject) => void | Promise<void>) => Promise<NormalizedConfig>;

package/dist/config/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -13,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveConfig = exports.loadUserConfig = exports.defineConfig = exports.addServerConfigToDeps = exports.mergeConfig = exports.defaultsConfig = void 0;
+exports.resolveConfig = exports.loadUserConfig = exports.assignPkgConfig = exports.defineConfig = exports.addServerConfigToDeps = exports.mergeConfig = exports.defaultsConfig = void 0;
 const load_config_1 = require("@modern-js/load-config");
 const utils_1 = require("@modern-js/utils");
 const lodash_1 = require("@modern-js/utils/lodash");
@@ -37,6 +41,19 @@ const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFil
 exports.addServerConfigToDeps = addServerConfigToDeps;
 const defineConfig = (config) => config;
 exports.defineConfig = defineConfig;
+/**
+ * Assign the pkg config into the user config.
+ */
+const assignPkgConfig = (userConfig = {}, pkgConfig = {}) => (0, lodash_1.mergeWith)({}, userConfig, pkgConfig, (objValue, srcValue) => {
+    // mergeWith can not merge object with symbol, but plugins object contains symbol,
+    // so we need to handle it manually.
+    if (objValue === undefined && (0, utils_1.isPlainObject)(srcValue)) {
+        return { ...srcValue };
+    }
+    // return undefined to use the default behavior of mergeWith
+    return undefined;
+});
+exports.assignPkgConfig = assignPkgConfig;
 const loadUserConfig = async (appDirectory, filePath, packageJsonConfig) => {
     const loaded = await (0, load_config_1.loadConfig)(appDirectory, filePath, packageJsonConfig);
     const config = !loaded
@@ -45,7 +62,7 @@ const loadUserConfig = async (appDirectory, filePath, packageJsonConfig) => {
             ? loaded.config(0)
             : loaded.config);
     return {
-        config: (0, lodash_1.mergeWith)({}, config || {}, (loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig) || {}),
+        config: (0, exports.assignPkgConfig)(config, loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig),
         jsConfig: config || {},
         pkgConfig: ((loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig) || {}),
         filePath: loaded === null || loaded === void 0 ? void 0 : loaded.path,

package/dist/config/schema/index.d.ts

@@ -391,6 +391,9 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
                 enableMicroFrontendDebug: {
                     type: string;
                 };
+                watchOptions: {
+                    type: string;
+                };
             };
         };
         deploy: {

package/dist/config/schema/server.d.ts

@@ -178,5 +178,8 @@ export declare const server: {
         enableMicroFrontendDebug: {
             type: string;
         };
+        watchOptions: {
+            type: string;
+        };
     };
 };

package/dist/config/schema/server.js

@@ -103,5 +103,6 @@ exports.server = {
         metrics: { type: ['object', 'boolean'] },
         proxy: { type: 'object' },
         enableMicroFrontendDebug: { type: 'boolean' },
+        watchOptions: { type: 'object' },
     },
 };

package/dist/config/types/index.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 import type { IncomingMessage, ServerResponse } from 'http';
 import type { NextFunction, BffProxyOptions } from '@modern-js/types';
-import type { MetaOptions, ChainIdentifier } from '@modern-js/utils';
+import type { MetaOptions, ChainIdentifier, WatchOptions } from '@modern-js/utils';
 import type { TransformOptions, PluginItem as BabelPlugin } from '@babel/core';
 import type webpack from 'webpack';
-import type { RuleSetRule, Configuration as WebpackConfiguration } from 'webpack';
+import type { RuleSetRule, Configuration as WebpackConfiguration, WebpackPluginInstance } from 'webpack';
 import type WebpackChain from '@modern-js/utils/webpack-chain';
 import type autoprefixer from 'autoprefixer';
 import type { BasePluginOptions, TerserOptions as RawTerserOptions } from 'terser-webpack-plugin';
@@ -19,7 +19,9 @@ import type { ElectronConfig } from './electron';
 import type { PostCSSLoaderOptions } from './postcss';
 import type { TsLoaderOptions } from './ts-loader';
 declare type AutoprefixerOptions = autoprefixer.Options;
-declare type TerserOptions = BasePluginOptions & RawTerserOptions;
+declare type TerserOptions = BasePluginOptions & {
+    terserOptions?: Partial<RawTerserOptions>;
+};
 export type { TestConfig, JestConfig, UnbundleConfig, SassConfig, SassLoaderOptions, LessConfig, LessLoaderOptions, SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions, TransformOptions, AutoprefixerOptions, TerserOptions, };
 export interface SourceConfig {
     entries?: Record<string, string | {
@@ -113,6 +115,7 @@ export interface ServerConfig {
     logger?: boolean | Record<string, any>;
     metrics?: boolean | Record<string, any>;
     enableMicroFrontendDebug?: boolean;
+    watchOptions?: WatchOptions;
 }
 export declare type DevProxyOptions = string | Record<string, string>;
 export interface DevConfig {
@@ -160,9 +163,9 @@ export declare type WebpackConfigUtils = {
     env: string;
     name: string;
     webpack: typeof webpack;
-    addRules: (rules: RuleSetRule[]) => void;
-    prependPlugins: (plugins: WebpackConfiguration['plugins']) => void;
-    appendPlugins: (plugins: WebpackConfiguration['plugins']) => void;
+    addRules: (rules: RuleSetRule | RuleSetRule[]) => void;
+    prependPlugins: (plugins: WebpackPluginInstance | WebpackPluginInstance[]) => void;
+    appendPlugins: (plugins: WebpackPluginInstance | WebpackPluginInstance[]) => void;
     removePlugin: (pluginName: string) => void;
     /**
      * @deprecated please use `tools.webpackChain` instead.

package/dist/index.d.ts

@@ -7,13 +7,12 @@ import type { NormalizedConfig } from './config/mergeConfig';
 export type { Hooks };
 export * from './config';
 export * from '@modern-js/plugin';
-export * from '@modern-js/plugin/node';
 export { manager, mountHook, usePlugins, createPlugin, registerHook, } from './manager';
 export type { CliHooks, CliPlugin, CliHookCallbacks } from './manager';
 export { AppContext, ConfigContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, } from './pluginAPI';
 export type { PluginAPI } from './pluginAPI';
 export type { NormalizedConfig, IAppContext };
-declare const initAppDir: (cwd?: string | undefined) => Promise<string>;
+declare const initAppDir: (cwd?: string) => Promise<string>;
 export interface CoreOptions {
     version?: string;
     configFile?: string;
@@ -29,7 +28,7 @@ export interface CoreOptions {
         sharedDir?: string;
     };
 }
-export declare const mergeOptions: (options?: CoreOptions | undefined) => {
+export declare const mergeOptions: (options?: CoreOptions) => {
     version?: string | undefined;
     configFile?: string | undefined;
     serverConfigFile: string;
@@ -50,12 +49,12 @@ export declare const mergeOptions: (options?: CoreOptions | undefined) => {
     } | undefined;
 };
 export declare const cli: {
-    init: (argv?: string[], options?: CoreOptions | undefined) => Promise<{
+    init: (argv?: string[], options?: CoreOptions) => Promise<{
         loadedConfig: import("./config").LoadedConfig;
         appContext: IAppContext;
         resolved: NormalizedConfig;
     }>;
-    run: (argv: string[], options?: CoreOptions | undefined) => Promise<void>;
+    run: (argv: string[], options?: CoreOptions) => Promise<void>;
     restart: () => Promise<void>;
 };
 export { initAppDir, initAppContext };

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -16,7 +20,6 @@ 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.usePlugins = exports.mountHook = exports.manager = void 0;
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("@modern-js/utils");
-const node_1 = require("@modern-js/plugin/node");
 const commander_1 = require("./utils/commander");
 const config_1 = require("./config");
 const loadPlugins_1 = require("./loadPlugins");
@@ -27,7 +30,6 @@ const loadEnv_1 = require("./loadEnv");
 const manager_1 = require("./manager");
 __exportStar(require("./config"), exports);
 __exportStar(require("@modern-js/plugin"), exports);
-__exportStar(require("@modern-js/plugin/node"), 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; } });
@@ -75,7 +77,6 @@ const createCli = () => {
     let restartOptions;
     const init = async (argv = [], options) => {
         var _a, _b;
-        (0, node_1.enable)();
         manager_1.manager.clear();
         const mergedOptions = (0, exports.mergeOptions)(options);
         restartOptions = mergedOptions;
@@ -99,10 +100,8 @@ const createCli = () => {
         });
         // 将 server.config 加入到 loaded.dependencies，以便对文件监听做热更新
         (0, config_1.addServerConfigToDeps)(loaded.dependencies, appDirectory, mergedOptions.serverConfigFile);
-        manager_1.manager.run(() => {
-            context_1.ConfigContext.set(loaded.config);
-            context_1.AppContext.set(appContext);
-        });
+        context_1.ConfigContext.set(loaded.config);
+        context_1.AppContext.set(appContext);
         hooksRunner = await manager_1.manager.init();
         ['SIGINT', 'SIGTERM', 'unhandledRejection', 'uncaughtException'].forEach(event => {
             process.on(event, async (err) => {
@@ -123,14 +122,12 @@ const createCli = () => {
             resolved: config,
         });
         // update context value
-        manager_1.manager.run(() => {
-            context_1.ConfigContext.set(loaded.config);
-            context_1.ResolvedConfigContext.set(resolved);
-            context_1.AppContext.set({
-                ...appContext,
-                port: resolved.server.port,
-                distDirectory: (0, utils_1.ensureAbsolutePath)(appDirectory, resolved.output.path),
-            });
+        context_1.ConfigContext.set(loaded.config);
+        context_1.ResolvedConfigContext.set(resolved);
+        context_1.AppContext.set({
+            ...appContext,
+            port: resolved.server.port,
+            distDirectory: (0, utils_1.ensureAbsolutePath)(appDirectory, resolved.output.path),
         });
         await hooksRunner.prepare();
         return {
@@ -144,7 +141,7 @@ const createCli = () => {
         const { loadedConfig, appContext, resolved } = await init(argv, options);
         await hooksRunner.commands({ program: utils_1.program });
         (0, initWatcher_1.initWatcher)(loadedConfig, appContext.appDirectory, resolved.source.configDir, hooksRunner, argv);
-        manager_1.manager.run(() => utils_1.program.parse(process.argv));
+        utils_1.program.parse(process.argv);
     }
     async function restart() {
         var _a, _b;
@@ -163,7 +160,7 @@ const createCli = () => {
         }
         finally {
             if (!hasGetError) {
-                manager_1.manager.run(() => utils_1.program.parse(process.argv));
+                utils_1.program.parse(process.argv);
             }
         }
     }

package/dist/loadPlugins.js

@@ -4,26 +4,6 @@ exports.loadPlugins = exports.getAppPlugins = void 0;
 const utils_1 = require("@modern-js/utils");
 const manager_1 = require("./manager");
 const debug = (0, utils_1.createDebugger)('load-plugins');
-/**
- * Try to resolve plugin entry file path.
- * @param name - Plugin name.
- * @param appDirectory - Application root directory.
- * @returns Resolved file path.
- */
-const tryResolve = (name, appDirectory) => {
-    let filePath = '';
-    try {
-        filePath = require.resolve(name, { paths: [appDirectory] });
-        delete require.cache[filePath];
-    }
-    catch (err) {
-        if (err.code === 'MODULE_NOT_FOUND') {
-            throw new Error(`Can not find plugin ${name}.`);
-        }
-        throw err;
-    }
-    return filePath;
-};
 function getAppPlugins(appDirectory, oldPluginConfig, internalPlugins) {
     const allPlugins = internalPlugins || utils_1.INTERNAL_PLUGINS;
     const appPlugins = [
@@ -44,7 +24,7 @@ exports.getAppPlugins = getAppPlugins;
 const resolveCliPlugin = (p, userConfig, appDirectory, transformPlugin) => {
     const pkg = typeof p === 'string' ? p : p[0];
     const pluginOptions = typeof p === 'string' ? undefined : p[1];
-    const path = tryResolve(pkg, appDirectory);
+    const path = (0, utils_1.tryResolve)(pkg, appDirectory);
     let module = (0, utils_1.compatRequire)(path);
     if (transformPlugin) {
         module = transformPlugin(module, userConfig, pluginOptions);

package/dist/pluginAPI.d.ts

@@ -2,11 +2,12 @@ import type { CommonAPI } from '@modern-js/plugin';
 import type { CliHooks } from './manager';
 import { AppContext, ConfigContext, useAppContext, useConfigContext, ResolvedConfigContext, useResolvedConfigContext } from './context';
 export declare const pluginAPI: {
-    setAppContext: (value: import("@modern-js/types/cli").IAppContext) => void;
-    useAppContext: () => import("@modern-js/types/cli").IAppContext;
+    setAppContext: (value: import("@modern-js/types").IAppContext) => void;
+    useAppContext: () => import("@modern-js/types").IAppContext;
     useConfigContext: () => import("./config").UserConfig;
     useResolvedConfigContext: () => import(".").NormalizedConfig;
 };
+export type { IAppContext } from '@modern-js/types';
 /** all apis for cli plugin */
 export declare type PluginAPI = typeof pluginAPI & CommonAPI<CliHooks>;
 export { AppContext, ConfigContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.12.0",
+  "version": "1.12.2-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -40,8 +40,8 @@
   },
   "dependencies": {
     "@modern-js/load-config": "^1.3.4",
-    "@modern-js/plugin": "^1.3.7",
-    "@modern-js/utils": "^1.7.7"
+    "@modern-js/plugin": "^1.3.8",
+    "@modern-js/utils": "^1.7.8"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
@@ -68,7 +68,8 @@
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/index.d.ts"
   },
   "wireit": {
     "build": {