@modern-js/core 0.0.0-options-202112061443 → 0.0.0-options-202112061447

package/dist/js/modern/index.js

@@ -6,7 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import path from 'path';
 import { compatRequire, pkgUp, ensureAbsolutePath, logger } from '@modern-js/utils';
-import { createAsyncManager, createAsyncWorkflow, createParallelWorkflow } from '@modern-js/plugin';
+import { createAsyncManager, createAsyncWorkflow, createParallelWorkflow, createAsyncWaterfall } from '@modern-js/plugin';
 import { enable } from '@modern-js/plugin/node';
 import { program } from "./utils/commander";
 import { resolveConfig, defineConfig, loadUserConfig } from "./config";
@@ -20,6 +20,7 @@ export * from '@modern-js/plugin/node';
 program.name('modern').usage('<command> [options]').version(process.env.MODERN_JS_VERSION || '0.1.0');
 const hooksMap = {
   config: createParallelWorkflow(),
+  resolvedConfig: createAsyncWaterfall(),
   validateSchema: createParallelWorkflow(),
   // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
   prepare: createAsyncWorkflow(),
@@ -59,8 +60,8 @@ const createCli = () => {
     manager.clear();
     const appDirectory = await initAppDir();
     loadEnv(appDirectory);
-    const loaded = await loadUserConfig(appDirectory);
-    let plugins = loadPlugins(appDirectory, loaded.config.plugins || []);
+    const loaded = await loadUserConfig(appDirectory, options === null || options === void 0 ? void 0 : options.configFile);
+    let plugins = loadPlugins(appDirectory, loaded.config.plugins || [], options === null || options === void 0 ? void 0 : options.plugins);
 
     if (options !== null && options !== void 0 && options.beforeUsePlugins) {
       plugins = options.beforeUsePlugins(plugins, loaded.config);
@@ -89,7 +90,12 @@ const createCli = () => {
     });
     const extraConfigs = await hooksRunner.config();
     const extraSchemas = await hooksRunner.validateSchema();
-    const resolved = await resolveConfig(loaded, extraConfigs, extraSchemas, isRestart, argv); // update context value
+    const config = await resolveConfig(loaded, extraConfigs, extraSchemas, isRestart, argv);
+    const {
+      resolved
+    } = await hooksRunner.resolvedConfig({
+      resolved: config
+    }); // update context value
 
     manager.run(() => {
       ConfigContext.set(loaded.config);

package/dist/js/node/index.js

@@ -137,6 +137,7 @@ _commander.program.name('modern').usage('<command> [options]').version(process.e
 
 const hooksMap = {
   config: (0, _plugin.createParallelWorkflow)(),
+  resolvedConfig: (0, _plugin.createAsyncWaterfall)(),
   validateSchema: (0, _plugin.createParallelWorkflow)(),
   // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
   prepare: (0, _plugin.createAsyncWorkflow)(),
@@ -184,8 +185,8 @@ const createCli = () => {
     manager.clear();
     const appDirectory = await initAppDir();
     (0, _loadEnv.loadEnv)(appDirectory);
-    const loaded = await (0, _config.loadUserConfig)(appDirectory);
-    let plugins = (0, _loadPlugins.loadPlugins)(appDirectory, loaded.config.plugins || []);
+    const loaded = await (0, _config.loadUserConfig)(appDirectory, options === null || options === void 0 ? void 0 : options.configFile);
+    let plugins = (0, _loadPlugins.loadPlugins)(appDirectory, loaded.config.plugins || [], options === null || options === void 0 ? void 0 : options.plugins);
 
     if (options !== null && options !== void 0 && options.beforeUsePlugins) {
       plugins = options.beforeUsePlugins(plugins, loaded.config);
@@ -215,7 +216,12 @@ const createCli = () => {
     });
     const extraConfigs = await hooksRunner.config();
     const extraSchemas = await hooksRunner.validateSchema();
-    const resolved = await (0, _config.resolveConfig)(loaded, extraConfigs, extraSchemas, isRestart, argv); // update context value
+    const config = await (0, _config.resolveConfig)(loaded, extraConfigs, extraSchemas, isRestart, argv);
+    const {
+      resolved
+    } = await hooksRunner.resolvedConfig({
+      resolved: config
+    }); // update context value
 
     manager.run(() => {
       _context.ConfigContext.set(loaded.config);

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
 import { INTERNAL_PLUGINS } from '@modern-js/utils';
-import { ParallelWorkflow, AsyncWorkflow, Progresses2Runners } from '@modern-js/plugin';
+import { ParallelWorkflow, AsyncWorkflow, Progresses2Runners, AsyncWaterfall } from '@modern-js/plugin';
 import type { Hooks } from '@modern-js/types';
 import { Command } from './utils/commander';
 import { defineConfig, loadUserConfig, UserConfig, ToolsConfig } from './config';
@@ -11,6 +11,9 @@ export * from '@modern-js/plugin';
 export * from '@modern-js/plugin/node';
 export declare type HooksRunner = Progresses2Runners<{
   config: ParallelWorkflow<void>;
+  resolvedConfig: AsyncWaterfall<{
+    resolved: NormalizedConfig;
+  }>;
   validateSchema: ParallelWorkflow<void>;
   prepare: AsyncWorkflow<void, void>;
   commands: AsyncWorkflow<{
@@ -24,6 +27,9 @@ export declare type HooksRunner = Progresses2Runners<{
 }>;
 export declare const manager: import("@modern-js/plugin").AsyncManager<Hooks, {
   config: ParallelWorkflow<void, unknown>;
+  resolvedConfig: AsyncWaterfall<{
+    resolved: NormalizedConfig;
+  }>;
   validateSchema: ParallelWorkflow<void, unknown>;
   prepare: AsyncWorkflow<void, void>;
   commands: AsyncWorkflow<{
@@ -37,6 +43,9 @@ export declare const manager: import("@modern-js/plugin").AsyncManager<Hooks, {
 }>;
 export declare const createPlugin: (initializer: import("@modern-js/plugin").AsyncInitializer<Partial<import("@modern-js/plugin").Progresses2Threads<{
   config: ParallelWorkflow<void, unknown>;
+  resolvedConfig: AsyncWaterfall<{
+    resolved: NormalizedConfig;
+  }>;
   validateSchema: ParallelWorkflow<void, unknown>;
   prepare: AsyncWorkflow<void, void>;
   commands: AsyncWorkflow<{
@@ -49,6 +58,9 @@ export declare const createPlugin: (initializer: import("@modern-js/plugin").Asy
   beforeExit: AsyncWorkflow<void, void>;
 } & import("@modern-js/plugin").ClearDraftProgress<Hooks>>>>, options?: import("@modern-js/plugin").PluginOptions | undefined) => import("@modern-js/plugin").AsyncPlugin<Partial<import("@modern-js/plugin").Progresses2Threads<{
   config: ParallelWorkflow<void, unknown>;
+  resolvedConfig: AsyncWaterfall<{
+    resolved: NormalizedConfig;
+  }>;
   validateSchema: ParallelWorkflow<void, unknown>;
   prepare: AsyncWorkflow<void, void>;
   commands: AsyncWorkflow<{
@@ -61,6 +73,9 @@ export declare const createPlugin: (initializer: import("@modern-js/plugin").Asy
   beforeExit: AsyncWorkflow<void, void>;
 } & import("@modern-js/plugin").ClearDraftProgress<Hooks>>>>, registerHook: (newShape: Partial<Hooks>) => void, mountHook: () => Progresses2Runners<{
   config: ParallelWorkflow<void, unknown>;
+  resolvedConfig: AsyncWaterfall<{
+    resolved: NormalizedConfig;
+  }>;
   validateSchema: ParallelWorkflow<void, unknown>;
   prepare: AsyncWorkflow<void, void>;
   commands: AsyncWorkflow<{
@@ -77,7 +92,7 @@ export { defineConfig, AppContext, useAppContext, useConfigContext, useResolvedC
 export type { NormalizedConfig, IAppContext, UserConfig, ToolsConfig };
 declare const initAppDir: () => Promise<string>;
 export interface CoreOptions {
-  name?: string;
+  configFile?: string;
   plugins?: typeof INTERNAL_PLUGINS;
   beforeUsePlugins: (plugins: any, config: any) => {
     cli: any;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-options-202112061443",
+  "version": "0.0.0-options-202112061447",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",