@modern-js/core 1.11.0-beta.1 → 1.11.2

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @modern-js/core
 
+## 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.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/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,11 +1,11 @@
 /// <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 { MetaOptions, ChainIdentifier } from '@modern-js/utils';
 import type { TransformOptions } 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 { PluginConfig } from '../../loadPlugins';
@@ -14,7 +14,8 @@ 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';
 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,21 +142,27 @@ 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: {
     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: {
     env: string;
@@ -171,7 +178,7 @@ export interface ToolsConfig {
     webpackChain?: WebpackChainConfig;
     babel?: BabelConfig;
     autoprefixer?: AutoprefixerConfig;
-    postcss?: ConfigFunction;
+    postcss?: PostCSSConfig;
     styledComponents?: ConfigFunction;
     lodash?: ConfigFunction;
     devServer?: DevServerConfig;
@@ -204,16 +211,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/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/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/bin.ts 文件
                 return true;
             }
             return (0, utils_1.isDepExists)(appDirectory, name);

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.11.0-beta.1",
+  "version": "1.11.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -38,16 +38,14 @@
       ]
     }
   },
-  "bin": "./dist/bin.js",
   "dependencies": {
-    "@modern-js/load-config": "^1.3.2",
-    "@modern-js/plugin": "^1.3.4",
-    "@modern-js/utils": "^1.7.4"
+    "@modern-js/load-config": "^1.3.4",
+    "@modern-js/plugin": "^1.3.6",
+    "@modern-js/utils": "^1.7.6"
   },
   "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",
     "sass": "^1.45.0",
     "electron-builder": "22.7.0",
     "terser-webpack-plugin": "^5.1.4",