@modern-js/core 1.11.1 → 1.12.1

package/CHANGELOG.md

@@ -1,5 +1,51 @@
 # @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
+
+- 8e1cedd8a: feat(webpack): support addIncludes and addExcludes in tools.tsLoader
+
+### Patch Changes
+
+- 9377d2d9d: feat: support addPlugins util in tools.postcss
+- b7a1cea52: feat: support utils in tools.babel
+- 3dfee700c: feat: support addExcludes in tools.less and tools.sass
+- Updated dependencies [9377d2d9d]
+- Updated dependencies [8c9ad1749]
+- Updated dependencies [1ac68424f]
+  - @modern-js/utils@1.7.7
+  - @modern-js/plugin@1.3.7
+
+## 1.11.2
+
+### Patch Changes
+
+- 8d508c6ed: feat(devServer): support disable hmr or live reload
+- 0eff2473c: ignore devServer config fn merge
+- f25d6a62e: fix: change bffConfig type define to interface
+- a18926bbd: fix(app-tools): dev --config not working
+- 8f7c0f898: feat(app-tools): support specify config file in build and deploy command
+- Updated dependencies [a1198d509]
+- Updated dependencies [a18926bbd]
+  - @modern-js/load-config@1.3.4
+  - @modern-js/plugin@1.3.6
+
 ## 1.11.1
 
 ### Patch Changes

package/dist/bin.js

@@ -1,11 +1,13 @@
 #!/usr/bin/env node
 "use strict";
+/* eslint-disable-next-line eslint-comments/disable-enable-pair */
+/* eslint-disable import/first */
 Object.defineProperty(exports, "__esModule", { value: true });
 require('../compiled/v8-compile-cache');
-// eslint-disable-next-line import/first
+const utils_1 = require("@modern-js/utils");
 const _1 = require(".");
+const command = process.argv[2];
 if (!process.env.NODE_ENV) {
-    const command = process.argv[2];
     if (['build', 'start', 'deploy'].includes(command)) {
         process.env.NODE_ENV = 'production';
     }
@@ -17,4 +19,11 @@ if (!process.env.NODE_ENV) {
     }
 }
 const { version } = require('../package.json');
-_1.cli.run(process.argv.slice(2), { version });
+const cliParams = (0, utils_1.minimist)(process.argv.slice(2));
+const runOptions = {
+    version,
+};
+if (['dev', 'build', 'deploy'].includes(command) && cliParams.config) {
+    runOptions.configFile = cliParams.config;
+}
+_1.cli.run(process.argv.slice(2), runOptions);

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/mergeConfig.js

@@ -11,7 +11,10 @@ const utils_1 = require("@modern-js/utils");
  */
 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' || key === 'tailwindcss') {
