@modern-js/core 1.9.2 → 1.10.2

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @modern-js/core
 
+## 1.10.2
+
+### Patch Changes
+
+- d32f35134: chore: add modern/jest/eslint/ts config files to .npmignore
+- d9d398e16: add filter logic for merge config
+- Updated dependencies [d5913bd96]
+- Updated dependencies [d32f35134]
+- Updated dependencies [6ae4a34ae]
+- Updated dependencies [b80229c79]
+- Updated dependencies [948cc4436]
+  - @modern-js/plugin@1.3.4
+  - @modern-js/load-config@1.3.3
+  - @modern-js/utils@1.7.3
+
+## 1.10.1
+
+### Patch Changes
+
+- 69a728375: fix: remove exports.jsnext:source after publish
+- Updated dependencies [cd7346b0d]
+- Updated dependencies [69a728375]
+  - @modern-js/utils@1.7.2
+  - @modern-js/load-config@1.3.2
+
+## 1.10.0
+
+### Minor Changes
+
+- 0ee4bb4e: feat: prebundle webpack loaders and plugins
+
+### Patch Changes
+
+- a22d3ea8: fix: package manager name in logs and comments
+- 5c00db22: fix: ignore existed schema properties
+- 92f4909e: fix: cli.init should return correct appContext
+- Updated dependencies [0ee4bb4e]
+- Updated dependencies [6fa74d5f]
+  - @modern-js/utils@1.7.0
+
 ## 1.9.0
 
 ### Minor Changes

package/compiled/ajv/package.json

@@ -1 +1 @@
-{"name":"ajv","author":"Evgeny Poberezkin","version":"8.11.0","funding":{"type":"github","url":"https://github.com/sponsors/epoberezkin"},"license":"MIT","types":"dist/ajv.d.ts"}
+{"name":"ajv","author":"Evgeny Poberezkin","version":"8.11.0","funding":{"type":"github","url":"https://github.com/sponsors/epoberezkin"},"license":"MIT","types":"types/ajv.d.ts"}

package/compiled/ajv-keywords/index.d.ts

@@ -0,0 +1 @@
+export = any;

package/compiled/ajv-keywords/package.json

@@ -1 +1 @@
-{"name":"ajv-keywords","author":"Evgeny Poberezkin","version":"5.1.0","license":"MIT","types":"dist/index.d.ts"}
+{"name":"ajv-keywords","author":"Evgeny Poberezkin","version":"5.1.0","license":"MIT","types":"index.d.ts"}

package/compiled/better-ajv-errors/index.d.ts

@@ -0,0 +1 @@
+export = any;

package/compiled/better-ajv-errors/package.json

@@ -1 +1 @@
-{"name":"better-ajv-errors","author":"Rifat Nabi <to.rifat@gmail.com>","version":"1.2.0","license":"Apache-2.0","types":"./typings.d.ts"}
+{"name":"better-ajv-errors","author":"Rifat Nabi <to.rifat@gmail.com>","version":"1.2.0","license":"Apache-2.0","types":"index.d.ts"}

package/compiled/v8-compile-cache/index.d.ts

@@ -0,0 +1 @@
+export = any;

package/compiled/v8-compile-cache/package.json

@@ -1 +1 @@
-{"name":"v8-compile-cache","author":"Andres Suarez <zertosh@gmail.com>","version":"2.3.0","license":"MIT"}
+{"name":"v8-compile-cache","author":"Andres Suarez <zertosh@gmail.com>","version":"2.3.0","license":"MIT","types":"index.d.ts"}

package/dist/config/index.d.ts

@@ -9,4 +9,4 @@ 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>;
+export declare const resolveConfig: (loaded: LoadedConfig, configs: UserConfig[], schemas: PluginValidateSchema[], restartWithExistingPort: number, argv: string[], onSchemaError?: (error: ErrorObject) => void | Promise<void>) => Promise<NormalizedConfig>;

package/dist/config/index.js

@@ -1,11 +1,7 @@
 "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);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -13,15 +9,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -41,20 +28,20 @@ Object.defineProperty(exports, "mergeConfig", { enumerable: true, get: function
 const schema_1 = require("./schema");
 const debug = (0, utils_1.createDebugger)('resolve-config');
 __exportStar(require("./types"), exports);
