@modern-js/core 0.0.0-canary-20211129651 → 0.0.0-options-202112031434

package/CHANGELOG.md

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

package/dist/js/modern/config/schema/server.js

@@ -165,9 +165,6 @@ export const server = {
     },
     enableMicroFrontendDebug: {
       type: 'boolean'
-    },
-    disableUserExtension: {
-      type: 'boolean'
     }
   }
 };

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(),
@@ -60,7 +61,7 @@ const createCli = () => {
     const appDirectory = await initAppDir();
     loadEnv(appDirectory);
     const loaded = await loadUserConfig(appDirectory);
-    let plugins = loadPlugins(appDirectory, loaded.config.plugins || []);
+    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/config/schema/server.js

@@ -173,9 +173,6 @@ const server = {
     },
     enableMicroFrontendDebug: {
       type: 'boolean'
-    },
-    disableUserExtension: {
-      type: 'boolean'
     }
   }
 };

package/dist/js/node/index.js

@@ -121,6 +121,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)(),
@@ -167,7 +168,7 @@ const createCli = () => {
     const appDirectory = await initAppDir();
     (0, _loadEnv.loadEnv)(appDirectory);
     const loaded = await (0, _config.loadUserConfig)(appDirectory);
-    let plugins = (0, _loadPlugins.loadPlugins)(appDirectory, loaded.config.plugins || []);
+    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);
@@ -197,7 +198,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/config/index.d.ts

@@ -75,7 +75,6 @@ export interface ServerConfig {
   logger?: Record<string, string>;
   measure?: Record<string, string>;
   enableMicroFrontendDebug?: boolean;
-  disableUserExtension?: boolean;
 }
 export interface DevConfig {
   assetPrefix?: string | boolean;

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

@@ -391,9 +391,6 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
         enableMicroFrontendDebug: {
           type: string;
         };
-        disableUserExtension: {
-          type: string;
-        };
       };
     };
     deploy: {

package/dist/types/config/schema/server.d.ts

@@ -178,8 +178,5 @@ export declare const server: {
     enableMicroFrontendDebug: {
       type: string;
     };
-    disableUserExtension: {
-      type: string;
-    };
   };
 };

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, 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<{

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-canary-20211129651",
+  "version": "0.0.0-options-202112031434",
   "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-20211129651",
+    "@modern-js/load-config": "workspace:^1.1.1",
+    "@modern-js/plugin": "workspace:^1.1.2",
+    "@modern-js/utils": "workspace:^1.1.2",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",
@@ -57,7 +65,7 @@
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.3",
-    "@modern-js/types": "^1.1.2",
+    "@modern-js/types": "workspace:^1.1.2",
     "@types/jest": "^26",
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/lodash.mergewith": "^4.6.6",
@@ -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/config/index.ts

@@ -109,7 +109,6 @@ export interface ServerConfig {
   logger?: Record<string, string>;
   measure?: Record<string, string>;
   enableMicroFrontendDebug?: boolean;
-  disableUserExtension?: boolean;
 }
 
 export interface DevConfig {

package/src/config/schema/server.ts

@@ -102,6 +102,5 @@ export const server = {
     measure: { type: 'object' },
     proxy: { type: 'object' },
     enableMicroFrontendDebug: { type: 'boolean' },
-    disableUserExtension: { type: 'boolean' },
   },
 };

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>(),
@@ -151,7 +159,11 @@ const createCli = () => {
 
     const loaded = await loadUserConfig(appDirectory);
 
-    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);