+    if (key === 'designSystem' ||
+        key === 'tailwind' ||
+        key === 'tailwindcss' ||
+        key === 'devServer') {
         return (0, lodash_1.mergeWith)({}, target !== null && target !== void 0 ? target : {}, source !== null && source !== void 0 ? source : {});
     }
     if (Array.isArray(target)) {

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

@@ -2,12 +2,13 @@
 import type { IncomingMessage, ServerResponse } from 'http';
 import type { NextFunction, BffProxyOptions } from '@modern-js/types';
 import type { MetaOptions, ChainIdentifier } from '@modern-js/utils';
-import type { TransformOptions } from '@babel/core';
+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';
+import type { AcceptedPlugin as PostCSSPlugin } from 'postcss';
 import type { PluginConfig } from '../../loadPlugins';
 import type { TestConfig, JestConfig } from './test';
 import type { SassConfig, SassLoaderOptions } from './sass';
@@ -16,8 +17,11 @@ import type { UnbundleConfig } from './unbundle';
 import type { SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions } from './ssg';
 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 | {
@@ -142,33 +146,53 @@ export interface DeployConfig {
 declare type ConfigFunction = Record<string, unknown> | ((config: Record<string, unknown>, utils?: any) => Record<string, unknown> | void);
 export declare type RequestHandler = (req: IncomingMessage, res: ServerResponse, next: NextFunction) => void;
 export declare type DevServerConfig = {
+    hot?: boolean;
+    liveReload?: boolean;
     proxy?: BffProxyOptions;
     headers?: Record<string, string>;
     before?: RequestHandler[];
     after?: RequestHandler[];
     [propsName: string]: any;
 };
-export declare type PostCSSConfig = PostCSSLoaderOptions | ((options: PostCSSLoaderOptions) => PostCSSLoaderOptions | void);
-export declare type WebpackConfig = WebpackConfiguration | ((config: WebpackConfiguration, utils: {
+export declare type PostCSSConfigUtils = {
+    addPlugins: (plugins: PostCSSPlugin | PostCSSPlugin[]) => void;
+};
+export declare type PostCSSConfig = PostCSSLoaderOptions | ((options: PostCSSLoaderOptions, utils: PostCSSConfigUtils) => PostCSSLoaderOptions | void);
+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.
      */
     chain: WebpackChain;
-}) => WebpackConfiguration | void);
-export declare type WebpackChainConfig = (chain: WebpackChain, utils: {
+};
+export declare type WebpackConfig = WebpackConfiguration | ((config: WebpackConfiguration, utils: WebpackConfigUtils) => WebpackConfiguration | void);
+export declare type WebpackChainConfigUtils = {
     env: string;
     name: string;
     webpack: typeof webpack;
     CHAIN_ID: ChainIdentifier;
-}) => void;
-export declare type BabelConfig = TransformOptions | ((config: TransformOptions, utils?: any) => TransformOptions | void);
+};
+export declare type WebpackChainConfig = (chain: WebpackChain, utils: WebpackChainConfigUtils) => void;
+export declare type TsLoaderConfigUtils = {
+    addIncludes: (includes: string | RegExp | (string | RegExp)[]) => void;
+    addExcludes: (excludes: string | RegExp | (string | RegExp)[]) => void;
+};
+export declare type TsLoaderConfig = TsLoaderOptions | ((config: TsLoaderOptions, utils: TsLoaderConfigUtils) => TsLoaderOptions | void);
+export declare type BabelConfigUtils = {
+    addPlugins: (plugins: BabelPlugin[]) => void;
+    addPresets: (presets: BabelPlugin[]) => void;
+    addIncludes: (includes: string | RegExp | (string | RegExp)[]) => void;
+    addExcludes: (excludes: string | RegExp | (string | RegExp)[]) => void;
+    removePlugins: (plugins: string | string[]) => void;
+    removePresets: (presets: string | string[]) => void;
+};
+export declare type BabelConfig = TransformOptions | ((config: TransformOptions, utils: BabelConfigUtils) => TransformOptions | void);
 export declare type AutoprefixerConfig = AutoprefixerOptions | ((config: AutoprefixerOptions) => AutoprefixerOptions | void);
 export declare type TerserConfig = TerserOptions | ((config: TerserOptions) => TerserOptions | void);
 export interface ToolsConfig {
@@ -180,7 +204,7 @@ export interface ToolsConfig {
     styledComponents?: ConfigFunction;
     lodash?: ConfigFunction;
     devServer?: DevServerConfig;
-    tsLoader?: ConfigFunction;
+    tsLoader?: TsLoaderConfig;
     terser?: TerserConfig;
     minifyCss?: ConfigFunction;
     esbuild?: Record<string, unknown>;
@@ -215,12 +239,12 @@ export interface RuntimeConfig {
 export interface RuntimeByEntriesConfig {
     [name: string]: RuntimeConfig;
 }
-export declare type BffConfig = Partial<{
-    prefix: string;
-    requestCreator: string;
-    fetcher: string;
-    proxy: Record<string, any>;
-}>;
+export interface BffConfig {
+    prefix?: string;
+    requestCreator?: string;
+    fetcher?: string;
+    proxy?: Record<string, any>;
+}
 export interface UserConfig {
     source?: SourceConfig;
     output?: OutputConfig;

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

@@ -7,4 +7,6 @@ export declare type LessLoaderOptions = {
     webpackImporter?: boolean;
     implementation?: boolean;
 };
-export declare type LessConfig = LessLoaderOptions | ((options: LessLoaderOptions, utils?: any) => LessLoaderOptions | void);
+export declare type LessConfig = LessLoaderOptions | ((options: LessLoaderOptions, utils: {
+    addExcludes: (excludes: RegExp | RegExp[]) => void;
+}) => LessLoaderOptions | void);

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

@@ -5,4 +5,6 @@ export interface SassLoaderOptions {
     implementation?: string;
     additionalData?: string | ((content: string, filename: string) => string);
 }
-export declare type SassConfig = SassLoaderOptions | ((options: SassLoaderOptions, utils?: any) => SassLoaderOptions | void);
+export declare type SassConfig = SassLoaderOptions | ((options: SassLoaderOptions, utils: {
+    addExcludes: (excludes: RegExp | RegExp[]) => void;
+}) => SassLoaderOptions | void);

package/dist/config/types/ts-loader.d.ts

@@ -0,0 +1,23 @@
+export declare type TsLoaderOptions = {
+    colors?: boolean;
+    silent?: boolean;
+    context?: string;
+    instance?: string;
+    logLevel?: string;
+    compiler?: string;
+    configFile?: string;
+    reportFiles?: string[];
+    transpileOnly?: boolean;
+    happyPackMode?: boolean;
+    errorFormatter?: (message: Record<string, unknown>, colors: boolean) => string;
+    logInfoToStdOut?: boolean;
+    compilerOptions?: Record<string, unknown>;
+    appendTsSuffixTo?: (RegExp | string)[];
+    appendTsxSuffixTo?: (RegExp | string)[];
+    projectReferences?: boolean;
+    ignoreDiagnostics?: number[];
+    allowTsInNodeModules?: boolean;
+    experimentalFileCaching?: boolean;
+    onlyCompileBundledFiles?: boolean;
+    useCaseSensitiveFileNames?: boolean;
+};

package/dist/config/types/ts-loader.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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.11.1",
+  "version": "1.12.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -39,9 +39,9 @@
     }
   },
   "dependencies": {
-    "@modern-js/load-config": "^1.3.3",
-    "@modern-js/plugin": "^1.3.5",
-    "@modern-js/utils": "^1.7.6"
+    "@modern-js/load-config": "^1.3.4",
+    "@modern-js/plugin": "^1.3.8",
+    "@modern-js/utils": "^1.7.8"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
@@ -58,7 +58,7 @@
     "autoprefixer": "^10.3.1",
     "btsm": "2.2.2",
     "jest": "^27",
-    "postcss": "^8",
+    "postcss": "^8.4.14",
     "sass": "^1.45.0",
     "electron-builder": "22.7.0",
     "terser-webpack-plugin": "^5.1.4",