@modern-js/core 1.6.1 → 1.7.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @modern-js/core
 
+## 1.7.0
+
+### Minor Changes
+
+- d2d1d6b2: feat: support server config
+
+### Patch Changes
+
+- 60855eb2: fix: ignore initial watching add event
+- ec1b7367: fix: tools config types
+- 07a4887e: feat: prebundle commander and signale to @modern-js/utils
+- 17d0cc46: feat: prebundle lodash to @modern-js/utils/lodash
+- Updated dependencies [77ff9754]
+- Updated dependencies [d2d1d6b2]
+- Updated dependencies [07a4887e]
+- Updated dependencies [ea2ae711]
+- Updated dependencies [17d0cc46]
+- Updated dependencies [d2d1d6b2]
+  - @modern-js/utils@1.4.0
+  - @modern-js/load-config@1.3.0
+
 ## 1.6.1
 
 ### Patch Changes

package/dist/js/modern/config/index.js

@@ -7,9 +7,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { loadConfig } from '@modern-js/load-config';
 import Ajv from 'ajv';
 import ajvKeywords from 'ajv-keywords';
-import logger from 'signale';
-import { createDebugger, getPort, isDev, PLUGIN_SCHEMAS, chalk } from '@modern-js/utils';
-import mergeWith from 'lodash.mergewith';
+import { signale as logger, createDebugger, getPort, isDev, PLUGIN_SCHEMAS, chalk, getServerConfig } from '@modern-js/utils';
+import { mergeWith } from '@modern-js/utils/lodash';
 import betterAjvErrors from 'better-ajv-errors';
 import { codeFrameColumns } from '@babel/code-frame';
 import { repeatKeyWarning } from "../utils/repeatKeyWarning";
@@ -20,6 +19,13 @@ const debug = createDebugger('resolve-config');
 export { defaults as defaultsConfig };
 export { mergeConfig };
 export * from "./types";
+export const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
+  const serverConfig = await getServerConfig(appDirectory, serverConfigFile);
+
+  if (serverConfig) {
+    dependencies.push(serverConfig);
+  }
+};
 export const defineConfig = config => config;
 export const loadUserConfig = async (appDirectory, filePath, packageJsonConfig) => {
   const loaded = await loadConfig(appDirectory, filePath, packageJsonConfig);
@@ -43,8 +49,6 @@ const showAdditionalPropertiesError = error => {
     }
   }
 };
-/* eslint-disable  max-statements, max-params */
-
 
 export const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv, onSchemaError = showAdditionalPropertiesError) => {
   var _validate$errors;
@@ -108,5 +112,4 @@ export const resolveConfig = async (loaded, configs, schemas, restartWithExistin
 
   debug('resolved %o', resolved);
   return resolved;
-};
-/* eslint-enable max-statements, max-params */
+};

package/dist/js/modern/config/mergeConfig.js

@@ -1,4 +1,4 @@
-import mergeWith from 'lodash.mergewith';
+import { mergeWith } from '@modern-js/utils/lodash';
 import { isFunction } from '@modern-js/utils';
 
 /**

package/dist/js/modern/config/schema/index.js

@@ -1,5 +1,5 @@
 import { isObject, createDebugger } from '@modern-js/utils';
-import cloneDeep from 'lodash.clonedeep';
+import { cloneDeep } from '@modern-js/utils/lodash';
 import { source } from "./source";
 import { output } from "./output";
 import { server } from "./server";

package/dist/js/modern/config/types/index.js

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

package/dist/js/modern/context.js

@@ -25,7 +25,13 @@ export const useConfigContext = () => ConfigContext.use().value;
  */
 
 export const useResolvedConfigContext = () => ResolvedConfigContext.use().value;
