@modern-js/core 1.12.0 → 1.12.1

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;
+/**
+ * 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 | undefined, packageJsonConfig?: string | undefined) => 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

@@ -13,7 +13,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 +37,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 +58,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/types/index.d.ts

@@ -4,7 +4,7 @@ import type { NextFunction, BffProxyOptions } from '@modern-js/types';
 import type { MetaOptions, ChainIdentifier } 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 | {
@@ -160,9 +162,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/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.1",
   "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",