@modern-js/core 1.11.1 → 1.11.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @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

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

@@ -142,6 +142,8 @@ 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[];
@@ -215,12 +217,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/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.11.1",
+  "version": "1.11.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -39,8 +39,8 @@
     }
   },
   "dependencies": {
-    "@modern-js/load-config": "^1.3.3",
-    "@modern-js/plugin": "^1.3.5",
+    "@modern-js/load-config": "^1.3.4",
+    "@modern-js/plugin": "^1.3.6",
     "@modern-js/utils": "^1.7.6"
   },
   "devDependencies": {