-export const initAppContext = (appDirectory, plugins, configFile, options) => {
+export const initAppContext = ({
+  appDirectory,
+  plugins,
+  configFile,
+  options,
+  serverConfigFile
+}) => {
   const {
     metaName = 'modern-js',
     srcDir = 'src',
@@ -36,6 +42,7 @@ export const initAppContext = (appDirectory, plugins, configFile, options) => {
     metaName,
     appDirectory,
     configFile,
+    serverConfigFile,
     ip: address.ip(),
     port: 0,
     packageName: require(path.resolve(appDirectory, './package.json')).name,

package/dist/js/modern/index.js

@@ -5,10 +5,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import path from 'path';
-import { pkgUp, ensureAbsolutePath, logger } from '@modern-js/utils';
+import { pkgUp, program, ensureAbsolutePath, logger, DEFAULT_SERVER_CONFIG } from '@modern-js/utils';
 import { enable } from '@modern-js/plugin/node';
-import { program } from "./utils/commander";
-import { resolveConfig, loadUserConfig } from "./config";
+import { initCommandsMap } from "./utils/commander";
+import { resolveConfig, loadUserConfig, addServerConfigToDeps } from "./config";
 import { loadPlugins } from "./loadPlugins";
 import { AppContext, ConfigContext, initAppContext, ResolvedConfigContext } from "./context";
 import { initWatcher } from "./initWatcher";
@@ -40,6 +40,13 @@ const initAppDir = async cwd => {
   return path.dirname(pkg);
 };
 
+export const mergeOptions = options => {
+  const defaultOptions = {
+    serverConfigFile: DEFAULT_SERVER_CONFIG
+  };
+  return _objectSpread(_objectSpread({}, defaultOptions), options);
+};
+
 const createCli = () => {
   let hooksRunner;
   let isRestart = false;
@@ -47,20 +54,30 @@ const createCli = () => {
   let restartOptions;
 
   const init = async (argv = [], options) => {
-    var _options$options$meta, _options$options;
+    var _mergedOptions$option, _mergedOptions$option2;
 
     enable();
     manager.clear();
-    restartOptions = options;
+    const mergedOptions = mergeOptions(options);
+    restartOptions = mergedOptions;
     const appDirectory = await initAppDir();
-    const metaName = (_options$options$meta = options === null || options === void 0 ? void 0 : (_options$options = options.options) === null || _options$options === void 0 ? void 0 : _options$options.metaName) !== null && _options$options$meta !== void 0 ? _options$options$meta : 'MODERN';
+    initCommandsMap();
+    const metaName = (_mergedOptions$option = mergedOptions === null || mergedOptions === void 0 ? void 0 : (_mergedOptions$option2 = mergedOptions.options) === null || _mergedOptions$option2 === void 0 ? void 0 : _mergedOptions$option2.metaName) !== null && _mergedOptions$option !== void 0 ? _mergedOptions$option : 'MODERN';
     loadEnv(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
-    const loaded = await loadUserConfig(appDirectory, options === null || options === void 0 ? void 0 : options.configFile, options === null || options === void 0 ? void 0 : options.packageJsonConfig);
+    const loaded = await loadUserConfig(appDirectory, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.configFile, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.packageJsonConfig);
     const plugins = loadPlugins(appDirectory, loaded.config, {
-      internalPlugins: options === null || options === void 0 ? void 0 : options.plugins
+      internalPlugins: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.plugins
     });
     plugins.forEach(plugin => plugin.cli && manager.usePlugin(plugin.cli));
-    const appContext = initAppContext(appDirectory, plugins, loaded.filePath, options === null || options === void 0 ? void 0 : options.options);
+    const appContext = initAppContext({
+      appDirectory,
+      plugins,
+      configFile: loaded.filePath,
+      options: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.options,
+      serverConfigFile: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.serverConfigFile
+    }); // 将 server.config 加入到 loaded.dependencies，以便对文件监听做热更新
+
+    addServerConfigToDeps(loaded.dependencies, appDirectory, mergedOptions.serverConfigFile);
     manager.run(() => {
       ConfigContext.set(loaded.config);
       AppContext.set(appContext);

package/dist/js/modern/initWatcher.js

@@ -1,8 +1,7 @@
 import crypto from 'crypto';
 import fs from 'fs';
 import path from 'path';
-import { isDev, createDebugger, isTest } from '@modern-js/utils';
-import chokidar from 'chokidar';
+import { isDev, chokidar, createDebugger, isTest } from '@modern-js/utils';
 const debug = createDebugger('watch-files');
 
 const md5 = data => crypto.createHash('md5').update(data).digest('hex');

package/dist/js/modern/utils/commander.js

@@ -1,19 +1,19 @@
-import { program, Command } from 'commander';
+import { program, Command } from '@modern-js/utils';
+export function initCommandsMap() {
+  if (!program.hasOwnProperty('commandsMap')) {
+    Object.defineProperty(program, 'commandsMap', {
+      get() {
+        const map = new Map();
 
-if (!program.hasOwnProperty('commandsMap')) {
-  Object.defineProperty(program, 'commandsMap', {
-    get() {
-      const map = new Map();
+        for (const command of program.commands) {
+          map.set(command._name, command);
+        }
 
-      for (const command of program.commands) {
-        map.set(command._name, command);
-      }
+        return map;
+      },
 
-      return map;
-    },
-
-    configurable: false
-  });
+      configurable: false
+    });
+  }
 }
-
-export { program, Command };
+export { program };

package/dist/js/node/config/index.js

@@ -4,12 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
+  addServerConfigToDeps: true,
   defineConfig: true,
   loadUserConfig: true,
   resolveConfig: true,
   defaultsConfig: true,
   mergeConfig: true
 };
+exports.addServerConfigToDeps = void 0;
 Object.defineProperty(exports, "defaultsConfig", {
   enumerable: true,
   get: function () {
@@ -31,11 +33,9 @@ var _ajv = _interopRequireDefault(require("ajv"));
 
 var _ajvKeywords = _interopRequireDefault(require("ajv-keywords"));
 
-var _signale = _interopRequireDefault(require("signale"));
-
 var _utils = require("@modern-js/utils");
 
-var _lodash = _interopRequireDefault(require("lodash.mergewith"));
+var _lodash = require("@modern-js/utils/lodash");
 
 var _betterAjvErrors = _interopRequireDefault(require("better-ajv-errors"));
 
@@ -73,6 +73,16 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 const debug = (0, _utils.createDebugger)('resolve-config');
 
+const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
+  const serverConfig = await (0, _utils.getServerConfig)(appDirectory, serverConfigFile);
+
+  if (serverConfig) {
+    dependencies.push(serverConfig);
+  }
+};
+
+exports.addServerConfigToDeps = addServerConfigToDeps;
+
 const defineConfig = config => config;
 
 exports.defineConfig = defineConfig;
@@ -81,7 +91,7 @@ const loadUserConfig = async (appDirectory, filePath, packageJsonConfig) => {
   const loaded = await (0, _loadConfig.loadConfig)(appDirectory, filePath, packageJsonConfig);
   const config = !loaded ? {} : await (typeof loaded.config === 'function' ? loaded.config(0) : loaded.config);
   return {
-    config: (0, _lodash.default)({}, config || {}, (loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig) || {}),
+    config: (0, _lodash.mergeWith)({}, 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,
@@ -97,12 +107,10 @@ const showAdditionalPropertiesError = error => {
     const name = Object.keys(_utils.PLUGIN_SCHEMAS).find(key => _utils.PLUGIN_SCHEMAS[key].some(schemaItem => schemaItem.target === target));
 
     if (name) {
-      _signale.default.warn(`The configuration of ${_utils.chalk.bold(target)} is provided by plugin ${_utils.chalk.bold(name)}. Please use ${_utils.chalk.bold('yarn new')} to enable the corresponding capability.\n`);
+      _utils.signale.warn(`The configuration of ${_utils.chalk.bold(target)} is provided by plugin ${_utils.chalk.bold(name)}. Please use ${_utils.chalk.bold('yarn new')} to enable the corresponding capability.\n`);
     }
   }
 };
-/* eslint-disable  max-statements, max-params */
-
 
 const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv, onSchemaError = showAdditionalPropertiesError) => {
   var _validate$errors;
@@ -134,7 +142,7 @@ const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort,
       indent: 2
     });
 
-    _signale.default.log((0, _codeFrame.codeFrameColumns)(JSON.stringify(userConfig, null, 2), {
+    _utils.signale.log((0, _codeFrame.codeFrameColumns)(JSON.stringify(userConfig, null, 2), {
       start: errors === null || errors === void 0 ? void 0 : errors[0].start,
       end: errors === null || errors === void 0 ? void 0 : errors[0].end
     }, {
@@ -148,7 +156,7 @@ const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort,
 
   for (const config of configs) {
     if (!validate(config)) {
-      _signale.default.error(validate.errors);
+      _utils.signale.error(validate.errors);
 
       throw new Error(`Validate configuration error.`);
     }
@@ -170,7 +178,5 @@ const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort,
   debug('resolved %o', resolved);
   return resolved;
 };
-/* eslint-enable max-statements, max-params */
-
 
 exports.resolveConfig = resolveConfig;

package/dist/js/node/config/mergeConfig.js

@@ -5,19 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.mergeConfig = void 0;
 
-var _lodash = _interopRequireDefault(require("lodash.mergewith"));
+var _lodash = require("@modern-js/utils/lodash");
 
 var _utils = require("@modern-js/utils");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * merge configuration from  modern.config.js and plugins.
  *
  * @param configs - Configuration from modern.config.ts or plugin's config hook.
  * @returns - normalized user config.
  */
-const mergeConfig = configs => (0, _lodash.default)({}, ...configs, (target, source) => {
+const mergeConfig = configs => (0, _lodash.mergeWith)({}, ...configs, (target, source) => {
   if (Array.isArray(target)) {
     if (Array.isArray(source)) {
       return [...target, ...source];

package/dist/js/node/config/schema/index.js

@@ -7,7 +7,7 @@ exports.traverseSchema = exports.patchSchema = void 0;
 
 var _utils = require("@modern-js/utils");
 
-var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
+var _lodash = require("@modern-js/utils/lodash");
 
 var _source = require("./source");
 
@@ -19,8 +19,6 @@ var _deploy = require("./deploy");
 
 var _tools = require("./tools");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const debug = (0, _utils.createDebugger)('validate-schema');
 const plugins = {
   type: 'array',
@@ -40,7 +38,7 @@ const dev = {
 };
 
 const patchSchema = pluginSchemas => {
-  const finalSchema = (0, _lodash.default)({
+  const finalSchema = (0, _lodash.cloneDeep)({
     type: 'object',
     additionalProperties: false,
     properties: {
@@ -96,7 +94,7 @@ const patchSchema = pluginSchemas => {
       throw new Error(`${target} already exists in current validate schema`);
     }
 
-    targetNode[mountProperty] = (0, _lodash.default)(schema);
+    targetNode[mountProperty] = (0, _lodash.cloneDeep)(schema);
   }
 
   debug(`final validate schema: %o`, finalSchema);

package/dist/js/node/config/types/index.js

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

package/dist/js/node/context.js

@@ -53,7 +53,13 @@ const useResolvedConfigContext = () => ResolvedConfigContext.use().value;
 
 exports.useResolvedConfigContext = useResolvedConfigContext;
 
-const initAppContext = (appDirectory, plugins, configFile, options) => {
+const initAppContext = ({
+  appDirectory,
+  plugins,
+  configFile,
+  options,
+  serverConfigFile
+}) => {
   const {
     metaName = 'modern-js',
     srcDir = 'src',
@@ -64,6 +70,7 @@ const initAppContext = (appDirectory, plugins, configFile, options) => {
     metaName,
     appDirectory,
     configFile,
+    serverConfigFile,
     ip: _address.default.ip(),
     port: 0,
     packageName: require(_path.default.resolve(appDirectory, './package.json')).name,

package/dist/js/node/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
+  mergeOptions: true,
   cli: true,
   initAppDir: true,
   initAppContext: true,
@@ -57,6 +58,7 @@ Object.defineProperty(exports, "manager", {
     return _manager.manager;
   }
 });
+exports.mergeOptions = void 0;
 Object.defineProperty(exports, "mountHook", {
   enumerable: true,
   get: function () {
@@ -162,7 +164,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-_commander.program.name('modern').usage('<command> [options]').version(process.env.MODERN_JS_VERSION || '0.1.0');
+_utils.program.name('modern').usage('<command> [options]').version(process.env.MODERN_JS_VERSION || '0.1.0');
 
 const initAppDir = async cwd => {
   if (!cwd) {
@@ -183,6 +185,15 @@ const initAppDir = async cwd => {
 
 exports.initAppDir = initAppDir;
 
+const mergeOptions = options => {
+  const defaultOptions = {
+    serverConfigFile: _utils.DEFAULT_SERVER_CONFIG
+  };
+  return _objectSpread(_objectSpread({}, defaultOptions), options);
+};
+
+exports.mergeOptions = mergeOptions;
+
 const createCli = () => {
   let hooksRunner;
   let isRestart = false;
@@ -190,22 +201,32 @@ const createCli = () => {
   let restartOptions;
 
   const init = async (argv = [], options) => {
-    var _options$options$meta, _options$options;
+    var _mergedOptions$option, _mergedOptions$option2;
 
     (0, _node.enable)();
 
     _manager.manager.clear();
 
-    restartOptions = options;
+    const mergedOptions = mergeOptions(options);
+    restartOptions = mergedOptions;
     const appDirectory = await initAppDir();
-    const metaName = (_options$options$meta = options === null || options === void 0 ? void 0 : (_options$options = options.options) === null || _options$options === void 0 ? void 0 : _options$options.metaName) !== null && _options$options$meta !== void 0 ? _options$options$meta : 'MODERN';
+    (0, _commander.initCommandsMap)();
+    const metaName = (_mergedOptions$option = mergedOptions === null || mergedOptions === void 0 ? void 0 : (_mergedOptions$option2 = mergedOptions.options) === null || _mergedOptions$option2 === void 0 ? void 0 : _mergedOptions$option2.metaName) !== null && _mergedOptions$option !== void 0 ? _mergedOptions$option : 'MODERN';
     (0, _loadEnv.loadEnv)(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
-    const loaded = await (0, _config.loadUserConfig)(appDirectory, options === null || options === void 0 ? void 0 : options.configFile, options === null || options === void 0 ? void 0 : options.packageJsonConfig);
+    const loaded = await (0, _config.loadUserConfig)(appDirectory, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.configFile, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.packageJsonConfig);
     const plugins = (0, _loadPlugins.loadPlugins)(appDirectory, loaded.config, {
-      internalPlugins: options === null || options === void 0 ? void 0 : options.plugins
+      internalPlugins: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.plugins
     });
     plugins.forEach(plugin => plugin.cli && _manager.manager.usePlugin(plugin.cli));
-    const appContext = (0, _context.initAppContext)(appDirectory, plugins, loaded.filePath, options === null || options === void 0 ? void 0 : options.options);
+    const appContext = (0, _context.initAppContext)({
+      appDirectory,
+      plugins,
+      configFile: loaded.filePath,
+      options: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.options,
+      serverConfigFile: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.serverConfigFile
+    }); // 将 server.config 加入到 loaded.dependencies，以便对文件监听做热更新
+
+    (0, _config.addServerConfigToDeps)(loaded.dependencies, appDirectory, mergedOptions.serverConfigFile);
 
     _manager.manager.run(() => {
       _context.ConfigContext.set(loaded.config);
@@ -263,11 +284,11 @@ const createCli = () => {
       resolved
     } = await init(argv, options);
     await hooksRunner.commands({
-      program: _commander.program
+      program: _utils.program
     });
     (0, _initWatcher.initWatcher)(loadedConfig, appContext.appDirectory, resolved.source.configDir, hooksRunner, argv);
 
-    _manager.manager.run(() => _commander.program.parse(process.argv));
+    _manager.manager.run(() => _utils.program.parse(process.argv));
   }
 
   async function restart() {
@@ -291,7 +312,7 @@ const createCli = () => {
       hasGetError = true;
     } finally {
       if (!hasGetError) {
-        _manager.manager.run(() => _commander.program.parse(process.argv));
+        _manager.manager.run(() => _utils.program.parse(process.argv));
       }
     }
   }

package/dist/js/node/initWatcher.js

@@ -13,8 +13,6 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _chokidar = _interopRequireDefault(require("chokidar"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const debug = (0, _utils.createDebugger)('watch-files');
@@ -33,7 +31,7 @@ const initWatcher = async (loaded, appDirectory, configDir, hooksRunner, argv) =
     const watched = [`${configPath}/html`, ...extraFiles, loaded === null || loaded === void 0 ? void 0 : loaded.filePath, ...loaded.dependencies].filter(Boolean);
     debug(`watched: %o`, watched);
 
-    const watcher = _chokidar.default.watch(watched, {
+    const watcher = _utils.chokidar.watch(watched, {
       cwd: appDirectory,
       ignoreInitial: true,
       ignorePermissionErrors: true,

package/dist/js/node/utils/commander.js

@@ -3,33 +3,30 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "Command", {
-  enumerable: true,
-  get: function () {
-    return _commander.Command;
-  }
-});
+exports.initCommandsMap = initCommandsMap;
 Object.defineProperty(exports, "program", {
   enumerable: true,
   get: function () {
-    return _commander.program;
+    return _utils.program;
   }
 });
 
-var _commander = require("commander");
+var _utils = require("@modern-js/utils");
 
-if (!_commander.program.hasOwnProperty('commandsMap')) {
-  Object.defineProperty(_commander.program, 'commandsMap', {
-    get() {
-      const map = new Map();
+function initCommandsMap() {
+  if (!_utils.program.hasOwnProperty('commandsMap')) {
+    Object.defineProperty(_utils.program, 'commandsMap', {
+      get() {
+        const map = new Map();
 
-      for (const command of _commander.program.commands) {
-        map.set(command._name, command);
-      }
+        for (const command of _utils.program.commands) {
+          map.set(command._name, command);
+        }
 
-      return map;
-    },
+        return map;
+      },
 
-    configurable: false
-  });
+      configurable: false
+    });
+  }
 }

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

@@ -6,6 +6,7 @@ import type { UserConfig, ConfigParam, LoadedConfig } from './types';
 export { defaults as defaultsConfig };
 export { mergeConfig };
 export * from './types';
+export declare const addServerConfigToDeps: (dependencies: string[], appDirectory: string, serverConfigFile: string) => Promise<void>;
 export declare const defineConfig: (config: ConfigParam) => 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<NormalizedConfig>;

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

@@ -3,13 +3,18 @@ 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 { Configuration as WebpackConfiguration } from 'webpack';
+import autoprefixer from 'autoprefixer';
+import type { BasePluginOptions, TerserOptions as RawTerserOptions } from 'terser-webpack-plugin';
 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';
-export type { TestConfig, JestConfig, UnbundleConfig, SassConfig, SassLoaderOptions, LessConfig, LessLoaderOptions, SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions, TransformOptions };
+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 };
 export interface SourceConfig {
   entries?: Record<string, string | {
     entry: string;
@@ -135,7 +140,7 @@ export interface DeployConfig {
   domain?: string | Array<string>;
   domainByEntries?: Record<string, string | Array<string>>;
 }
-declare type ConfigFunction = Record<string, unknown> | ((config: Record<string, unknown>) => Record<string, unknown> | void);
+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 = {
   proxy?: BffProxyOptions;
@@ -144,17 +149,20 @@ export declare type DevServerConfig = {
   after?: RequestHandler[];
   [propsName: string]: any;
 };
-export declare type BabelConfig = TransformOptions | ((config: TransformOptions) => TransformOptions | void);
+export declare type WebpackConfig = WebpackConfiguration | ((config: WebpackConfiguration, utils?: any) => WebpackConfiguration | void);
+export declare type BabelConfig = TransformOptions | ((config: TransformOptions, utils?: any) => TransformOptions | void);
+export declare type AutoprefixerConfig = AutoprefixerOptions | ((config: AutoprefixerOptions) => AutoprefixerOptions | void);
+export declare type TerserConfig = TerserOptions | ((config: TerserOptions) => TerserOptions | void);
 export interface ToolsConfig {
-  webpack?: ConfigFunction;
+  webpack?: WebpackConfig;
   babel?: BabelConfig;
-  autoprefixer?: ConfigFunction;
+  autoprefixer?: AutoprefixerConfig;
   postcss?: ConfigFunction;
   styledComponents?: ConfigFunction;
   lodash?: ConfigFunction;
   devServer?: DevServerConfig;
   tsLoader?: ConfigFunction;
-  terser?: ConfigFunction;
+  terser?: TerserConfig;
   minifyCss?: ConfigFunction;
   esbuild?: Record<string, unknown>;
   /**
@@ -190,12 +198,12 @@ export declare type RuntimeConfig = Record<string, any>;
 export interface RuntimeByEntriesConfig {
   [name: string]: RuntimeConfig;
 }
-export declare type BffConfig = {
-  prefix?: string;
-  requestCreator?: string;
-  fetcher?: string;
-  proxy?: Record<string, any>;
-};
+export declare type BffConfig = Partial<{
+  prefix: string;
+  requestCreator: string;
+  fetcher: string;
+  proxy: Record<string, any>;
+}>;
 export interface UserConfig {
   source?: SourceConfig;
   output?: OutputConfig;

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

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

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

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

package/dist/types/context.d.ts

@@ -27,9 +27,21 @@ export declare const useConfigContext: () => UserConfig;
  */
 
 export declare const useResolvedConfigContext: () => NormalizedConfig;
-export declare const initAppContext: (appDirectory: string, plugins: LoadedPlugin[], configFile: string | false, options?: {
-  metaName?: string | undefined;
-  srcDir?: string | undefined;
-  distDir?: string | undefined;
-  sharedDir?: string | undefined;
-} | undefined) => IAppContext;
+export declare const initAppContext: ({
+  appDirectory,
+  plugins,
+  configFile,
+  options,
+  serverConfigFile
+}: {
+  appDirectory: string;
+  plugins: LoadedPlugin[];
+  configFile: string | false;
+  options?: {
+    metaName?: string | undefined;
+    srcDir?: string | undefined;
+    distDir?: string | undefined;
+    sharedDir?: string | undefined;
+  } | undefined;
+  serverConfigFile: string;
+}) => IAppContext;

package/dist/types/index.d.ts

@@ -15,6 +15,7 @@ export type { NormalizedConfig, IAppContext };
 declare const initAppDir: (cwd?: string | undefined) => Promise<string>;
 export interface CoreOptions {
   configFile?: string;
+  serverConfigFile?: string;
   packageJsonConfig?: string;
   plugins?: typeof INTERNAL_PLUGINS;
   onSchemaError?: (error: ErrorObject) => void;
@@ -25,6 +26,24 @@ export interface CoreOptions {
     sharedDir?: string;
   };
 }
+export declare const mergeOptions: (options?: CoreOptions | undefined) => {
+  configFile?: string | undefined;
+  serverConfigFile: string;
+  packageJsonConfig?: string | undefined;
+  plugins?: {
+    [name: string]: {
+      cli?: string | undefined;
+      server?: string | undefined;
+    };
+  } | undefined;
+  onSchemaError?: ((error: ErrorObject) => void) | undefined;
+  options?: {
+    metaName?: string | undefined;
+    srcDir?: string | undefined;
+    distDir?: string | undefined;
+    sharedDir?: string | undefined;
+  } | undefined;
+};
 export declare const cli: {
   init: (argv?: string[], options?: CoreOptions | undefined) => Promise<{
     loadedConfig: import("./config").LoadedConfig;

package/dist/types/initWatcher.d.ts

@@ -1,4 +1,3 @@
-import chokidar from 'chokidar';
 import { LoadedConfig } from './config';
 import { HooksRunner } from './manager';
-export declare const initWatcher: (loaded: LoadedConfig, appDirectory: string, configDir: string | undefined, hooksRunner: HooksRunner, argv: string[]) => Promise<chokidar.FSWatcher | undefined>;
+export declare const initWatcher: (loaded: LoadedConfig, appDirectory: string, configDir: string | undefined, hooksRunner: HooksRunner, argv: string[]) => Promise<import("@modern-js/utils").FSWatcher | undefined>;

package/dist/types/manager.d.ts

@@ -1,6 +1,6 @@
 import { ToThreads, ToRunners, AsyncSetup, PluginOptions, AsyncWorkflow, AsyncWaterfall, ParallelWorkflow } from '@modern-js/plugin';
+import { Command } from '@modern-js/utils';
 import type { Hooks } from '@modern-js/types';
-import type { Command } from './utils/commander';
 import type { NormalizedConfig } from './config/mergeConfig';
 import { pluginAPI } from './pluginAPI';
 export declare type HooksRunner = ToRunners<{

package/dist/types/utils/commander.d.ts

@@ -1,7 +1,8 @@
-import { program, Command } from 'commander';
-declare module 'commander' {
+import { program } from '@modern-js/utils';
+declare module '@modern-js/utils/compiled/commander' {
   interface Command {
     commandsMap: Map<string, Command>;
   }
 }
-export { program, Command };
+export declare function initCommandsMap(): void;
+export { program };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.6.1",
+  "version": "1.7.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -42,42 +42,37 @@
   "dependencies": {
     "@babel/code-frame": "^7.14.5",
     "@babel/runtime": "^7",
-    "@modern-js/load-config": "^1.2.2",
+    "@modern-js/load-config": "^1.3.0",
     "@modern-js/plugin": "^1.3.2",
-    "@modern-js/utils": "^1.3.7",
+    "@modern-js/utils": "^1.4.0",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",
     "better-ajv-errors": "^0.7.0",
-    "chokidar": "^3.5.2",
-    "commander": "^8.1.0",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.mergewith": "^4.6.2",
-    "signale": "^1.4.0",
     "v8-compile-cache": "^2.3.0"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
-    "@modern-js/types": "^1.3.6",
+    "@modern-js/types": "^1.4.0",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/babel__code-frame": "^7.0.3",
     "@types/babel__core": "^7.1.16",
     "@types/jest": "^26",
     "@types/less": "^3.0.3",
-    "@types/lodash.clonedeep": "^4.5.6",
-    "@types/lodash.mergewith": "^4.6.6",
     "@types/node": "^14",
     "@types/react": "^17",
     "@types/react-dom": "^17",
-    "@types/signale": "^1.4.2",
+    "autoprefixer": "^10.3.1",
     "btsm": "2.2.2",
     "jest": "^27",
     "sass": "^1.45.0",
+    "terser-webpack-plugin": "^5.1.4",
     "typescript": "^4",
-    "webpack": "^5.71.0"
+    "webpack": "^5.71.0",
+    "webpack-chain": "^6.5.1"
   },
   "sideEffects": false,
   "modernConfig": {

package/tests/config.test.ts

@@ -1,7 +1,7 @@
 import path from 'path';
 // import os from 'os';
-import { isDev, getPort } from '@modern-js/utils';
-import { resolveConfig } from '../src/config';
+import { isDev, getPort, DEFAULT_SERVER_CONFIG } from '@modern-js/utils';
+import { resolveConfig, addServerConfigToDeps } from '../src/config';
 import {
   cli,
   loadUserConfig,
@@ -133,5 +133,14 @@ describe('config', () => {
   });
 });
 
-// type TEST = Parameters<typeof resolveConfig>;
-// type TypeC = TEST[1];
+describe('addServerConfigToDeps', () => {
+  it('should add server config to deps', async () => {
+    const appDirectory = path.join(__dirname, './fixtures/index-test');
+    const deps: string[] = [];
+    await addServerConfigToDeps(deps, appDirectory, DEFAULT_SERVER_CONFIG);
+    expect(deps.length).toBe(1);
+    expect(deps[0]).toBe(
+      path.join(appDirectory, `${DEFAULT_SERVER_CONFIG}.js`),
+    );
+  });
+});

package/tests/context.test.ts

@@ -1,4 +1,5 @@
 import path from 'path';
+import { DEFAULT_SERVER_CONFIG } from '@modern-js/utils';
 import { initAppContext } from '../src/context';
 
 describe('context', () => {
@@ -7,10 +8,17 @@ describe('context', () => {
       __dirname,
       './fixtures/load-plugin/user-plugins',
     );
-    const appContext = initAppContext(appDirectory, [], false);
+    const appContext = initAppContext({
+      appDirectory,
+      plugins: [],
+      configFile: false,
+      serverConfigFile: DEFAULT_SERVER_CONFIG,
+    });
+
     expect(appContext).toEqual({
       appDirectory,
       configFile: false,
+      serverConfigFile: DEFAULT_SERVER_CONFIG,
       ip: expect.any(String),
       port: 0,
       packageName: expect.any(String),
@@ -44,10 +52,17 @@ describe('context', () => {
       metaName: 'jupiter',
     };
 
-    const appContext = initAppContext(appDirectory, [], false, customOptions);
+    const appContext = initAppContext({
+      appDirectory,
+      plugins: [],
+      configFile: false,
+      options: customOptions,
+      serverConfigFile: DEFAULT_SERVER_CONFIG,
+    });
     expect(appContext).toEqual({
       appDirectory,
       configFile: false,
+      serverConfigFile: DEFAULT_SERVER_CONFIG,
       ip: expect.any(String),
       port: 0,
       packageName: 'user-plugins',

package/tests/index.test.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { cli } from '../src';
+import { cli, mergeOptions } from '../src';
 import { resolveConfig, loadUserConfig } from '../src/config';
 import { loadEnv } from '../src/loadEnv';
 
@@ -67,3 +67,17 @@ describe('@modern-js/core test', () => {
     // TODO: add more test cases
   });
 });
+
+describe('test mergeOptions', () => {
+  it('serverConfigFile must exist', () => {
+    const options = mergeOptions({});
+    expect(options).toHaveProperty('serverConfigFile');
+  });
+
+  it('serverConfigFile can be overwritten', () => {
+    const options = mergeOptions({
+      serverConfigFile: 'test',
+    });
+    expect(options.serverConfigFile).toBe('test');
+  });
+});

package/tests/initWatcher.test.ts

@@ -8,7 +8,7 @@ const mockAppDirectory = path.join(__dirname, './fixtures/index-test');
 const mockConfigDir = './config';
 const mockSrcDirectory = path.join(mockAppDirectory, './src');
 
-describe.skip('initWatcher', () => {
+describe('initWatcher', () => {
   afterAll(() => {
     const file = path.join(mockSrcDirectory, './index.ts');
     if (fs.existsSync(file)) {
@@ -16,7 +16,7 @@ describe.skip('initWatcher', () => {
     }
   });
 
-  test('will trigger add event', async () => {
+  xtest('will trigger add event', async () => {
     let triggeredType = '';
     let triggeredFile = '';
     const loaded = {

package/tests/utils.test.ts

@@ -1,8 +1,7 @@
-import { program, Command } from '../src/utils/commander';
+import { program } from '../src/utils/commander';
 
 describe('utils', () => {
   it('default', () => {
     expect(program).toBeDefined();
-    expect(Command).toBeDefined();
   });
 });