-const addServerConfigToDeps = (dependencies, appDirectory, serverConfigFile) => __awaiter(void 0, void 0, void 0, function* () {
-    const serverConfig = yield (0, utils_1.getServerConfig)(appDirectory, serverConfigFile);
+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;
-const loadUserConfig = (appDirectory, filePath, packageJsonConfig) => __awaiter(void 0, void 0, void 0, function* () {
-    const loaded = yield (0, load_config_1.loadConfig)(appDirectory, filePath, packageJsonConfig);
+const loadUserConfig = async (appDirectory, filePath, packageJsonConfig) => {
+    const loaded = await (0, load_config_1.loadConfig)(appDirectory, filePath, packageJsonConfig);
     const config = !loaded
         ? {}
-        : yield (typeof loaded.config === 'function'
+        : await (typeof loaded.config === 'function'
             ? loaded.config(0)
             : loaded.config);
     return {
@@ -64,9 +51,9 @@ const loadUserConfig = (appDirectory, filePath, packageJsonConfig) => __awaiter(
         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 = (error) => {
+const showAdditionalPropertiesError = async (error) => {
     if (error.keyword === 'additionalProperties' &&
         error.params.additionalProperty) {
         const target = [
@@ -77,11 +64,12 @@ const showAdditionalPropertiesError = (error) => {
             .join('.');
         const name = Object.keys(utils_1.PLUGIN_SCHEMAS).find(key => utils_1.PLUGIN_SCHEMAS[key].some((schemaItem) => schemaItem.target === target));
         if (name) {
-            utils_1.signale.warn(`The configuration of ${utils_1.chalk.bold(target)} is provided by plugin ${utils_1.chalk.bold(name)}. Please use ${utils_1.chalk.bold('yarn new')} to enable the corresponding capability.\n`);
+            const packageManager = await (0, utils_1.getPackageManager)();
+            utils_1.signale.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 = (loaded, configs, schemas, restartWithExistingPort, argv, onSchemaError = showAdditionalPropertiesError) => __awaiter(void 0, void 0, void 0, function* () {
+const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv, onSchemaError = showAdditionalPropertiesError) => {
     var _a, _b;
     const { config: userConfig, jsConfig, pkgConfig } = loaded;
     const ajv = new ajv_1.default({ $data: true, strict: false });
@@ -92,8 +80,11 @@ const resolveConfig = (loaded, configs, schemas, restartWithExistingPort, argv,
     // validate user config.
     const valid = validate(userConfig);
     if (!valid && ((_a = validate.errors) === null || _a === void 0 ? void 0 : _a.length)) {
-        onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
-        const errors = (0, better_ajv_errors_1.default)(validateSchema, userConfig, (_b = validate.errors) === null || _b === void 0 ? void 0 : _b.map(e => (Object.assign(Object.assign({}, e), { dataPath: e.instancePath }))), {
+        await onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
+        const errors = (0, better_ajv_errors_1.default)(validateSchema, userConfig, (_b = validate.errors) === null || _b === void 0 ? void 0 : _b.map(e => ({
+            ...e,
+            dataPath: e.instancePath,
+        })), {
             indent: 2,
         });
         utils_1.signale.log(errors);
@@ -115,10 +106,10 @@ const resolveConfig = (loaded, configs, schemas, restartWithExistingPort, argv,
         }
         else {
             // get port for new dev server
-            resolved.server.port = yield (0, utils_1.getPort)(resolved.server.port);
+            resolved.server.port = await (0, utils_1.getPort)(resolved.server.port);
         }
     }
     debug('resolved %o', resolved);
     return resolved;
-});
+};
 exports.resolveConfig = resolveConfig;

package/dist/config/mergeConfig.js

@@ -9,7 +9,11 @@ const utils_1 = require("@modern-js/utils");
  * @param configs - Configuration from modern.config.ts or plugin's config hook.
  * @returns - normalized user config.
  */
-const mergeConfig = (configs) => (0, lodash_1.mergeWith)({}, ...configs, (target, source) => {
+const mergeConfig = (configs) => (0, lodash_1.mergeWith)({}, ...configs, (target, source, key) => {
+    // Do not use the following merge logic for source.designSystem and tools.tailwind(css)
+    if (key === 'designSystem' || key === 'tailwind' || key === 'tailwindcss') {
+        return (0, lodash_1.mergeWith)({}, target !== null && target !== void 0 ? target : {}, source !== null && source !== void 0 ? source : {});
+    }
     if (Array.isArray(target)) {
         if (Array.isArray(source)) {
             return [...target, ...source];

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

@@ -5,7 +5,7 @@ import type { MetaOptions } from '@modern-js/utils';
 import type { TransformOptions } from '@babel/core';
 import type webpack from 'webpack';
 import type { Configuration as WebpackConfiguration } from 'webpack';
-import autoprefixer from 'autoprefixer';
+import type autoprefixer from 'autoprefixer';
 import type { BasePluginOptions, TerserOptions as RawTerserOptions } from 'terser-webpack-plugin';
 import type { PluginConfig } from '../../loadPlugins';
 import type { TestConfig, JestConfig } from './test';
@@ -33,9 +33,9 @@ export interface SourceConfig {
     moduleScopes?: Array<string | RegExp> | ((scopes: Array<string | RegExp>) => void) | ((scopes: Array<string | RegExp>) => Array<string | RegExp>);
     include?: Array<string | RegExp>;
     /**
-     * The configuration of `source.designSystem` is provided by plugin `@modern-js/plugin-tailwindcss`.
-     * Please use `yarn new` to enable the corresponding capability.
-     * @requires `@modern-js/plugin-tailwindcss`
+     * The configuration of `source.designSystem` is provided by `tailwindcss` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @requires `tailwindcss` plugin
      */
     designSystem?: Record<string, any>;
 }
@@ -82,15 +82,15 @@ export interface OutputConfig {
     enableTsLoader?: boolean;
     /**
      * Disables lazy import support for styles, currently supports antd and arco-design.
-     * The configuration of `output.disableAutoImportStyle` is provided by plugin `@modern-js/plugin-unbundle`.
-     * Please use `yarn new` to enable the corresponding capability.
-     * @requires `@modern-js/plugin-unbundle`
+     * The configuration of `output.disableAutoImportStyle` is provided by `unbundle` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @requires `unbundle` plugin
      */
     disableAutoImportStyle?: boolean;
     /**
-     * The configuration of `output.ssg` is provided by plugin `@modern-js/plugin-ssg`.
-     * Please use `yarn new` to enable the corresponding capability.
-     * @requires `@modern-js/plugin-ssg`
+     * The configuration of `output.ssg` is provided by `ssg` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @requires `ssg` plugin
      */
     ssg?: SSGConfig;
 }
@@ -115,15 +115,15 @@ export interface DevConfig {
     assetPrefix?: string | boolean;
     https?: boolean;
     /**
-     * The configuration of `dev.proxy` is provided by plugin `@modern-js/plugin-proxy`.
-     * Please use `yarn new` to enable the corresponding capability.
-     * @requires `@modern-js/plugin-proxy`
+     * The configuration of `dev.proxy` is provided by `proxy` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @requires `proxy` plugin
      */
     proxy?: DevProxyOptions;
     /**
-     * The configuration of `dev.unbundle` is provided by plugin `@modern-js/plugin-unbundle`.
-     * Please use `yarn new` to enable the corresponding capability.
-     * @requires `@modern-js/plugin-unbundle`
+     * The configuration of `dev.unbundle` is provided by `unbundle` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @requires `unbundle` plugin
      */
     unbundle?: UnbundleConfig;
 }
@@ -167,27 +167,27 @@ export interface ToolsConfig {
     minifyCss?: ConfigFunction;
     esbuild?: Record<string, unknown>;
     /**
-     * The configuration of `tools.tailwindcss` is provided by plugin `@modern-js/plugin-tailwindcss`.
-     * Please use `yarn new` to enable the corresponding capability.
-     * @requires `@modern-js/plugin-tailwindcss`
+     * The configuration of `tools.tailwindcss` is provided by `tailwindcss` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @requires `tailwindcss` plugin
      */
     tailwindcss?: Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
     /**
-     * The configuration of `tools.jest` is provided by plugin `@modern-js/plugin-testing`.
-     * Please use `yarn new` to enable the corresponding capability.
-     * @requires `@modern-js/plugin-testing`
+     * The configuration of `tools.jest` is provided by `testing` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @requires `testing` plugin
      */
     jest?: TestConfig['jest'];
     /**
-     * The configuration of `tools.sass` is provided by plugin `@modern-js/plugin-sass`.
-     * Please use `yarn new` to enable the corresponding capability.
-     * @requires `@modern-js/plugin-sass`
+     * The configuration of `tools.sass` is provided by `sass` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @requires `sass` plugin
      */
     sass?: SassConfig;
     /**
-     * The configuration of `tools.less` is provided by plugin `@modern-js/plugin-less`.
-     * Please use `yarn new` to enable the corresponding capability.
-     * @requires `@modern-js/plugin-less`
+     * The configuration of `tools.less` is provided by `less` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @requires `less` plugin
      */
     less?: LessConfig;
 }
@@ -212,21 +212,21 @@ export interface UserConfig {
     runtime?: RuntimeConfig;
     runtimeByEntries?: RuntimeByEntriesConfig;
     /**
-     * The configuration of `bff` is provided by plugin `@modern-js/plugin-bff`.
-     * Please use `yarn new` to enable the corresponding capability.
-     * @requires `@modern-js/plugin-bff`
+     * The configuration of `bff` is provided by `bff` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @requires `bff` plugin
      */
     bff?: BffConfig;
     /**
-     * The configuration of `testing` is provided by plugin `@modern-js/plugin-testing`.
-     * Please use `yarn new` to enable the corresponding capability.
-     * @requires `@modern-js/plugin-testing`
+     * The configuration of `testing` is provided by `testing` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @requires `testing` plugin
      */
     testing?: TestConfig;
     /**
-     * The configuration of `electron` is provided by plugin `@modern-js/plugin-electron`.
-     * Please use `yarn new` to enable the corresponding capability.
-     * @requires `@modern-js/plugin-electron`
+     * The configuration of `electron` is provided by `electron` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @requires `electron` plugin
      */
     electron?: ElectronConfig;
 }

package/dist/index.js

@@ -1,11 +1,7 @@
 "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);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -13,15 +9,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -60,23 +47,26 @@ utils_1.program
     .name('modern')
     .usage('<command> [options]')
     .version(process.env.MODERN_JS_VERSION || '0.1.0');
-const initAppDir = (cwd) => __awaiter(void 0, void 0, void 0, function* () {
+const initAppDir = async (cwd) => {
     if (!cwd) {
         // eslint-disable-next-line no-param-reassign
         cwd = process.cwd();
     }
-    const pkg = yield (0, utils_1.pkgUp)({ cwd });
+    const pkg = await (0, utils_1.pkgUp)({ cwd });
     if (!pkg) {
         throw new Error(`no package.json found in current work dir: ${cwd}`);
     }
     return path_1.default.dirname(pkg);
-});
+};
 exports.initAppDir = initAppDir;
 const mergeOptions = (options) => {
     const defaultOptions = {
         serverConfigFile: utils_1.DEFAULT_SERVER_CONFIG,
     };
-    return Object.assign(Object.assign({}, defaultOptions), options);
+    return {
+        ...defaultOptions,
+        ...options,
+    };
 };
 exports.mergeOptions = mergeOptions;
 const createCli = () => {
@@ -84,17 +74,17 @@ const createCli = () => {
     let isRestart = false;
     let restartWithExistingPort = 0;
     let restartOptions;
-    const init = (argv = [], options) => __awaiter(void 0, void 0, void 0, function* () {
+    const init = async (argv = [], options) => {
         var _a, _b;
         (0, node_1.enable)();
         manager_1.manager.clear();
         const mergedOptions = (0, exports.mergeOptions)(options);
         restartOptions = mergedOptions;
-        const appDirectory = yield initAppDir();
+        const appDirectory = await initAppDir();
         (0, commander_1.initCommandsMap)();
         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 = yield (0, config_1.loadUserConfig)(appDirectory, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.configFile, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.packageJsonConfig);
+        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, {
             internalPlugins: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.plugins,
             transformPlugin: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.transformPlugin,
@@ -113,10 +103,10 @@ const createCli = () => {
             context_1.ConfigContext.set(loaded.config);
             context_1.AppContext.set(appContext);
         });
-        hooksRunner = yield manager_1.manager.init();
+        hooksRunner = await manager_1.manager.init();
         ['SIGINT', 'SIGTERM', 'unhandledRejection', 'uncaughtException'].forEach(event => {
-            process.on(event, (err) => __awaiter(void 0, void 0, void 0, function* () {
-                yield hooksRunner.beforeExit();
+            process.on(event, async (err) => {
+                await hooksRunner.beforeExit();
                 if (err instanceof Error) {
                     utils_1.logger.error(err.stack);
                 }
@@ -124,53 +114,58 @@ const createCli = () => {
                     // eslint-disable-next-line no-process-exit
                     process.exit(1);
                 });
-            }));
+            });
         });
-        const extraConfigs = yield hooksRunner.config();
-        const extraSchemas = yield hooksRunner.validateSchema();
-        const config = yield (0, config_1.resolveConfig)(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv, options === null || options === void 0 ? void 0 : options.onSchemaError);
-        const { resolved } = yield hooksRunner.resolvedConfig({
+        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 { resolved } = await hooksRunner.resolvedConfig({
             resolved: config,
         });
         // update context value
         manager_1.manager.run(() => {
             context_1.ConfigContext.set(loaded.config);
             context_1.ResolvedConfigContext.set(resolved);
-            context_1.AppContext.set(Object.assign(Object.assign({}, appContext), { port: resolved.server.port, distDirectory: (0, utils_1.ensureAbsolutePath)(appDirectory, resolved.output.path) }));
-        });
-        yield hooksRunner.prepare();
-        return { loadedConfig: loaded, appContext, resolved };
-    });
-    function run(argv, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { loadedConfig, appContext, resolved } = yield init(argv, options);
-            yield hooksRunner.commands({ program: utils_1.program });
-            (0, initWatcher_1.initWatcher)(loadedConfig, appContext.appDirectory, resolved.source.configDir, hooksRunner, argv);
-            manager_1.manager.run(() => utils_1.program.parse(process.argv));
+            context_1.AppContext.set({
+                ...appContext,
+                port: resolved.server.port,
+                distDirectory: (0, utils_1.ensureAbsolutePath)(appDirectory, resolved.output.path),
+            });
         });
+        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);
+        await hooksRunner.commands({ program: utils_1.program });
+        (0, initWatcher_1.initWatcher)(loadedConfig, appContext.appDirectory, resolved.source.configDir, hooksRunner, argv);
+        manager_1.manager.run(() => utils_1.program.parse(process.argv));
     }
-    function restart() {
+    async function restart() {
         var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            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();
-            yield runner.beforeRestart();
-            try {
-                yield init(process.argv.slice(2), restartOptions);
-            }
-            catch (err) {
-                console.error(err);
-                hasGetError = true;
+        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) {
+                manager_1.manager.run(() => utils_1.program.parse(process.argv));
             }
-            finally {
-                if (!hasGetError) {
-                    manager_1.manager.run(() => utils_1.program.parse(process.argv));
-                }
-            }
-        });
+        }
     }
     return {
         init,

package/dist/initWatcher.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -20,10 +11,10 @@ const utils_1 = require("@modern-js/utils");
 const debug = (0, utils_1.createDebugger)('watch-files');
 const md5 = (data) => crypto_1.default.createHash('md5').update(data).digest('hex');
 const hashMap = new Map();
-const initWatcher = (loaded, appDirectory, configDir, hooksRunner, argv) => __awaiter(void 0, void 0, void 0, function* () {
+const initWatcher = async (loaded, appDirectory, configDir, hooksRunner, argv) => {
     // only add fs watcher on dev mode.
     if (((0, utils_1.isDev)() || (0, utils_1.isTest)()) && argv[0] === 'dev') {
-        const extraFiles = yield hooksRunner.watchFiles();
+        const extraFiles = await hooksRunner.watchFiles();
         const configPath = path_1.default.join(appDirectory, configDir);
         const watched = [
             `${configPath}/html`,
@@ -71,5 +62,5 @@ const initWatcher = (loaded, appDirectory, configDir, hooksRunner, argv) => __aw
         });
         return watcher;
     }
-});
+};
 exports.initWatcher = initWatcher;

package/dist/loadPlugins.d.ts

@@ -10,7 +10,7 @@ export declare type LoadedPlugin = {
 export declare type TransformPlugin = (plugin: PluginConfig, resolvedConfig: UserConfig, pluginOptions?: any) => PluginConfig;
 /**
  * @deprecated
- * Using NewPluginConfig insteand.
+ * Using NewPluginConfig instead.
  */
 declare type OldPluginConfig = Array<PluginItem | {
     cli?: PluginItem;