@modern-js/core 2.0.0-beta.1 → 2.0.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,69 @@
 # @modern-js/core
 
+## 2.0.0-beta.2
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- c9e800d39a: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+- 92f0ead: feat:
+
+  1. core: 增加 test 函数
+  2. module plugins: 增加 `babel`, `mainField`, `target` 插件
+  3. storybook: 修改部分逻辑并且增加 tspath webpack 插件
+  4. 增加 designSystem 配置
+
+  feat:
+
+  1. core: add test method
+  2. module plugins: add `babel`, `mainField`, `target` plugin
+  3. storybook: change some logic and add tspath webpack plugin
+  4. add `designSystem` config
+
+- edd1cfb1af: feat: modernjs Access builder compiler
+  feat: modernjs 接入 builder 构建
+- d5a31df781: refactor: remove unbundle configs and types
+
+  refactor: 移除 unbundle 相关的配置项和类型定义
+
+### Patch Changes
+
+- 85edee888c: feat(app-tools): support tools.htmlPlugin config
+
+  feat(app-tools): 支持 tools.htmlPlugin 配置项
+
+- b8bbe036c7: feat: change type logic
+  feat: 修改类型相关的逻辑
+- 8b8e1bb571: feat: support nested routes
+  feat: 支持嵌套路由
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [f179749]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/node-bundle-require@2.0.0-beta.2
+  - @modern-js/utils@2.0.0-beta.2
+  - @modern-js/plugin@2.0.0-beta.2
+
 ## 2.0.0-beta.1
 
 ### Major Changes

package/dist/bin.js

@@ -1,9 +1,6 @@
 #!/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');
 const utils_1 = require("@modern-js/utils");
 const _1 = require(".");
 const command = process.argv[2];
@@ -38,4 +35,4 @@ const customConfigFile = cliParams.config || cliParams.c;
 if (SUPPORT_CONFIG_PARAM_COMMANDS.includes(command) && customConfigFile) {
     runOptions.configFile = customConfigFile;
 }
-_1.cli.run(process.argv.slice(2), runOptions);
+_1.cli.run(runOptions);

package/dist/config/createLoadedConfig.d.ts

@@ -0,0 +1,6 @@
+import { LoadedConfig, UserConfig, ConfigParams } from '../types';
+/**
+ * Assign the pkg config into the user config.
+ */
+export declare const assignPkgConfig: (userConfig?: UserConfig, pkgConfig?: ConfigParams) => UserConfig;
+export declare function createLoadedConfig(appDirectory: string, filePath?: string, packageJsonConfig?: string): Promise<LoadedConfig<{}>>;

package/dist/config/createLoadedConfig.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLoadedConfig = exports.assignPkgConfig = void 0;
+const lodash_1 = require("@modern-js/utils/lodash");
+const utils_1 = require("@modern-js/utils");
+const load_configs_1 = require("../load-configs");
+/**
+ * Assign the pkg config into the user config.
+ */
+const assignPkgConfig = (userConfig = {}, pkgConfig = {}) => (0, lodash_1.mergeWith)({}, userConfig, pkgConfig, (objValue, srcValue) => {
+    // mergeWith can not merge object with symbol, but plugins object contains symbol,
+    // so we need to handle it manually.
+    if (objValue === undefined && (0, utils_1.isPlainObject)(srcValue)) {
+        return { ...srcValue };
+    }
+    // return undefined to use the default behavior of mergeWith
+    return undefined;
+});
+exports.assignPkgConfig = assignPkgConfig;
+async function createLoadedConfig(appDirectory, filePath, packageJsonConfig) {
+    const loaded = await (0, load_configs_1.loadConfig)(appDirectory, filePath, packageJsonConfig);
+    const config = !loaded
+        ? {}
+        : await (typeof loaded.config === 'function'
+            ? loaded.config(0)
+            : loaded.config);
+    return {
+        config: (0, exports.assignPkgConfig)(config, loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig),
+        filePath: loaded.path,
+        dependencies: loaded.dependencies || [],
+        pkgConfig: loaded.pkgConfig || {},
+        jsConfig: config || {},
+    };
+}
+exports.createLoadedConfig = createLoadedConfig;

