@modern-js/core 1.3.0 → 1.3.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @modern-js/core
 
+## 1.3.1
+
+### Patch Changes
+
+- 4584cc04: export DeployConfig interface
+- 7c19fd94: use existing port number for AppContext when dev server is restarted
+- Updated dependencies [823809c6]
+  - @modern-js/utils@1.2.1
+
 ## 1.3.0
 
 ### Minor Changes

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

@@ -45,7 +45,7 @@ const showAdditionalPropertiesError = error => {
 /* eslint-disable max-statements, max-params */
 
 
-export const resolveConfig = async (loaded, configs, schemas, isRestart, argv) => {
+export const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv) => {
   var _validate$errors;
 
   const {
@@ -95,8 +95,14 @@ export const resolveConfig = async (loaded, configs, schemas, isRestart, argv) =
   const resolved = mergeConfig([defaults, ...configs, userConfig]);
   resolved._raw = loaded.config;
 
-  if (isDev() && argv[0] === 'dev' && !isRestart) {
-    resolved.server.port = await getPort(resolved.server.port);
+  if (isDev() && argv[0] === 'dev') {
+    if (restartWithExistingPort > 0) {
+      // dev server is restarted, should use existing port number
+      resolved.server.port = restartWithExistingPort;
+    } else {
+      // get port for new dev server
+      resolved.server.port = await getPort(resolved.server.port);
+    }
   }
 
   debug('resolved %o', resolved);

package/dist/js/modern/index.js

@@ -9,12 +9,12 @@ import { compatRequire, pkgUp, ensureAbsolutePath, logger } from '@modern-js/uti
 import { createAsyncManager, createAsyncWorkflow, createParallelWorkflow, createAsyncWaterfall } from '@modern-js/plugin';
 import { enable } from '@modern-js/plugin/node';
 import { program } from "./utils/commander";
-import { resolveConfig, defineConfig, loadUserConfig } from "./config";
+import { resolveConfig, loadUserConfig } from "./config";
 import { loadPlugins } from "./loadPlugins";
 import { AppContext, ConfigContext, initAppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext } from "./context";
 import { initWatcher } from "./initWatcher";
 import { loadEnv } from "./loadEnv";
-export { defaultsConfig, mergeConfig } from "./config";
+export * from "./config";
 export * from '@modern-js/plugin';
 export * from '@modern-js/plugin/node';
 program.name('modern').usage('<command> [options]').version(process.env.MODERN_JS_VERSION || '0.1.0');
@@ -37,7 +37,7 @@ export const {
   useRunner: mountHook
 } = manager;
 export const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin(compatRequire(require.resolve(plugin))));
-export { defineConfig, AppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, ConfigContext };
+export { AppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, ConfigContext };
 
 const initAppDir = async cwd => {
   if (!cwd) {
@@ -59,6 +59,7 @@ const initAppDir = async cwd => {
 const createCli = () => {
   let hooksRunner;
   let isRestart = false;
+  let restartWithExistingPort = 0;
 
   const init = async (argv = [], options) => {
     enable();
@@ -95,7 +96,7 @@ const createCli = () => {
     });
     const extraConfigs = await hooksRunner.config();
     const extraSchemas = await hooksRunner.validateSchema();
-    const config = await resolveConfig(loaded, extraConfigs, extraSchemas, isRestart, argv);
+    const config = await resolveConfig(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv);
     const {
       resolved
     } = await hooksRunner.resolvedConfig({
@@ -132,7 +133,10 @@ const createCli = () => {
   }
 
   async function restart() {
+    var _AppContext$use$value, _AppContext$use$value2;
+
     isRestart = true;
+    restartWithExistingPort = isRestart ? (_AppContext$use$value = (_AppContext$use$value2 = AppContext.use().value) === null || _AppContext$use$value2 === void 0 ? void 0 : _AppContext$use$value2.port) !== null && _AppContext$use$value !== void 0 ? _AppContext$use$value : 0 : 0;
     logger.info('Restart...\n');
     let hasGetError = false;
 
@@ -156,4 +160,4 @@ const createCli = () => {
 };
 
 export const cli = createCli();
-export { loadUserConfig, initAppDir, initAppContext };
+export { initAppDir, initAppContext };

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

@@ -83,7 +83,7 @@ const showAdditionalPropertiesError = error => {
 /* eslint-disable max-statements, max-params */
 
 
-const resolveConfig = async (loaded, configs, schemas, isRestart, argv) => {
+const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv) => {
   var _validate$errors;
 
   const {
@@ -136,8 +136,14 @@ const resolveConfig = async (loaded, configs, schemas, isRestart, argv) => {
   const resolved = (0, _mergeConfig.mergeConfig)([_defaults.defaults, ...configs, userConfig]);
   resolved._raw = loaded.config;
 
-  if ((0, _utils.isDev)() && argv[0] === 'dev' && !isRestart) {
-    resolved.server.port = await (0, _utils.getPort)(resolved.server.port);
+  if ((0, _utils.isDev)() && argv[0] === 'dev') {
+    if (restartWithExistingPort > 0) {
+      // dev server is restarted, should use existing port number
+      resolved.server.port = restartWithExistingPort;
+    } else {
+      // get port for new dev server
+      resolved.server.port = await (0, _utils.getPort)(resolved.server.port);
+    }
   }
 
   debug('resolved %o', resolved);

package/dist/js/node/index.js

@@ -11,10 +11,6 @@ var _exportNames = {
   usePlugins: true,
   cli: true,
   initAppDir: true,
-  defineConfig: true,
-  loadUserConfig: true,
-  defaultsConfig: true,
-  mergeConfig: true,
   AppContext: true,
   ConfigContext: true,
   initAppContext: true,
@@ -42,39 +38,13 @@ Object.defineProperty(exports, "ResolvedConfigContext", {
   }
 });
 exports.createPlugin = exports.cli = void 0;
-Object.defineProperty(exports, "defaultsConfig", {
-  enumerable: true,
-  get: function () {
-    return _config.defaultsConfig;
-  }
-});
-Object.defineProperty(exports, "defineConfig", {
-  enumerable: true,
-  get: function () {
-    return _config.defineConfig;
-  }
-});
 Object.defineProperty(exports, "initAppContext", {
   enumerable: true,
   get: function () {
     return _context.initAppContext;
   }
 });
-exports.initAppDir = void 0;
-Object.defineProperty(exports, "loadUserConfig", {
-  enumerable: true,
-  get: function () {
-    return _config.loadUserConfig;
-  }
-});
-exports.manager = void 0;
-Object.defineProperty(exports, "mergeConfig", {
-  enumerable: true,
-  get: function () {
-    return _config.mergeConfig;
-  }
-});
-exports.registerHook = exports.mountHook = void 0;
+exports.registerHook = exports.mountHook = exports.manager = exports.initAppDir = void 0;
 Object.defineProperty(exports, "useAppContext", {
   enumerable: true,
   get: function () {
@@ -131,6 +101,18 @@ var _commander = require("./utils/commander");
 
 var _config = require("./config");
 
+Object.keys(_config).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _config[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _config[key];
+    }
+  });
+});
+
 var _loadPlugins = require("./loadPlugins");
 
 var _context = require("./context");
@@ -198,6 +180,7 @@ exports.initAppDir = initAppDir;
 const createCli = () => {
   let hooksRunner;
   let isRestart = false;
+  let restartWithExistingPort = 0;
 
   const init = async (argv = [], options) => {
     (0, _node.enable)();
@@ -235,7 +218,7 @@ const createCli = () => {
     });
     const extraConfigs = await hooksRunner.config();
     const extraSchemas = await hooksRunner.validateSchema();
-    const config = await (0, _config.resolveConfig)(loaded, extraConfigs, extraSchemas, isRestart, argv);
+    const config = await (0, _config.resolveConfig)(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv);
     const {
       resolved
     } = await hooksRunner.resolvedConfig({
@@ -274,7 +257,10 @@ const createCli = () => {
   }
 
   async function restart() {
+    var _AppContext$use$value, _AppContext$use$value2;
+
     isRestart = true;
+    restartWithExistingPort = isRestart ? (_AppContext$use$value = (_AppContext$use$value2 = _context.AppContext.use().value) === null || _AppContext$use$value2 === void 0 ? void 0 : _AppContext$use$value2.port) !== null && _AppContext$use$value !== void 0 ? _AppContext$use$value : 0 : 0;
 
     _utils.logger.info('Restart...\n');
 

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

@@ -5,7 +5,7 @@ import { mergeConfig, NormalizedConfig } from './mergeConfig';
 import { PluginValidateSchema } from './schema';
 export { defaults as defaultsConfig };
 export { mergeConfig };
-export interface SourceConfig {
+interface SourceConfig {
   entries?: Record<string, string | {
     entry: string;
     enableFileSystemRoutes?: boolean;
@@ -21,7 +21,7 @@ export interface SourceConfig {
   moduleScopes?: Array<string | RegExp> | ((scopes: Array<string | RegExp>) => Array<string | RegExp>);
   include?: Array<string | RegExp>;
 }
-export interface OutputConfig {
+interface OutputConfig {
   assetPrefix?: string;
   htmlPath?: string;
   jsPath?: string;
@@ -60,7 +60,7 @@ export interface OutputConfig {
   disableNodePolyfill?: boolean;
   enableTsLoader?: boolean;
 }
-export interface ServerConfig {
+interface ServerConfig {
   routes?: Record<string, string | {
     route: string | string[];
     disableSpa?: boolean;
@@ -76,17 +76,17 @@ export interface ServerConfig {
   metrics?: Record<string, any>;
   enableMicroFrontendDebug?: boolean;
 }
-export interface DevConfig {
+interface DevConfig {
   assetPrefix?: string | boolean;
   https?: boolean;
 }
-export interface DeployConfig {
+interface DeployConfig {
   microFrontend?: boolean & Record<string, unknown>;
   domain?: string | Array<string>;
   domainByEntries?: Record<string, string | Array<string>>;
 }
 declare type ConfigFunction = Record<string, unknown> | ((config: Record<string, unknown>) => Record<string, unknown> | void);
-export interface ToolsConfig {
+interface ToolsConfig {
   webpack?: ConfigFunction;
   babel?: ConfigFunction;
   autoprefixer?: ConfigFunction;
@@ -98,11 +98,11 @@ export interface ToolsConfig {
   minifyCss?: ConfigFunction;
   esbuild?: Record<string, unknown>;
 }
-export declare type RuntimeConfig = Record<string, any>;
-export interface RuntimeByEntriesConfig {
+declare type RuntimeConfig = Record<string, any>;
+interface RuntimeByEntriesConfig {
   [name: string]: RuntimeConfig;
 }
-export interface UserConfig {
+interface UserConfig {
   source?: SourceConfig;
   output?: OutputConfig;
   server?: ServerConfig;
@@ -113,8 +113,8 @@ export interface UserConfig {
   runtime?: RuntimeConfig;
   runtimeByEntries?: RuntimeByEntriesConfig;
 }
-export declare type ConfigParam = UserConfig | Promise<UserConfig> | ((env: any) => UserConfig | Promise<UserConfig>);
-export interface LoadedConfig {
+declare type ConfigParam = UserConfig | Promise<UserConfig> | ((env: any) => UserConfig | Promise<UserConfig>);
+interface LoadedConfig {
   config: UserConfig;
   filePath: string | false;
   dependencies: string[];
@@ -123,4 +123,5 @@ export interface LoadedConfig {
 }
 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[], isRestart: boolean, argv: string[]) => Promise<NormalizedConfig>;
+export declare const resolveConfig: (loaded: LoadedConfig, configs: UserConfig[], schemas: PluginValidateSchema[], restartWithExistingPort: number, argv: string[]) => Promise<NormalizedConfig>;
+export type { SourceConfig, OutputConfig, ServerConfig, DevConfig, DeployConfig, ToolsConfig, RuntimeConfig, RuntimeByEntriesConfig, UserConfig, ConfigParam, LoadedConfig };

package/dist/types/index.d.ts

@@ -2,11 +2,10 @@ import { INTERNAL_PLUGINS } from '@modern-js/utils';
 import { ParallelWorkflow, AsyncWorkflow, Progresses2Runners, AsyncWaterfall } from '@modern-js/plugin';
 import type { Hooks } from '@modern-js/types';
 import { Command } from './utils/commander';
-import { defineConfig, loadUserConfig, UserConfig, ToolsConfig } from './config';
 import { AppContext, ConfigContext, IAppContext, initAppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext } from './context';
 import { NormalizedConfig } from './config/mergeConfig';
 export type { Hooks };
-export { defaultsConfig, mergeConfig } from './config';
+export * from './config';
 export * from '@modern-js/plugin';
 export * from '@modern-js/plugin/node';
 export declare type HooksRunner = Progresses2Runners<{
@@ -88,8 +87,8 @@ export declare const createPlugin: (initializer: import("@modern-js/plugin").Asy
   beforeExit: AsyncWorkflow<void, void>;
 } & import("@modern-js/plugin").ClearDraftProgress<Hooks>>;
 export declare const usePlugins: (plugins: string[]) => void;
-export { defineConfig, AppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, ConfigContext };
-export type { NormalizedConfig, IAppContext, UserConfig, ToolsConfig };
+export { AppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, ConfigContext };
+export type { NormalizedConfig, IAppContext };
 declare const initAppDir: (cwd?: string | undefined) => Promise<string>;
 export interface CoreOptions {
   configFile?: string;
@@ -111,4 +110,4 @@ export declare const cli: {
   run: (argv: string[], options?: CoreOptions | undefined) => Promise<void>;
   restart: () => Promise<void>;
 };
-export { loadUserConfig, initAppDir, initAppContext };
+export { initAppDir, initAppContext };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.0",
+  "version": "1.3.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -44,7 +44,7 @@
     "@babel/runtime": "^7",
     "@modern-js/load-config": "^1.2.0",
     "@modern-js/plugin": "^1.2.0",
-    "@modern-js/utils": "^1.2.0",
+    "@modern-js/utils": "^1.2.1",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",

package/src/config/index.ts

@@ -24,7 +24,7 @@ const debug = createDebugger('resolve-config');
 export { defaults as defaultsConfig };
 export { mergeConfig };
 
-export interface SourceConfig {
+interface SourceConfig {
   entries?: Record<
     string,
     | string
@@ -49,7 +49,7 @@ export interface SourceConfig {
   include?: Array<string | RegExp>;
 }
 
-export interface OutputConfig {
+interface OutputConfig {
   assetPrefix?: string;
   htmlPath?: string;
   jsPath?: string;
@@ -92,7 +92,7 @@ export interface OutputConfig {
   enableTsLoader?: boolean;
 }
 
-export interface ServerConfig {
+interface ServerConfig {
   routes?: Record<
     string,
     | string
@@ -111,12 +111,12 @@ export interface ServerConfig {
   enableMicroFrontendDebug?: boolean;
 }
 
-export interface DevConfig {
+interface DevConfig {
   assetPrefix?: string | boolean;
   https?: boolean;
 }
 
-export interface DeployConfig {
+interface DeployConfig {
   microFrontend?: boolean & Record<string, unknown>;
   domain?: string | Array<string>;
   domainByEntries?: Record<string, string | Array<string>>;
@@ -126,7 +126,7 @@ type ConfigFunction =
   | Record<string, unknown>
   // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
   | ((config: Record<string, unknown>) => Record<string, unknown> | void);
-export interface ToolsConfig {
+interface ToolsConfig {
   webpack?: ConfigFunction;
   babel?: ConfigFunction;
   autoprefixer?: ConfigFunction;
@@ -139,13 +139,13 @@ export interface ToolsConfig {
   esbuild?: Record<string, unknown>;
 }
 
-export type RuntimeConfig = Record<string, any>;
+type RuntimeConfig = Record<string, any>;
 
-export interface RuntimeByEntriesConfig {
+interface RuntimeByEntriesConfig {
   [name: string]: RuntimeConfig;
 }
 
-export interface UserConfig {
+interface UserConfig {
   source?: SourceConfig;
   output?: OutputConfig;
   server?: ServerConfig;
@@ -157,12 +157,12 @@ export interface UserConfig {
   runtimeByEntries?: RuntimeByEntriesConfig;
 }
 
-export type ConfigParam =
+type ConfigParam =
   | UserConfig
   | Promise<UserConfig>
   | ((env: any) => UserConfig | Promise<UserConfig>);
 
-export interface LoadedConfig {
+interface LoadedConfig {
   config: UserConfig;
   filePath: string | false;
   dependencies: string[];
@@ -231,7 +231,7 @@ export const resolveConfig = async (
   loaded: LoadedConfig,
   configs: UserConfig[],
   schemas: PluginValidateSchema[],
-  isRestart: boolean,
+  restartWithExistingPort: number,
   argv: string[],
 ): Promise<NormalizedConfig> => {
   const { config: userConfig, jsConfig, pkgConfig } = loaded;
@@ -291,8 +291,14 @@ export const resolveConfig = async (
 
   resolved._raw = loaded.config;
 
-  if (isDev() && argv[0] === 'dev' && !isRestart) {
-    resolved.server.port = await getPort(resolved.server.port!);
+  if (isDev() && argv[0] === 'dev') {
+    if (restartWithExistingPort > 0) {
+      // dev server is restarted, should use existing port number
+      resolved.server.port = restartWithExistingPort;
+    } else {
+      // get port for new dev server
+      resolved.server.port = await getPort(resolved.server.port!);
+    }
   }
 
   debug('resolved %o', resolved);
@@ -300,3 +306,17 @@ export const resolveConfig = async (
   return resolved;
 };
 /* eslint-enable max-statements, max-params */
+
+export type {
+  SourceConfig,
+  OutputConfig,
+  ServerConfig,
+  DevConfig,
+  DeployConfig,
+  ToolsConfig,
+  RuntimeConfig,
+  RuntimeByEntriesConfig,
+  UserConfig,
+  ConfigParam,
+  LoadedConfig,
+};

package/src/index.ts

@@ -20,13 +20,7 @@ import { enable } from '@modern-js/plugin/node';
 
 import type { Hooks } from '@modern-js/types';
 import { program, Command } from './utils/commander';
-import {
-  resolveConfig,
-  defineConfig,
-  loadUserConfig,
-  UserConfig,
-  ToolsConfig,
-} from './config';
+import { resolveConfig, loadUserConfig } from './config';
 import { loadPlugins } from './loadPlugins';
 import {
   AppContext,
@@ -43,8 +37,7 @@ import { NormalizedConfig } from './config/mergeConfig';
 import { loadEnv } from './loadEnv';
 
 export type { Hooks };
-export { defaultsConfig, mergeConfig } from './config';
-
+export * from './config';
 export * from '@modern-js/plugin';
 export * from '@modern-js/plugin/node';
 
@@ -117,7 +110,6 @@ export const usePlugins = (plugins: string[]) =>
   );
 
 export {
-  defineConfig,
   AppContext,
   ResolvedConfigContext,
   useAppContext,
@@ -126,7 +118,7 @@ export {
   ConfigContext,
 };
 
-export type { NormalizedConfig, IAppContext, UserConfig, ToolsConfig };
+export type { NormalizedConfig, IAppContext };
 
 const initAppDir = async (cwd?: string): Promise<string> => {
   if (!cwd) {
@@ -155,6 +147,7 @@ export interface CoreOptions {
 const createCli = () => {
   let hooksRunner: HooksRunner;
   let isRestart = false;
+  let restartWithExistingPort = 0;
 
   const init = async (argv: string[] = [], options?: CoreOptions) => {
     enable();
@@ -215,7 +208,7 @@ const createCli = () => {
       loaded,
       extraConfigs as any,
       extraSchemas as any,
-      isRestart,
+      restartWithExistingPort,
       argv,
     );
 
@@ -256,6 +249,7 @@ const createCli = () => {
 
   async function restart() {
     isRestart = true;
+    restartWithExistingPort = isRestart ? AppContext.use().value?.port ?? 0 : 0;
 
     logger.info('Restart...\n');
 
@@ -281,4 +275,4 @@ const createCli = () => {
 
 export const cli = createCli();
 
-export { loadUserConfig, initAppDir, initAppContext };
+export { initAppDir, initAppContext };

package/tests/config.test.ts

@@ -1,5 +1,6 @@
 import path from 'path';
 // import os from 'os';
+import { isDev, getPort } from '@modern-js/utils';
 import { resolveConfig } from '../src/config';
 import {
   cli,
@@ -11,11 +12,67 @@ import {
   registerHook,
   useRunner,
 } from '../src';
+import { defaults } from '../src/config/defaults';
+
+jest.mock('@modern-js/utils', () => ({
+  __esModule: true,
+  ...jest.requireActual('@modern-js/utils'),
+  isDev: jest.fn(),
+  getPort: jest.fn(),
+}));
 
 // const kOSRootDir =
 //   os.platform() === 'win32' ? process.cwd().split(path.sep)[0] : '/';
 
 describe('config', () => {
+  /**
+   * Typescript Type annotations cannot be used for esbuild-jest
+   * test files that use jest.mock('@some/module')
+   * refer to this esbuild-jest issue:
+   * https://github.com/aelbore/esbuild-jest/issues/57
+   * TODO: find a better solution to solve this problem while allowing us
+   * to use esbuild, and have good TypeScript support
+   */
+  let loaded = {
+    config: {},
+    filePath: '',
+    dependencies: [],
+    pkgConfig: {},
+    jsConfig: {},
+  };
+  let schemas: any[] = [];
+  let restartWithExistingPort = 0;
+  let argv: string[] = ['dev'];
+  let configs: any[] = [];
+
+  const getResolvedConfig = async () =>
+    resolveConfig(loaded, configs, schemas, restartWithExistingPort, argv);
+
+  const resetParams = () => {
+    loaded = {
+      config: {},
+      filePath: '',
+      dependencies: [],
+      pkgConfig: {},
+      jsConfig: {},
+    };
+    schemas = [];
+    restartWithExistingPort = 0;
+    argv = ['dev'];
+    configs = [];
+  };
+  const resetMock = () => {
+    jest.resetAllMocks();
+    (isDev as jest.Mock).mockReturnValue(true);
+    (getPort as jest.Mock).mockReturnValue(
+      Promise.resolve(defaults.server.port),
+    );
+  };
+  beforeEach(() => {
+    resetParams();
+    resetMock();
+  });
+
   it('default', () => {
     expect(resolveConfig).toBeDefined();
     expect(cli).toBeDefined();
@@ -40,4 +97,41 @@ describe('config', () => {
     //   expect(err.message).toMatch(/no package.json found in current work dir/);
     // }
   });
+
+  test('should use default port if not restarting in dev mode', async () => {
+    let resolved = await getResolvedConfig();
+    expect(resolved.server.port).toEqual(defaults.server.port);
+    expect(getPort).toHaveBeenCalledWith(defaults.server.port);
+
+    // getResolvedConfig should use the value givin by getPort
+    restartWithExistingPort = -1;
+    (getPort as jest.Mock).mockClear();
+    (getPort as jest.Mock).mockReturnValue(1111);
+    resolved = await getResolvedConfig();
+    expect(resolved.server.port).toEqual(1111);
+    expect(getPort).toHaveBeenCalledWith(defaults.server.port);
+
+    argv = ['start'];
+    (isDev as jest.Mock).mockReturnValue(false);
+    restartWithExistingPort = 0;
+    resolved = await getResolvedConfig();
+    expect(resolved.server.port).toEqual(defaults.server.port);
+
+    restartWithExistingPort = 1234;
+    resolved = await getResolvedConfig();
+    expect(resolved.server.port).toEqual(defaults.server.port);
+
+    restartWithExistingPort = -1;
+    resolved = await getResolvedConfig();
+    expect(resolved.server.port).toEqual(defaults.server.port);
+  });
+
+  test('should reuse existing port if restarting in dev mode', async () => {
+    restartWithExistingPort = 1234;
+    const resolved = await getResolvedConfig();
+    expect(resolved.server.port).toEqual(1234);
+  });
 });
+
+// type TEST = Parameters<typeof resolveConfig>;
+// type TypeC = TEST[1];

package/tests/fixtures/index-test/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "index-test"
+}

package/tests/index.test.ts

@@ -0,0 +1,74 @@
+import path from 'path';
+import { cli } from '../src';
+import { resolveConfig, loadUserConfig } from '../src/config';
+import { loadEnv } from '../src/loadEnv';
+
+jest.mock('../src/config', () => ({
+  __esModule: true,
+  ...jest.requireActual('../src/config'),
+  loadUserConfig: jest.fn(),
+  resolveConfig: jest.fn(),
+}));
+
+jest.mock('../src/loadEnv', () => ({
+  __esModule: true,
+  ...jest.requireActual('../src/loadEnv'),
+  loadEnv: jest.fn(),
+}));
+
+describe('@modern-js/core test', () => {
+  let mockResolveConfig: any = {};
+  let mockLoadedConfig: any = {};
+  const cwdSpy = jest.spyOn(process, 'cwd');
+  const cwd = path.join(__dirname, './fixtures/index-test');
+
+  const resetMock = () => {
+    jest.resetAllMocks();
+    cwdSpy.mockReturnValue(cwd);
+    (resolveConfig as jest.Mock).mockReturnValue(
+      Promise.resolve(mockResolveConfig),
+    );
+    (loadUserConfig as jest.Mock).mockImplementation(() =>
+      Promise.resolve(mockLoadedConfig),
+    );
+  };
+
+  const resetValues = () => {
+    mockLoadedConfig = {
+      config: {},
+      filePath: false,
+      dependencies: [],
+      pkgConfig: {},
+      jsConfig: {},
+    };
+    mockResolveConfig = {
+      server: {
+        port: 8080,
+      },
+      output: {
+        path: './my/test/path',
+      },
+    };
+  };
+
+  beforeEach(() => {
+    resetValues();
+    resetMock();
+  });
+
+  it('test cli create', () => {
+    expect(cli).toBeTruthy();
+  });
+
+  it('test cli init dev', async () => {
+    cwdSpy.mockReturnValue(path.join(cwd, 'nested-folder'));
+    const options = {
+      beforeUsePlugins: jest.fn(),
+    };
+    options.beforeUsePlugins.mockImplementation((plugins, _) => plugins);
+    await cli.init(['dev'], options);
+    expect(loadEnv).toHaveBeenCalledWith(cwd);
+    expect(options.beforeUsePlugins).toHaveBeenCalledWith([], {});
+    // TODO: add more test cases
+  });
+});