@modern-js/core 1.6.0 → 1.7.1-beta.peer.1

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @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
+
+- ef28a4e6: fix: module-tools build error
+- 132f7b53: feat: move config declarations to @modern-js/core
+- 9d4a005b: fix: config babel via tools.babel
+- Updated dependencies [132f7b53]
+  - @modern-js/utils@1.3.7
+
 ## 1.6.0
 
 ### Minor 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";
@@ -19,6 +18,14 @@ import { patchSchema } from "./schema";
 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);
@@ -42,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;
@@ -107,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/electron.js

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

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,
@@ -49,7 +56,7 @@ export const initAppContext = (appDirectory, plugins, configFile, options) => {
     serverRoutes: [],
     entrypoints: [],
     checkedEntries: [],
-    existSrc: true,
+    apiOnly: false,
     internalDirAlias: `@_${metaName.replace(/-/g, '_')}_internal`,
     internalSrcAlias: `@_${metaName.replace(/-/g, '_')}_src`
   };

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,31 @@ 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,
+      transformPlugin: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.transformPlugin
     });
     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');
@@ -17,6 +16,7 @@ export const initWatcher = async (loaded, appDirectory, configDir, hooksRunner,
     debug(`watched: %o`, watched);
     const watcher = chokidar.watch(watched, {
       cwd: appDirectory,
+      ignoreInitial: true,
       ignorePermissionErrors: true,
       ignored: [/node_modules/, '**/__test__/**', '**/*.test.(js|jsx|ts|tsx)', '**/*.spec.(js|jsx|ts|tsx)', '**/*.stories.(js|jsx|ts|tsx)']
     });

package/dist/js/modern/loadPlugins.js

@@ -42,13 +42,17 @@ export function getAppPlugins(appDirectory, oldPluginConfig, internalPlugins) {
   return appPlugins;
 }
 
-const resolveCliPlugin = (p, appDirectory) => {
+const resolveCliPlugin = (p, userConfig, appDirectory, transformPlugin) => {
   const pkg = typeof p === 'string' ? p : p[0];
+  const pluginOptions = typeof p === 'string' ? undefined : p[1];
   const path = tryResolve(pkg, appDirectory);
-  const module = compatRequire(path);
+  let module = compatRequire(path);
+
+  if (transformPlugin) {
+    module = transformPlugin(module, userConfig, pluginOptions);
+  }
 
   if (typeof module === 'function') {
-    const pluginOptions = Array.isArray(p) ? p[1] : undefined;
     const result = module(pluginOptions);
     return createPlugin(result.setup, result);
   }
@@ -68,6 +72,7 @@ const isOldPluginConfig = config => Array.isArray(config) && config.some(item =>
  * @param appDirectory - Application root directory.
  * @param userConfig - Resolved user config.
  * @param options.internalPlugins - Internal plugins.
+ * @param options.transformPlugin - transform plugin before using it. Used for compatible with legacy jupiter plugins.
  * @returns Plugin Objects has been required.
  */
 
@@ -87,7 +92,7 @@ export const loadPlugins = (appDirectory, userConfig, options = {}) => {
     const loadedPlugin = {};
 
     if (cli) {
-      loadedPlugin.cli = resolveCliPlugin(cli, appDirectory);
+      loadedPlugin.cli = resolveCliPlugin(cli, userConfig, appDirectory, options.transformPlugin);
     } // server plugins don't support to accept params
 
 

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

@@ -1,19 +1,19 @@
-import { program, Command } from 'commander';
+import { program } 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

@@ -3,6 +3,15 @@
 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 () {
@@ -24,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"));
 
@@ -42,6 +49,20 @@ var _mergeConfig = require("./mergeConfig");
 
 var _schema = require("./schema");
 
+var _types = require("./types");
+
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _types[key];
+    }
+  });
+});
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -52,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;
@@ -60,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,
@@ -76,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;
@@ -113,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
     }, {
@@ -127,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.`);
     }
@@ -149,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/electron.js

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

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,
@@ -77,7 +84,7 @@ const initAppContext = (appDirectory, plugins, configFile, options) => {
     serverRoutes: [],
     entrypoints: [],
     checkedEntries: [],
-    existSrc: true,
+    apiOnly: false,
     internalDirAlias: `@_${metaName.replace(/-/g, '_')}_internal`,
     internalSrcAlias: `@_${metaName.replace(/-/g, '_')}_src`
   };

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,33 @@ 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,
+      transformPlugin: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.transformPlugin
     });
     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 +285,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 +313,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,8 +31,9 @@ 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,
       ignored: [/node_modules/, '**/__test__/**', '**/*.test.(js|jsx|ts|tsx)', '**/*.spec.(js|jsx|ts|tsx)', '**/*.stories.(js|jsx|ts|tsx)']
     });