package/dist/config/createResolvedConfig.d.ts

@@ -0,0 +1,3 @@
+import type { ErrorObject } from '@modern-js/utils/ajv';
+import type { UserConfig, NormalizedConfig, LoadedConfig, PluginValidateSchema } from '../types';
+export declare const createResolveConfig: (loaded: LoadedConfig<{}>, configs: UserConfig[], schemas: PluginValidateSchema[], onSchemaError?: (error: ErrorObject) => void | Promise<void>) => Promise<NormalizedConfig>;

package/dist/config/createResolvedConfig.js

@@ -0,0 +1,92 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createResolveConfig = void 0;
+const utils_1 = require("@modern-js/utils");
+const constants_1 = require("@modern-js/utils/constants");
+const patchSchema_1 = require("../schema/patchSchema");
+const repeatKeyWarning_1 = require("../utils/repeatKeyWarning");
+const mergeConfig_1 = require("../utils/mergeConfig");
+const debug = (0, utils_1.createDebugger)('resolve-config');
+const showAdditionalPropertiesError = async (error) => {
+    if (error.keyword === 'additionalProperties' &&
+        error.params.additionalProperty) {
+        const target = [
+            error.instancePath.slice(1),
+            error.params.additionalProperty,
+        ]
+            .filter(Boolean)
+            .join('.');
+        const name = Object.keys(constants_1.PLUGIN_SCHEMAS).find(key => constants_1.PLUGIN_SCHEMAS[key].some((schemaItem) => schemaItem.target === target));
+        if (name) {
+            const packageManager = await (0, utils_1.getPackageManager)();
+            utils_1.logger.warn(`The configuration of ${utils_1.chalk.bold(target)} is provided by plugin ${utils_1.chalk.bold(name)}. Please use ${utils_1.chalk.bold(`${packageManager} run new`)} to enable the corresponding capability.\n`);
+        }
+    }
+};
+const createResolveConfig = async (
+// eslint-disable-next-line @typescript-eslint/ban-types
+loaded, configs, schemas, onSchemaError = showAdditionalPropertiesError) => {
+    var _a;
+    const { default: Ajv } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils/ajv')));
+    const { default: ajvKeywords } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils/ajv-keywords')));
+    const { default: betterAjvErrors } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils/better-ajv-errors')));
+    const { config: userConfig, jsConfig, pkgConfig } = loaded;
+    const ajv = new Ajv({ $data: true, strict: false });
+    ajvKeywords(ajv);
+    const validateSchema = (0, patchSchema_1.patchSchema)(schemas);
+    const validate = ajv.compile(validateSchema);
+    (0, repeatKeyWarning_1.repeatKeyWarning)(validateSchema, jsConfig, pkgConfig);
+    // validate user config.
+    const valid = validate(userConfig);
+    const formatValidateError = (config) => {
+        var _a;
+        return betterAjvErrors(validateSchema, config, (_a = validate.errors) === null || _a === void 0 ? void 0 : _a.map(e => ({
+            ...e,
+            dataPath: e.instancePath,
+        })), {
+            indent: 2,
+        });
+    };
+    // FIXME: pass temporarily
+    if (!valid && ((_a = validate.errors) === null || _a === void 0 ? void 0 : _a.length)) {
+        await onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
+        const errors = formatValidateError(userConfig);
+        utils_1.logger.log(errors);
+        throw new Error(`Validate configuration error`);
+    }
+    // validate config from plugins.
+    for (const config of configs) {
+        if (!validate(config)) {
+            const errors = formatValidateError(config);
+            utils_1.logger.error(errors);
+            throw new Error(`Validate configuration error.`);
+        }
+    }
+    const resolved = (0, mergeConfig_1.mergeConfig)([...configs, userConfig]);
+    debug('resolved %o', resolved);
+    return resolved;
+};
+exports.createResolveConfig = createResolveConfig;

package/dist/config/index.d.ts

