@modern-js/core 0.0.0-canary-202111382413 → 0.0.0-options-202112061443

package/CHANGELOG.md

@@ -1,13 +1,5 @@
 # @modern-js/core
 
-## 0.0.0-canary-202111382413
-
-### Patch Changes
-
-- fda2d7f0: support server runtime
-- Updated dependencies [fda2d7f0]
-  - @modern-js/utils@0.0.0-canary-202111382413
-
 ## 1.1.2
 
 ### Patch Changes

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-canary-202111382413",
+  "version": "0.0.0-options-202112061443",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,12 +35,20 @@
     }
   },
   "bin": "./bin/modern-js.js",
+  "scripts": {
+    "prepare": "pnpm build",
+    "prepublishOnly": "pnpm build -- --platform",
+    "new": "modern new",
+    "build": "modern build",
+    "dev": "modern build --watch",
+    "test": "modern test --passWithNoTests"
+  },
   "dependencies": {
     "@babel/code-frame": "^7.14.5",
     "@babel/runtime": "^7",
     "@modern-js/load-config": "^1.1.1",
     "@modern-js/plugin": "^1.1.2",
-    "@modern-js/utils": "^0.0.0-canary-202111382413",
+    "@modern-js/utils": "^1.1.2",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",
@@ -78,11 +86,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
-  },
-  "scripts": {
-    "new": "modern new",
-    "build": "modern build",
-    "dev": "modern build --watch",
-    "test": "modern test --passWithNoTests"
   }
-}
+}

package/src/index.ts

@@ -13,6 +13,8 @@ import {
   ParallelWorkflow,
   AsyncWorkflow,
   Progresses2Runners,
+  createAsyncWaterfall,
+  AsyncWaterfall,
 } from '@modern-js/plugin';
 import { enable } from '@modern-js/plugin/node';
 
@@ -53,6 +55,9 @@ program
 
 export type HooksRunner = Progresses2Runners<{
   config: ParallelWorkflow<void>;
+  resolvedConfig: AsyncWaterfall<{
+    resolved: NormalizedConfig;
+  }>;
   validateSchema: ParallelWorkflow<void>;
   prepare: AsyncWorkflow<void, void>;
   commands: AsyncWorkflow<
@@ -73,6 +78,9 @@ export type HooksRunner = Progresses2Runners<{
 
 const hooksMap = {
   config: createParallelWorkflow(),
+  resolvedConfig: createAsyncWaterfall<{
+    resolved: NormalizedConfig;
+  }>(),
   validateSchema: createParallelWorkflow(),
   // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
   prepare: createAsyncWorkflow<void, void>(),
@@ -131,7 +139,7 @@ const initAppDir = async (): Promise<string> => {
 };
 
 export interface CoreOptions {
-  name?: string;
+  configFile?: string;
   plugins?: typeof INTERNAL_PLUGINS;
   beforeUsePlugins: (plugins: any, config: any) => { cli: any; server: any }[];
 }
@@ -149,9 +157,13 @@ const createCli = () => {
 
     loadEnv(appDirectory);
 
-    const loaded = await loadUserConfig(appDirectory);
+    const loaded = await loadUserConfig(appDirectory, options?.configFile);
 
-    let plugins = loadPlugins(appDirectory, loaded.config.plugins || []);
+    let plugins = loadPlugins(
+      appDirectory,
+      loaded.config.plugins || [],
+      options?.plugins,
+    );
 
     if (options?.beforeUsePlugins) {
       plugins = options.beforeUsePlugins(plugins, loaded.config);
@@ -187,7 +199,7 @@ const createCli = () => {
 
     const extraSchemas = await hooksRunner.validateSchema();
 
-    const resolved = await resolveConfig(
+    const config = await resolveConfig(
       loaded,
       extraConfigs as any,
       extraSchemas as any,
@@ -195,6 +207,10 @@ const createCli = () => {
       argv,
     );
 
+    const { resolved } = await hooksRunner.resolvedConfig({
+      resolved: config,
+    });
+
     // update context value
     manager.run(() => {
       ConfigContext.set(loaded.config);