@modern-js/core 1.11.0 → 1.12.0

package/CHANGELOG.md

@@ -1,5 +1,50 @@
 # @modern-js/core
 
+## 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
+
+- f730081c: feat: modify `RuntimeConfig` type to make it extensible
+- d1ab1f05: fix(core): should not register the `core` command
+- 2ec8181a: fix(core): modern --version get incorrect value
+- 6451a098: fix: cyclic dependencies of @modern-js/core and @moden-js/webpack
+- 7fcfd6cc: fix(core): fix tools.postcss typing
+- Updated dependencies [6451a098]
+- Updated dependencies [d5a2cfd8]
+- Updated dependencies [437367c6]
+  - @modern-js/utils@1.7.6
+
 ## 1.11.0
 
 ### Minor Changes

package/dist/bin.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/bin.js

@@ -0,0 +1,29 @@
+#!/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');
+const utils_1 = require("@modern-js/utils");
+const _1 = require(".");
+const command = process.argv[2];
+if (!process.env.NODE_ENV) {
+    if (['build', 'start', 'deploy'].includes(command)) {
+        process.env.NODE_ENV = 'production';
+    }
+    else if (command === 'test') {
+        process.env.NODE_ENV = 'test';
+    }
+    else {
+        process.env.NODE_ENV = 'development';
+    }
+}
+const { version } = require('../package.json');
+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/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

@@ -1,20 +1,23 @@
 /// <reference types="node" />
 import type { IncomingMessage, ServerResponse } from 'http';
 import type { NextFunction, BffProxyOptions } from '@modern-js/types';
-import type { MetaOptions } from '@modern-js/utils';
-import type { TransformOptions } from '@babel/core';
+import type { MetaOptions, ChainIdentifier } from '@modern-js/utils';
+import type { TransformOptions, PluginItem as BabelPlugin } from '@babel/core';
 import type webpack from 'webpack';
-import type { Configuration as WebpackConfiguration } from 'webpack';
-import type { ChainIdentifier, WebpackChain } from '@modern-js/webpack';
+import type { RuleSetRule, Configuration as WebpackConfiguration } 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';
 import type { LessConfig, LessLoaderOptions } from './less';
 import type { UnbundleConfig } from './unbundle';
 import type { SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions } from './ssg';
-import { ElectronConfig } from './electron';
+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;
 export type { TestConfig, JestConfig, UnbundleConfig, SassConfig, SassLoaderOptions, LessConfig, LessLoaderOptions, SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions, TransformOptions, AutoprefixerOptions, TerserOptions, };
@@ -141,29 +144,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 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;
+    removePlugin: (pluginName: string) => void;
     /**
      * @deprecated please use `tools.webpackChain` instead.
      */
     chain: WebpackChain;