@@ -1,17 +1,2 @@
-import type { ErrorObject } from '@modern-js/utils/ajv';
-import { getDefaultConfig } from './defaults';
-import { NormalizedConfig } from './mergeConfig';
-import { PluginValidateSchema } from './schema';
-import type { UserConfig, ConfigParam, LoadedConfig } from './types';
-export { getDefaultConfig };
-export * from './mergeConfig';
-export * from './types';
-export * from './schema';
-export declare const addServerConfigToDeps: (dependencies: string[], appDirectory: string, serverConfigFile: string) => Promise<void>;
-export declare const defineConfig: (config: ConfigParam) => ConfigParam;
-/**
- * Assign the pkg config into the user config.
- */
-export declare const assignPkgConfig: (userConfig?: UserConfig, pkgConfig?: ConfigParam) => UserConfig & ConfigParam;
-export declare const loadUserConfig: (appDirectory: string, filePath?: string, packageJsonConfig?: string) => Promise<LoadedConfig>;
-export declare const resolveConfig: (loaded: LoadedConfig, configs: UserConfig[], schemas: PluginValidateSchema[], restartWithExistingPort: number, argv: string[], onSchemaError?: (error: ErrorObject) => void | Promise<void>) => Promise<NormalizedConfig>;
+export * from './createLoadedConfig';
+export * from './createResolvedConfig';

package/dist/config/index.js

@@ -10,143 +10,9 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveConfig = exports.loadUserConfig = exports.assignPkgConfig = exports.defineConfig = exports.addServerConfigToDeps = exports.getDefaultConfig = void 0;
-const utils_1 = require("@modern-js/utils");
-const lodash_1 = require("@modern-js/utils/lodash");
-const context_1 = require("../context");
-const load_configs_1 = require("../load-configs");
-const repeatKeyWarning_1 = require("../utils/repeatKeyWarning");
-const defaults_1 = require("./defaults");
-Object.defineProperty(exports, "getDefaultConfig", { enumerable: true, get: function () { return defaults_1.getDefaultConfig; } });
-const mergeConfig_1 = require("./mergeConfig");
-const schema_1 = require("./schema");
-const debug = (0, utils_1.createDebugger)('resolve-config');
-__exportStar(require("./mergeConfig"), exports);
-__exportStar(require("./types"), exports);
-__exportStar(require("./schema"), exports);
-const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
-    const serverConfig = await (0, utils_1.getServerConfig)(appDirectory, serverConfigFile);
-    if (serverConfig) {
-        dependencies.push(serverConfig);
-    }
-};
-exports.addServerConfigToDeps = addServerConfigToDeps;
-const defineConfig = (config) => config;
-exports.defineConfig = defineConfig;
-/**
- * Assign the pkg config into the user config.
- */
-const assignPkgConfig = (userConfig = {}, pkgConfig = {}) => (0, lodash_1.mergeWith)({}, userConfig, pkgConfig, (objValue, srcValue) => {
-    // mergeWith can not merge object with symbol, but plugins object contains symbol,
-    // so we need to handle it manually.
-    if (objValue === undefined && (0, utils_1.isPlainObject)(srcValue)) {
-        return { ...srcValue };
-    }
-    // return undefined to use the default behavior of mergeWith
-    return undefined;
-});
-exports.assignPkgConfig = assignPkgConfig;
-const loadUserConfig = async (appDirectory, filePath, packageJsonConfig) => {
-    const loaded = await (0, load_configs_1.loadConfig)(appDirectory, filePath, packageJsonConfig);
-    const config = !loaded
-        ? {}
-        : await (typeof loaded.config === 'function'
-            ? loaded.config(0)
-            : loaded.config);
-    return {
-        config: (0, exports.assignPkgConfig)(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,
-        dependencies: (loaded === null || loaded === void 0 ? void 0 : loaded.dependencies) || [],
-    };
-};
-exports.loadUserConfig = loadUserConfig;
-const showAdditionalPropertiesError = async (error) => {
-    if (error.keyword === 'additionalProperties' &&
-        error.params.additionalProperty) {
-        const target = [
-            error.instancePath.slice(1),
-            error.params.additionalProperty,
-        ]
-            .filter(Boolean)
-            .join('.');
-        const name = Object.keys(utils_1.PLUGIN_SCHEMAS).find(key => utils_1.PLUGIN_SCHEMAS[key].some((schemaItem) => schemaItem.target === target));
-        if (name) {
-            const packageManager = await (0, utils_1.getPackageManager)();
-            utils_1.logger.warn(`The configuration of ${utils_1.chalk.bold(target)} is provided by plugin ${utils_1.chalk.bold(name)}. Please use ${utils_1.chalk.bold(`${packageManager} run new`)} to enable the corresponding capability.\n`);
-        }
-    }
-};
-const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv, onSchemaError = showAdditionalPropertiesError) => {
-    var _a;
-    const { default: Ajv } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils/ajv')));
-    const { default: ajvKeywords } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils/ajv-keywords')));
-    const { default: betterAjvErrors } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils/better-ajv-errors')));
-    const { config: userConfig, jsConfig, pkgConfig } = loaded;
-    const ajv = new Ajv({ $data: true, strict: false });
-    ajvKeywords(ajv);
-    const validateSchema = (0, schema_1.patchSchema)(schemas);
-    const validate = ajv.compile(validateSchema);
-    (0, repeatKeyWarning_1.repeatKeyWarning)(validateSchema, jsConfig, pkgConfig);
-    // validate user config.
-    const valid = validate(userConfig);
-    const formatValidateError = (config) => {
-        var _a;
-        return betterAjvErrors(validateSchema, config, (_a = validate.errors) === null || _a === void 0 ? void 0 : _a.map(e => ({
-            ...e,
-            dataPath: e.instancePath,
-        })), {
-            indent: 2,
-        });
-    };
-    if (!valid && ((_a = validate.errors) === null || _a === void 0 ? void 0 : _a.length)) {
-        await onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
-        const errors = formatValidateError(userConfig);
-        utils_1.logger.log(errors);
-        throw new Error(`Validate configuration error`);
-    }
-    // validate config from plugins.
-    for (const config of configs) {
-        if (!validate(config)) {
-            const errors = formatValidateError(config);
-            utils_1.logger.error(errors);
-            throw new Error(`Validate configuration error.`);
-        }
-    }
-    const resolved = (0, mergeConfig_1.mergeConfig)([
-        (0, defaults_1.getDefaultConfig)(context_1.AppContext.use().value),
-        ...configs,
-        userConfig,
-    ]);
-    resolved._raw = loaded.config;
-    if ((0, utils_1.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_1.getPort)(resolved.server.port);
-        }
-    }
-    debug('resolved %o', resolved);
-    return resolved;
-};
-exports.resolveConfig = resolveConfig;
+__exportStar(require("./createLoadedConfig"), exports);
+__exportStar(require("./createResolvedConfig"), exports);

