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

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;
-        const appDirectory = await initAppDir();
+        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,57 +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 : {};
+        await init(coreOptions);
+        await hooksRunner.commands({ program: newProgram });
+        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<{}, {}, {}, {}>[]>;

package/dist/loadPlugins.js

@@ -4,11 +4,18 @@ exports.loadPlugins = exports.isOldPluginConfig = void 0;
 const utils_1 = require("@modern-js/utils");
 const manager_1 = require("./manager");
 const debug = (0, utils_1.createDebugger)('load-plugins');
-const resolveCliPlugin = (p, userConfig, appDirectory, transformPlugin) => {
+const resolveCliPlugin = async (p, userConfig, appDirectory, transformPlugin) => {
     const pkg = typeof p === 'string' ? p : p[0];
     const pluginOptions = typeof p === 'string' ? undefined : p[1];
     const path = (0, utils_1.tryResolve)(pkg, appDirectory);
-    let module = (0, utils_1.compatRequire)(path);
+    let module;
+    try {
+        module = (0, utils_1.compatRequire)(path);
+    }
+    catch (e) {
+        // load esm module
+        ({ default: module } = await (0, utils_1.dynamicImport)(path));
+    }
     if (transformPlugin) {
         module = transformPlugin(module, userConfig, pluginOptions);
     }
@@ -31,18 +38,18 @@ exports.isOldPluginConfig = isOldPluginConfig;
  * @param options.transformPlugin - transform plugin before using it. Used for compatible with legacy jupiter plugins.
  * @returns Plugin Objects has been required.
  */
-const loadPlugins = (appDirectory, userConfig, options = {}) => {
+const loadPlugins = async (appDirectory, userConfig, options = {}) => {
     const pluginConfig = userConfig.plugins;
     const plugins = [
         ...(0, utils_1.getInternalPlugins)(appDirectory, options.internalPlugins),
         ...((0, exports.isOldPluginConfig)(pluginConfig) ? pluginConfig : []),
     ];
-    const loadedPlugins = plugins.map(plugin => {
+    const loadedPlugins = await Promise.all(plugins.map(plugin => {
         const loadedPlugin = resolveCliPlugin(plugin, userConfig, appDirectory, options.transformPlugin);
         // server plugins don't support to accept params
         debug(`resolve plugin %s: %s`, plugin, loadedPlugin);
         return loadedPlugin;
-    });
+    }));
     if (!(0, exports.isOldPluginConfig)(pluginConfig)) {
         if (pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.length) {
             loadedPlugins.push(...pluginConfig.map(item => (0, manager_1.createPlugin)(item.setup, item)));

package/dist/manager.d.ts

@@ -1,71 +1,87 @@
-import { ToThreads, ToRunners, AsyncSetup, PluginOptions, AsyncWorkflow, AsyncWaterfall, ParallelWorkflow } from '@modern-js/plugin';
-import type { Hooks } from './types';
-import type { Command } from './utils/commander';
-import type { NormalizedConfig } from './config/mergeConfig';
-import type { UserConfig } from './config';
-import { pluginAPI } from './pluginAPI';
-export declare type HooksRunner = ToRunners<{
-    config: ParallelWorkflow<void, UserConfig>;
-    resolvedConfig: AsyncWaterfall<{
-        resolved: NormalizedConfig;
+import { BasePluginAPI } from './types';
+export declare const manager: import("@modern-js/plugin").AsyncManager<{
+    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
+    resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
+        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
     }>;
-    validateSchema: ParallelWorkflow<void>;
-    prepare: AsyncWorkflow<void, void>;
-    commands: AsyncWorkflow<{
-        program: Command;
+    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    commands: import("@modern-js/plugin").AsyncWorkflow<{
+        program: import("@modern-js/utils").Command;
     }, void>;
-    watchFiles: ParallelWorkflow<void>;
-    fileChange: AsyncWorkflow<{
-        filename: string;
-        eventType: 'add' | 'change' | 'unlink';
+    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
+}, BasePluginAPI<{}, {}, {}, {}>>;
+export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSetup<{
+    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
+    resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
+        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+    }>;
+    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    commands: import("@modern-js/plugin").AsyncWorkflow<{
+        program: import("@modern-js/utils").Command;
     }, void>;
-    beforeExit: AsyncWorkflow<void, void>;
-    beforeRestart: AsyncWorkflow<void, void>;
-}>;
-declare const baseHooks: {
-    config: ParallelWorkflow<void, UserConfig>;
-    resolvedConfig: AsyncWaterfall<{
-        resolved: NormalizedConfig;
+    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
+}, BasePluginAPI<{}, {}, {}, {}>> | undefined, options?: import("@modern-js/plugin").PluginOptions<{
+    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
+    resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
+        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
     }>;
-    validateSchema: ParallelWorkflow<void, unknown>;
-    prepare: AsyncWorkflow<void, void>;
-    commands: AsyncWorkflow<{
-        program: Command;
+    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    commands: import("@modern-js/plugin").AsyncWorkflow<{
+        program: import("@modern-js/utils").Command;
     }, void>;
-    watchFiles: ParallelWorkflow<void, unknown>;
-    fileChange: AsyncWorkflow<{
-        filename: string;
-        eventType: 'add' | 'change' | 'unlink';
+    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
+}, import("@modern-js/plugin").AsyncSetup<{
+    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
+    resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
+        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+    }>;
+    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    commands: import("@modern-js/plugin").AsyncWorkflow<{
+        program: import("@modern-js/utils").Command;
+    }, void>;
+    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
+}, BasePluginAPI<{}, {}, {}, {}>>, Record<string, unknown>, any, any> | undefined) => import("@modern-js/plugin").AsyncPlugin<{
+    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
+    resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
+        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+    }>;
+    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    commands: import("@modern-js/plugin").AsyncWorkflow<{
+        program: import("@modern-js/utils").Command;
+    }, void>;
+    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
+}, BasePluginAPI<{}, {}, {}, {}>>, registerHook: (newHooks: Partial<{
+    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
+    resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
+        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+    }>;
+    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    commands: import("@modern-js/plugin").AsyncWorkflow<{
+        program: import("@modern-js/utils").Command;
+    }, void>;
+    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
+}>) => void, mountHook: () => import("@modern-js/plugin").ToRunners<{
+    config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
+    resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
+        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+    }>;
+    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    commands: import("@modern-js/plugin").AsyncWorkflow<{
+        program: import("@modern-js/utils").Command;
     }, void>;
-    beforeExit: AsyncWorkflow<void, void>;
-    beforeRestart: AsyncWorkflow<void, void>;
-};
-/** All hooks of cli plugin. */
-export declare type CliHooks = typeof baseHooks & Hooks;
-/** All hook callbacks of cli plugin. */
-export declare type CliHookCallbacks = ToThreads<CliHooks>;
-export declare const manager: import("@modern-js/plugin").AsyncManager<CliHooks, {
-    setAppContext: (value: import("@modern-js/types/cli").IAppContext) => void;
-    useAppContext: () => import("@modern-js/types/cli").IAppContext;
-    useConfigContext: () => UserConfig;
-    useResolvedConfigContext: () => NormalizedConfig;
+    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
 }>;
-/** Plugin options of a cli plugin. */
-export declare type CliPlugin<ExtendHooks = {}> = PluginOptions<CliHooks, AsyncSetup<CliHooks & ExtendHooks, typeof pluginAPI>, ExtendHooks>;
-export declare const createPlugin: (setup?: AsyncSetup<CliHooks, {
-    setAppContext: (value: import("@modern-js/types/cli").IAppContext) => void;
-    useAppContext: () => import("@modern-js/types/cli").IAppContext;
-    useConfigContext: () => UserConfig;
-    useResolvedConfigContext: () => NormalizedConfig;
-}> | undefined, options?: PluginOptions<CliHooks, AsyncSetup<CliHooks, {
-    setAppContext: (value: import("@modern-js/types/cli").IAppContext) => void;
-    useAppContext: () => import("@modern-js/types/cli").IAppContext;
-    useConfigContext: () => UserConfig;
-    useResolvedConfigContext: () => NormalizedConfig;
-}>, Record<string, unknown>> | undefined) => import("@modern-js/plugin").AsyncPlugin<CliHooks, {
-    setAppContext: (value: import("@modern-js/types/cli").IAppContext) => void;
-    useAppContext: () => import("@modern-js/types/cli").IAppContext;
-    useConfigContext: () => UserConfig;
-    useResolvedConfigContext: () => NormalizedConfig;
-}>, registerHook: (newHooks: Partial<CliHooks>) => void, mountHook: () => ToRunners<CliHooks>;
-export {};

package/dist/manager.js

@@ -2,17 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mountHook = exports.registerHook = exports.createPlugin = exports.manager = void 0;
 const plugin_1 = require("@modern-js/plugin");
-const pluginAPI_1 = require("./pluginAPI");
+const context_1 = require("./context");
+// eslint-disable-next-line @typescript-eslint/ban-types
 const baseHooks = {
     config: (0, plugin_1.createParallelWorkflow)(),
     resolvedConfig: (0, plugin_1.createAsyncWaterfall)(),
     validateSchema: (0, plugin_1.createParallelWorkflow)(),
     prepare: (0, plugin_1.createAsyncWorkflow)(),
     commands: (0, plugin_1.createAsyncWorkflow)(),
-    watchFiles: (0, plugin_1.createParallelWorkflow)(),
-    fileChange: (0, plugin_1.createAsyncWorkflow)(),
     beforeExit: (0, plugin_1.createAsyncWorkflow)(),
-    beforeRestart: (0, plugin_1.createAsyncWorkflow)(),
+    addRuntimeExports: (0, plugin_1.createAsyncWaterfall)(),
 };
-exports.manager = (0, plugin_1.createAsyncManager)(baseHooks, pluginAPI_1.pluginAPI);
+// eslint-disable-next-line @typescript-eslint/ban-types
+const pluginAPI = {
+    setAppContext: context_1.setAppContext,
+    useAppContext: context_1.useAppContext,
+    useConfigContext: context_1.useConfigContext,
+    useResolvedConfigContext: context_1.useResolvedConfigContext,
+};
+exports.manager = (0, plugin_1.createAsyncManager)(baseHooks, pluginAPI);
 exports.createPlugin = exports.manager.createPlugin, exports.registerHook = exports.manager.registerHook, exports.mountHook = exports.manager.useRunner;

package/dist/schema/patchSchema.d.ts

@@ -0,0 +1,19 @@
+import { PluginValidateSchema } from '../types';
+export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | PluginValidateSchema[]>) => {
+    type: string;
+    properties: {
+        testing: {
+            type: string;
+            additionalProperties: boolean;
+            properties: {
+                transformer: {
+                    type: string;
+                    enum: string[];
+                };
+                jest: {
+                    typeof: string[];
+                };
+            };
+        };
+    };
+};

package/dist/{config/schema/index.js → schema/patchSchema.js}

@@ -1,45 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.traverseSchema = exports.patchSchema = void 0;
+exports.patchSchema = void 0;
 const utils_1 = require("@modern-js/utils");
 const lodash_1 = require("@modern-js/utils/lodash");
-const source_1 = require("./source");
-const output_1 = require("./output");
-const server_1 = require("./server");
-const deploy_1 = require("./deploy");
-const tools_1 = require("./tools");
+const testing_1 = require("./testing");
 const debug = (0, utils_1.createDebugger)('validate-schema');
-const plugins = {
-    type: 'array',
-    additionalProperties: false,
-};
-const dev = {
-    type: 'object',
-    properties: {
-        assetPrefix: { type: ['boolean', 'string'] },
-        https: {
-            type: 'boolean',
-        },
-    },
-    additionalProperties: false,
-};
 const patchSchema = (pluginSchemas) => {
     const finalSchema = (0, lodash_1.cloneDeep)({
         type: 'object',
-        additionalProperties: false,
         properties: {
-            source: source_1.source,
-            output: output_1.output,
-            server: server_1.server,
-            deploy: deploy_1.deploy,
-            plugins,
-            dev,
-            tools: tools_1.tools,
+            testing: testing_1.testing,
         },
     });
     const findTargetNode = (props) => {
         let node = finalSchema.properties;
         for (const prop of props) {
+            if (!node[prop]) {
+                node[prop] = {
+                    type: 'object',
+                };
+            }
             node = node[prop];
             if (!node || !(0, utils_1.isObject)(node)) {
                 throw new Error(`add schema ${props.join('.')} error`);
@@ -75,20 +55,3 @@ const patchSchema = (pluginSchemas) => {
     return finalSchema;
 };
 exports.patchSchema = patchSchema;
-const traverseSchema = (schema) => {
-    const keys = [];
-    const traverse = ({ properties }, old = []) => {
-        for (const key of Object.keys(properties)) {
-            const current = [...old, key];
-            if (properties[key].type === 'object' && properties[key].properties) {
-                traverse(properties[key], current);
-            }
-            else {
-                keys.push(current.join('.'));
-            }
-        }
-    };
-    traverse(schema);
-    return keys;
-};
-exports.traverseSchema = traverseSchema;

package/dist/schema/source.d.ts

@@ -0,0 +1,9 @@
+export declare const source: {
+    type: string;
+    additionalProperties: boolean;
+    properties: {
+        designSystem: {
+            type: string;
+        };
+    };
+};

package/dist/schema/source.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.source = void 0;
+exports.source = {
+    type: 'object',
+    additionalProperties: false,
+    properties: {
+        designSystem: { type: 'object' },
+    },
+};

package/dist/schema/testing.d.ts

@@ -0,0 +1,13 @@
+export declare const testing: {
+    type: string;
+    additionalProperties: boolean;
+    properties: {
+        transformer: {
+            type: string;
+            enum: string[];
+        };
+        jest: {
+            typeof: string[];
+        };
+    };
+};

package/dist/schema/testing.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.testing = void 0;
+exports.testing = {
+    type: 'object',
+    additionalProperties: false,
+    properties: {
+        transformer: { type: 'string', enum: ['babel-jest', 'ts-jest'] },
+        jest: { typeof: ['object', 'function'] },
+    },
+};

package/dist/schema/traverseSchema.d.ts

@@ -0,0 +1,2 @@
+import { patchSchema } from './patchSchema';
+export declare const traverseSchema: (schema: ReturnType<typeof patchSchema>) => string[];

package/dist/schema/traverseSchema.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.traverseSchema = void 0;
+const traverseSchema = (schema) => {
+    const keys = [];
+    const traverse = ({ properties }, old = []) => {
+        for (const key of Object.keys(properties)) {
+            const current = [...old, key];
+            if (properties[key].type === 'object' && properties[key].properties) {
+                traverse(properties[key], current);
+            }
+            else {
+                keys.push(current.join('.'));
+            }
+        }
+    };
+    traverse(schema);
+    return keys;
+};
+exports.traverseSchema = traverseSchema;

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

@@ -0,0 +1,41 @@
+import { PluginConfig } from '../plugin';
+import type { BaseTestingNormalizedConfig, BaseTestingUserConfig } from './testing';
+export type { Jest as JestConfig, BaseTestingUserConfig as TestConfig, } from './testing';
+declare type DropUndefined<T> = T extends undefined ? never : T;
+export declare type UserConfig<Extends extends {
+    hooks?: ExtendHooks;
+    userConfig?: ExtendUserConfig;
+    normalizedConfig?: ExtendNormalizedConfig;
+} = {}, ExtendHooks extends Record<string, any> = {}, ExtendUserConfig extends {
+    source?: Record<string, any>;
+    tools?: Record<string, any>;
+    testing?: Record<string, any>;
+    [property: string]: any;
+} = {}, ExtendNormalizedConfig extends Record<string, any> = {}> = {
+    testing?: BaseTestingUserConfig<DropUndefined<Extends['userConfig']>['testing']>;
+    plugins?: PluginConfig<Extends>;
+} & Omit<Extends['userConfig'], 'plugins' | 'testing'>;
+export declare type NormalizedConfig<Extends extends {
+    hooks?: ExtendHooks;
+    userConfig?: ExtendUserConfig;
+    normalizedConfig?: ExtendNormalizedConfig;
+} = {}, ExtendHooks extends Record<string, any> = {}, ExtendUserConfig extends Record<string, any> = {}, ExtendNormalizedConfig extends {
+    source?: Record<string, any>;
+    tools?: Record<string, any>;
+    testing?: Record<string, any>;
+    [property: string]: any;
+} = {}> = {
+    plugins: PluginConfig<Extends>;
+    testing: BaseTestingNormalizedConfig<DropUndefined<Extends['normalizedConfig']>['testing']>;
+} & Omit<Extends['normalizedConfig'], 'plugins' | 'testing'>;
+export declare type LoadedConfig<Extends extends {
+    hooks?: ExtendHooks;
+    userConfig?: ExtendUserConfig;
+} = {}, ExtendHooks extends {} = {}, ExtendUserConfig extends Record<string, any> = {}> = {
+    config: UserConfig<Extends>;
+    filePath: string | false;
+    dependencies: string[];
+    pkgConfig: UserConfig<Extends>;
+    jsConfig: UserConfig<Extends>;
+};
+export declare type ConfigParams = UserConfig | Promise<UserConfig> | ((env: any) => UserConfig | Promise<UserConfig>);

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

@@ -0,0 +1,15 @@
+import type { JestConfigTypes, Merge } from '@modern-js/types';
+export declare type Jest = JestConfigTypes.InitialOptions;
+export declare type BaseTestingUserConfig<ExtendTestingUserConfig = {}> = Merge<{
+    /**
+     * Decide which transformer will be used to compile file
+     * Default: babel-jest
+     */
+    transformer?: 'babel-jest' | 'ts-jest';
+    /**
+     * Original jest config
+     * Doc: https://jestjs.io/docs/configuration
+     */
+    jest?: Jest | ((jestConfig: Jest) => Jest);
+}, ExtendTestingUserConfig>;
+export declare type BaseTestingNormalizedConfig<ExtendTestingNormailzedConfig = {}> = BaseTestingUserConfig<ExtendTestingNormailzedConfig>;