-    [key: string]: any;
-}) => 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 {
@@ -171,11 +198,11 @@ export interface ToolsConfig {
     webpackChain?: WebpackChainConfig;
     babel?: BabelConfig;
     autoprefixer?: AutoprefixerConfig;
-    postcss?: ConfigFunction;
+    postcss?: PostCSSConfig;
     styledComponents?: ConfigFunction;
     lodash?: ConfigFunction;
     devServer?: DevServerConfig;
-    tsLoader?: ConfigFunction;
+    tsLoader?: TsLoaderConfig;
     terser?: TerserConfig;
     minifyCss?: ConfigFunction;
     esbuild?: Record<string, unknown>;
@@ -204,16 +231,18 @@ export interface ToolsConfig {
      */
     less?: LessConfig;
 }
-export declare type RuntimeConfig = Record<string, any>;
+export interface RuntimeConfig {
+    [name: string]: any;
+}
 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/postcss.d.ts

@@ -0,0 +1,28 @@
+import type { Syntax, Parser, Stringifier, AcceptedPlugin, SourceMapOptions } from 'postcss';
+export declare type PostCSSOptions = {
+    to?: string;
+    from?: string;
+    map?: boolean | SourceMapOptions;
+    syntax?: Syntax;
+    parser?: string | object | (() => Parser);
+    plugins?: AcceptedPlugin[];
+    stringifier?: Stringifier | Syntax;
+};
+export declare type PostCSSLoaderOptions = {
+    /**
+     * Enable PostCSS Parser support in CSS-in-JS. If you use JS styles the postcss-js parser, add the execute option.
+     */
+    execute?: boolean;
+    /**
+     * By default generation of source maps depends on the devtool option. All values enable source map generation except eval and false value.
+     */
+    sourceMap?: boolean;
+    /**
+     * The special implementation option determines which implementation of PostCSS to use.
+     */
+    implementation?: unknown;
+    /**
+     * Allows to set PostCSS options and plugins.
+     */
+    postcssOptions?: PostCSSOptions;
+};

package/dist/config/types/postcss.js

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

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/index.d.ts

@@ -15,6 +15,7 @@ export type { PluginAPI } from './pluginAPI';
 export type { NormalizedConfig, IAppContext };
 declare const initAppDir: (cwd?: string | undefined) => Promise<string>;
 export interface CoreOptions {
+    version?: string;
     configFile?: string;
     serverConfigFile?: string;
     packageJsonConfig?: string;
@@ -29,6 +30,7 @@ export interface CoreOptions {
     };
 }
 export declare const mergeOptions: (options?: CoreOptions | undefined) => {
+    version?: string | undefined;
     configFile?: string | undefined;
     serverConfigFile: string;
     packageJsonConfig?: string | undefined;

package/dist/index.js

@@ -43,10 +43,6 @@ Object.defineProperty(exports, "ResolvedConfigContext", { enumerable: true, get:
 Object.defineProperty(exports, "useAppContext", { enumerable: true, get: function () { return pluginAPI_1.useAppContext; } });
 Object.defineProperty(exports, "useConfigContext", { enumerable: true, get: function () { return pluginAPI_1.useConfigContext; } });
 Object.defineProperty(exports, "useResolvedConfigContext", { enumerable: true, get: function () { return pluginAPI_1.useResolvedConfigContext; } });
-utils_1.program
-    .name('modern')
-    .usage('<command> [options]')
-    .version(process.env.MODERN_JS_VERSION || '0.1.0');
 const initAppDir = async (cwd) => {
     if (!cwd) {
         // eslint-disable-next-line no-param-reassign
@@ -69,6 +65,9 @@ const mergeOptions = (options) => {
     };
 };
 exports.mergeOptions = mergeOptions;
+const setProgramVersion = (version = 'unknown') => {
+    utils_1.program.name('modern').usage('<command> [options]').version(version);
+};
 const createCli = () => {
     let hooksRunner;
     let isRestart = false;
@@ -82,6 +81,7 @@ const createCli = () => {
         restartOptions = mergedOptions;
         const appDirectory = await initAppDir();
         (0, commander_1.initCommandsMap)();
+        setProgramVersion(options === null || options === void 0 ? void 0 : options.version);
         const metaName = (_b = (_a = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.options) === null || _a === void 0 ? void 0 : _a.metaName) !== null && _b !== void 0 ? _b : 'MODERN';
         (0, loadEnv_1.loadEnv)(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
         const loaded = await (0, config_1.loadUserConfig)(appDirectory, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.configFile, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.packageJsonConfig);

package/dist/loadPlugins.js

@@ -31,7 +31,6 @@ function getAppPlugins(appDirectory, oldPluginConfig, internalPlugins) {
             .filter(name => {
             const config = allPlugins[name];
             if (config.forced === true) {
-                // 参考 packages/cli/core/src/cli.ts 文件
                 return true;
             }
             return (0, utils_1.isDepExists)(appDirectory, name);

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.11.0",
+  "version": "1.12.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -27,8 +27,8 @@
       "default": "./dist/index.js"
     },
     "./bin": {
-      "jsnext:source": "./src/cli.ts",
-      "default": "./bin/modern-js.js"
+      "jsnext:source": "./src/bin.ts",
+      "default": "./dist/bin.js"
     }
   },
   "typesVersions": {
@@ -38,16 +38,14 @@
       ]
     }
   },
-  "bin": "./bin/modern-js.js",
   "dependencies": {
-    "@modern-js/load-config": "^1.3.3",
-    "@modern-js/plugin": "^1.3.5",
-    "@modern-js/utils": "^1.7.5"
+    "@modern-js/load-config": "^1.3.4",
+    "@modern-js/plugin": "^1.3.7",
+    "@modern-js/utils": "^1.7.7"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
-    "@modern-js/types": "1.5.3",
-    "@modern-js/webpack": "1.8.0",
+    "@modern-js/types": "1.5.4",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/babel__code-frame": "^7.0.3",
@@ -60,6 +58,7 @@
     "autoprefixer": "^10.3.1",
     "btsm": "2.2.2",
     "jest": "^27",
+    "postcss": "^8.4.14",
     "sass": "^1.45.0",
     "electron-builder": "22.7.0",
     "terser-webpack-plugin": "^5.1.4",

package/bin/modern-js.js

@@ -1,18 +0,0 @@
-#!/usr/bin/env node
-
-require('../compiled/v8-compile-cache');
-const { cli } = require('../');
-const { version } = require('../package.json');
-
-process.env.MODERN_JS_VERSION = version;
-if (!process.env.NODE_ENV) {
-  process.env.NODE_ENV =
-    // eslint-disable-next-line no-nested-ternary
-    ['build', 'start', 'deploy'].indexOf(process.argv[2]) !== -1
-      ? 'production'
-      : process.argv[2] === 'test'
-      ? 'test'
-      : 'development';
-}
-
-cli.run(process.argv.slice(2));

package/dist/cli.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/cli.js

@@ -1,33 +0,0 @@
-"use strict";
-// 这个文件跟 bin/modern-js.js 基本一样
-// 在开发阶段，因为 package.json 的 exports['./bin']['jsnext:source'] 配置
-// 了这个文件，所以需要保留, 后续如果找到更好的方式之后会移除这个文件
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const _1 = require(".");
-const { version } = require('../package.json');
-// XXX: 通过这个方式去掉了 package.json 里面对于 @modern-js/module-tools 的 devDependencies 依赖
-// 然后可以正常的执行 modern build
-const kModuleToolsCliPath = path_1.default.resolve(__dirname, '../../../solutions/module-tools/src/index.ts');
-process.env.MODERN_JS_VERSION = version;
-if (!process.env.NODE_ENV) {
-    process.env.NODE_ENV =
-        // eslint-disable-next-line no-nested-ternary
-        ['build', 'start', 'deploy'].includes(process.argv[2])
-            ? 'production'
-            : process.argv[2] === 'test'
-                ? 'test'
-                : 'development';
-}
-_1.cli.run(process.argv.slice(2), {
-    plugins: {
-        '@modern-js/module-tools': {
-            cli: kModuleToolsCliPath,
-            // 是否需要强制加载这个组件，跳过 loadPlugins 里面 filter 的检测逻辑
-            forced: true,
-        },
-    },
-});