package/dist/context.d.ts

@@ -1,11 +1,7 @@
-import type { IAppContext, InternalPlugins } from '@modern-js/types';
-import { UserConfig } from './config';
-import { NormalizedConfig } from './config/mergeConfig';
-import { CliPlugin } from './manager';
-export type { IAppContext };
+import type { CliPlugin, UserConfig, IAppContext, InternalPlugins, NormalizedConfig } from './types';
 export declare const AppContext: import("@modern-js/plugin").Context<IAppContext>;
-export declare const ConfigContext: import("@modern-js/plugin").Context<UserConfig>;
-export declare const ResolvedConfigContext: import("@modern-js/plugin").Context<NormalizedConfig>;
+export declare const ConfigContext: import("@modern-js/plugin").Context<UserConfig<any, {}, {}, {}>>;
+export declare const ResolvedConfigContext: import("@modern-js/plugin").Context<NormalizedConfig<any, {}, {}, {}>>;
 /**
  * Set app context.
  * @param value new app context. It will override previous app context.
@@ -18,11 +14,11 @@ export declare const useAppContext: () => IAppContext;
 /**
  * Get original content of user config.
  */
-export declare const useConfigContext: () => UserConfig;
+export declare const useConfigContext: <Extends extends Record<string, any>>() => UserConfig<Extends>;
 /**
  * Get normalized content of user config.
  */
-export declare const useResolvedConfigContext: () => NormalizedConfig;
+export declare const useResolvedConfigContext: <Extends extends Record<string, any>>() => NormalizedConfig<Extends>;
 export declare const initAppContext: ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, }: {
     appDirectory: string;
     plugins: CliPlugin[];

package/dist/index.d.ts

@@ -1,15 +1,11 @@
 import type { ErrorObject } from '@modern-js/utils/ajv';
 import { InternalPlugins } from '@modern-js/types';
 import { TransformPlugin } from './loadPlugins';
-import { IAppContext, initAppContext } from './context';
-export * from './config';
-export type { Hooks, ImportSpecifier, ImportStatement, RuntimePlugin, } from './types';
+import { initAppContext } from './context';
+export * from './types';
 export * from '@modern-js/plugin';
 export { manager, mountHook, createPlugin, registerHook } from './manager';
-export type { CliHooks, CliPlugin, CliHookCallbacks } from './manager';
-export { AppContext, ConfigContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, } from './pluginAPI';
-export type { PluginAPI } from './pluginAPI';
-export type { IAppContext };
+export { AppContext, ConfigContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, } from './context';
 declare const initAppDir: (cwd?: string) => Promise<string>;
 export interface CoreOptions {
     cwd?: string;
@@ -50,17 +46,13 @@ export declare const mergeOptions: (options?: CoreOptions) => {
     } | undefined;
 };
 export declare const cli: {
-    init: (argv?: string[], options?: CoreOptions) => Promise<{
-        loadedConfig: import("./config").LoadedConfig;
-        appContext: IAppContext;
-        resolved: import("./config").NormalizedConfig;
-    }>;
-    run: (argv: string[], options?: CoreOptions) => Promise<void>;
-    restart: () => Promise<void>;
+    init: (options?: CoreOptions) => Promise<void>;
+    run: (options?: CoreOptions) => Promise<void>;
     test: (argv: string[], options?: {
         coreOptions?: CoreOptions;
         disableWatcher?: boolean;
     }) => Promise<void>;
+    initOptions: CoreOptions | undefined;
 };
 export { initAppDir, initAppContext };
 declare module '@modern-js/utils/compiled/commander' {

package/dist/index.js

@@ -21,14 +21,13 @@ exports.initAppContext = exports.initAppDir = exports.cli = exports.mergeOptions
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("@modern-js/utils");
 const commander_1 = require("./utils/commander");
-const config_1 = require("./config");
 const loadPlugins_1 = require("./loadPlugins");
 const context_1 = require("./context");
 Object.defineProperty(exports, "initAppContext", { enumerable: true, get: function () { return context_1.initAppContext; } });
-const initWatcher_1 = require("./initWatcher");
 const loadEnv_1 = require("./loadEnv");
 const manager_1 = require("./manager");
-__exportStar(require("./config"), exports);
+const config_1 = require("./config");
+__exportStar(require("./types"), exports);
 __exportStar(require("@modern-js/plugin"), exports);
 // TODO: remove export after refactor all plugins
 var manager_2 = require("./manager");
@@ -36,14 +35,13 @@ Object.defineProperty(exports, "manager", { enumerable: true, get: function () {
 Object.defineProperty(exports, "mountHook", { enumerable: true, get: function () { return manager_2.mountHook; } });
 Object.defineProperty(exports, "createPlugin", { enumerable: true, get: function () { return manager_2.createPlugin; } });
 Object.defineProperty(exports, "registerHook", { enumerable: true, get: function () { return manager_2.registerHook; } });
-// TODO: remove export after refactor all plugins
-var pluginAPI_1 = require("./pluginAPI");
-Object.defineProperty(exports, "AppContext", { enumerable: true, get: function () { return pluginAPI_1.AppContext; } });
-Object.defineProperty(exports, "ConfigContext", { enumerable: true, get: function () { return pluginAPI_1.ConfigContext; } });
-Object.defineProperty(exports, "ResolvedConfigContext", { enumerable: true, get: function () { return pluginAPI_1.ResolvedConfigContext; } });
-Object.defineProperty(exports, "useAppContext", { enumerable: true, get: function () { return pluginAPI_1.useAppContext; } });
-Object.defineProperty(exports, "useConfigContext", { enumerable: true, get: function () { return pluginAPI_1.useConfigContext; } });
-Object.defineProperty(exports, "useResolvedConfigContext", { enumerable: true, get: function () { return pluginAPI_1.useResolvedConfigContext; } });
+var context_2 = require("./context");
+Object.defineProperty(exports, "AppContext", { enumerable: true, get: function () { return context_2.AppContext; } });
+Object.defineProperty(exports, "ConfigContext", { enumerable: true, get: function () { return context_2.ConfigContext; } });
+Object.defineProperty(exports, "ResolvedConfigContext", { enumerable: true, get: function () { return context_2.ResolvedConfigContext; } });
+Object.defineProperty(exports, "useAppContext", { enumerable: true, get: function () { return context_2.useAppContext; } });
+Object.defineProperty(exports, "useConfigContext", { enumerable: true, get: function () { return context_2.useConfigContext; } });
+Object.defineProperty(exports, "useResolvedConfigContext", { enumerable: true, get: function () { return context_2.useResolvedConfigContext; } });
 const initAppDir = async (cwd) => {
     if (!cwd) {
         // eslint-disable-next-line no-param-reassign
@@ -71,21 +69,19 @@ const setProgramVersion = (version = 'unknown') => {
 };
 const createCli = () => {
     let hooksRunner;
-    let isRestart = false;
-    let restartWithExistingPort = 0;
-    let restartOptions;
-    const init = async (argv = [], options) => {
+    let initOptions;
+    const init = async (options) => {
         var _a, _b, _c, _d;
         manager_1.manager.clear();
         const mergedOptions = (0, exports.mergeOptions)(options);
-        restartOptions = mergedOptions;
+        initOptions = mergedOptions;
         const appDirectory = await initAppDir(options === null || options === void 0 ? void 0 : options.cwd);
         (0, commander_1.initCommandsMap)();
         setProgramVersion(options === null || options === void 0 ? void 0 : options.version);
         const metaName = (_b = (_a = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.options) === null || _a === void 0 ? void 0 : _a.metaName) !== null && _b !== void 0 ? _b : 'MODERN';
         (0, loadEnv_1.loadEnv)(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
-        const loaded = await (0, config_1.loadUserConfig)(appDirectory, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.configFile, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.packageJsonConfig);
-        const plugins = (0, loadPlugins_1.loadPlugins)(appDirectory, loaded.config, {
+        const loaded = await (0, config_1.createLoadedConfig)(appDirectory, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.configFile, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.packageJsonConfig);
+        const plugins = await (0, loadPlugins_1.loadPlugins)(appDirectory, loaded.config, {
             internalPlugins: (_c = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.internalPlugins) === null || _c === void 0 ? void 0 : _c.cli,
             transformPlugin: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.transformPlugin,
         });
@@ -98,8 +94,6 @@ const createCli = () => {
             serverConfigFile: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.serverConfigFile,
             serverInternalPlugins: ((_d = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.internalPlugins) === null || _d === void 0 ? void 0 : _d.server) || utils_1.INTERNAL_SERVER_PLUGINS,
         });
-        // 将 server.config 加入到 loaded.dependencies，以便对文件监听做热更新
-        (0, config_1.addServerConfigToDeps)(loaded.dependencies, appDirectory, mergedOptions.serverConfigFile);
         context_1.ConfigContext.set(loaded.config);
         context_1.AppContext.set(appContext);
         hooksRunner = await manager_1.manager.init();
@@ -117,68 +111,35 @@ const createCli = () => {
         });
         const extraConfigs = await hooksRunner.config();
         const extraSchemas = await hooksRunner.validateSchema();
-        const config = await (0, config_1.resolveConfig)(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv, options === null || options === void 0 ? void 0 : options.onSchemaError);
+        const normalizedConfig = await (0, config_1.createResolveConfig)(loaded, extraConfigs, extraSchemas, options === null || options === void 0 ? void 0 : options.onSchemaError);
         const { resolved } = await hooksRunner.resolvedConfig({
-            resolved: config,
+            resolved: normalizedConfig,
         });
+        // FIXME: Why need to configContext again?
         // update context value
         context_1.ConfigContext.set(loaded.config);
         context_1.ResolvedConfigContext.set(resolved);
-        context_1.AppContext.set({
-            ...appContext,
-            port: resolved.server.port,
-            distDirectory: (0, utils_1.ensureAbsolutePath)(appDirectory, resolved.output.path),
-        });
+        // TODO: confirm the `addRuntimeExports` run order
+        await hooksRunner.addRuntimeExports();
         await hooksRunner.prepare();
-        return {
-            loadedConfig: loaded,
-            // appContext may be updated in `prepare` hook, should return latest value
-            appContext: (0, context_1.useAppContext)(),
-            resolved,
-        };
     };
-    async function run(argv, options) {
-        const { loadedConfig, appContext, resolved } = await init(argv, options);
+    async function run(options) {
+        await init(options);
         await hooksRunner.commands({ program: utils_1.program });
-        (0, initWatcher_1.initWatcher)(loadedConfig, appContext.appDirectory, resolved.source.configDir, hooksRunner, argv);
         utils_1.program.parse(process.argv);
     }
-    async function restart() {
-        var _a, _b;
-        isRestart = true;
-        restartWithExistingPort = isRestart ? (_b = (_a = context_1.AppContext.use().value) === null || _a === void 0 ? void 0 : _a.port) !== null && _b !== void 0 ? _b : 0 : 0;
-        utils_1.logger.info('Restart...\n');
-        let hasGetError = false;
-        const runner = manager_1.manager.useRunner();
-        await runner.beforeRestart();
-        try {
-            await init(process.argv.slice(2), restartOptions);
-        }
-        catch (err) {
-            console.error(err);
-            hasGetError = true;
-        }
-        finally {
-            if (!hasGetError) {
-                utils_1.program.parse(process.argv);
-            }
-        }
-    }
     async function test(argv, options) {
         const newProgram = new utils_1.Command();
         const { coreOptions } = options !== null && options !== void 0 ? options : {};
-        const { loadedConfig, appContext, resolved } = await init(argv, coreOptions);
+        await init(coreOptions);
         await hooksRunner.commands({ program: newProgram });
-        if (!(options === null || options === void 0 ? void 0 : options.disableWatcher)) {
-            (0, initWatcher_1.initWatcher)(loadedConfig, appContext.appDirectory, resolved.source.configDir, hooksRunner, argv);
-        }
         await newProgram.parseAsync(argv);
     }
     return {
         init,
         run,
-        restart,
         test,
+        initOptions,
     };
 };
 exports.cli = createCli();

package/dist/loadPlugins.d.ts

@@ -1,15 +1,6 @@
 import { InternalPlugins } from '@modern-js/types';
-import type { UserConfig } from './config';
-import { CliPlugin } from './manager';
-declare type PluginItem = string | [string, any];
+import type { CliPlugin, UserConfig, OldPluginConfig, PluginConfig } from './types';
 export declare type TransformPlugin = (plugin: PluginConfig, resolvedConfig: UserConfig, pluginOptions?: any) => PluginConfig;
-/**
- * @deprecated
- * Using NewPluginConfig instead.
- */
-declare type OldPluginConfig = Array<PluginItem>;
-export declare type NewPluginConfig<T = {}> = CliPlugin<T>[];
-export declare type PluginConfig = OldPluginConfig | NewPluginConfig;
 export declare const isOldPluginConfig: (config?: PluginConfig) => config is OldPluginConfig;
 /**
  * Load internal plugins which in @modern-js scope and user's custom plugins.
@@ -22,5 +13,4 @@ export declare const isOldPluginConfig: (config?: PluginConfig) => config is Old
 export declare const loadPlugins: (appDirectory: string, userConfig: UserConfig, options?: {
     internalPlugins?: InternalPlugins;
     transformPlugin?: TransformPlugin;
-}) => CliPlugin<{}>[];
-export {};
+}) => Promise<CliPlugin<{}, {}, {}, {}>[]>;