@modern-js/core 1.1.2 → 1.1.3

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @modern-js/core
 
+## 1.1.3
+
+### Patch Changes
+
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server conifg
+- d4fcc73a: add options.plugins:
+- 085a6a58: support server runtime
+- ed1f6b12: feat: support build --analyze
+- a5ebbb00: fix: remove enableUsageBuiltIns config
+- 085a6a58: feat: refactor server plugin
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+- Updated dependencies [d280ea33]
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+  - @modern-js/utils@1.1.3
+
 ## 1.1.2
 
 ### Patch Changes

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

@@ -107,9 +107,6 @@ export const output = {
     enableLatestDecorators: {
       type: 'boolean'
     },
-    enableUsageBuiltIns: {
-      type: 'boolean'
-    },
     enableTsLoader: {
       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(),
@@ -36,7 +37,7 @@ export const {
   useRunner: mountHook
 } = manager;
 export const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin(compatRequire(require.resolve(plugin))));
-export { defineConfig, AppContext, useAppContext, useConfigContext, useResolvedConfigContext };
+export { defineConfig, AppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, ConfigContext };
 
 const initAppDir = async () => {
   const pkg = await pkgUp({
@@ -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);
@@ -144,4 +150,5 @@ const createCli = () => {
   };
 };
 
-export const cli = createCli();
+export const cli = createCli();
+export { loadUserConfig, initAppDir, initAppContext };

package/dist/js/node/config/schema/output.js

@@ -115,9 +115,6 @@ const output = {
     enableLatestDecorators: {
       type: 'boolean'
     },
-    enableUsageBuiltIns: {
-      type: 'boolean'
-    },
     enableTsLoader: {
       type: 'boolean'
     },

package/dist/js/node/index.js

@@ -10,10 +10,15 @@ var _exportNames = {
   mountHook: true,
   usePlugins: true,
   cli: true,
+  initAppDir: true,
   defineConfig: true,
+  loadUserConfig: true,
   defaultsConfig: true,
   mergeConfig: true,
   AppContext: true,
+  ConfigContext: true,
+  initAppContext: true,
+  ResolvedConfigContext: true,
   useAppContext: true,
   useConfigContext: true,
   useResolvedConfigContext: true
@@ -24,6 +29,18 @@ Object.defineProperty(exports, "AppContext", {
     return _context.AppContext;
   }
 });
+Object.defineProperty(exports, "ConfigContext", {
+  enumerable: true,
+  get: function () {
+    return _context.ConfigContext;
+  }
+});
+Object.defineProperty(exports, "ResolvedConfigContext", {
+  enumerable: true,
+  get: function () {
+    return _context.ResolvedConfigContext;
+  }
+});
 exports.createPlugin = exports.cli = void 0;
 Object.defineProperty(exports, "defaultsConfig", {
   enumerable: true,
@@ -37,6 +54,19 @@ Object.defineProperty(exports, "defineConfig", {
     return _config.defineConfig;
   }
 });
+Object.defineProperty(exports, "initAppContext", {
+  enumerable: true,
+  get: function () {
+    return _context.initAppContext;
+  }
+});
+exports.initAppDir = void 0;
+Object.defineProperty(exports, "loadUserConfig", {
+  enumerable: true,
+  get: function () {
+    return _config.loadUserConfig;
+  }
+});
 exports.manager = void 0;
 Object.defineProperty(exports, "mergeConfig", {
   enumerable: true,
@@ -121,6 +151,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)(),
@@ -157,6 +188,8 @@ const initAppDir = async () => {
   return _path.default.dirname(pkg);
 };
 
+exports.initAppDir = initAppDir;
+
 const createCli = () => {
   let hooksRunner;
   let isRestart = false;
@@ -166,8 +199,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);
@@ -197,7 +230,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/mergeConfig.d.ts

@@ -17,6 +17,7 @@ export interface NormalizedToolsConfig extends Omit<ToolsConfig, 'webpack' | 'ba
 export interface NormalizedConfig extends Omit<Required<UserConfig>, 'source' | 'tools'> {
   source: NormalizedSourceConfig;
   tools: NormalizedToolsConfig;
+  cliOptions?: Record<string, any>;
   _raw: UserConfig;
 }
 /**

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

@@ -173,9 +173,6 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
         enableLatestDecorators: {
           type: string;
         };
-        enableUsageBuiltIns: {
-          type: string;
-        };
         enableTsLoader: {
           type: string;
         };

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

@@ -106,9 +106,6 @@ export declare const output: {
     enableLatestDecorators: {
       type: string;
     };
-    enableUsageBuiltIns: {
-      type: string;
-    };
     enableTsLoader: {
       type: string;
     };

package/dist/types/index.d.ts

@@ -1,9 +1,9 @@
 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';
-import { AppContext, IAppContext, useAppContext, useConfigContext, useResolvedConfigContext } from './context';
+import { defineConfig, loadUserConfig, UserConfig, ToolsConfig } from './config';
+import { AppContext, ConfigContext, IAppContext, initAppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext } from './context';
 import { NormalizedConfig } from './config/mergeConfig';
 export type { Hooks };
 export { defaultsConfig, mergeConfig } 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<{
@@ -73,10 +88,11 @@ export declare const createPlugin: (initializer: import("@modern-js/plugin").Asy
   beforeExit: AsyncWorkflow<void, void>;
 } & import("@modern-js/plugin").ClearDraftProgress<Hooks>>;
 export declare const usePlugins: (plugins: string[]) => void;
-export { defineConfig, AppContext, useAppContext, useConfigContext, useResolvedConfigContext };
+export { defineConfig, AppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, ConfigContext };
 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;
@@ -91,4 +107,5 @@ export declare const cli: {
   }>;
   run: (argv: string[], options?: CoreOptions | undefined) => Promise<void>;
   restart: () => Promise<void>;
-};
+};
+export { loadUserConfig, initAppDir, initAppContext };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.2",
+  "version": "1.1.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -40,7 +40,7 @@
     "@babel/runtime": "^7",
     "@modern-js/load-config": "^1.1.1",
     "@modern-js/plugin": "^1.1.2",
-    "@modern-js/utils": "^1.1.2",
+    "@modern-js/utils": "^1.1.3",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",
@@ -66,8 +66,8 @@
     "@types/react-dom": "^17",
     "@types/signale": "^1.4.2",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.1.0",
-    "@modern-js/module-tools": "^1.1.0"
+    "@modern-js/plugin-testing": "^1.1.1",
+    "@modern-js/module-tools": "^1.1.1"
   },
   "sideEffects": false,
   "modernConfig": {

package/src/config/mergeConfig.ts

@@ -43,6 +43,7 @@ export interface NormalizedConfig
   extends Omit<Required<UserConfig>, 'source' | 'tools'> {
   source: NormalizedSourceConfig;
   tools: NormalizedToolsConfig;
+  cliOptions?: Record<string, any>;
   _raw: UserConfig;
 }
 

package/src/config/schema/output.ts

@@ -46,7 +46,6 @@ export const output = {
     disableInlineRuntimeChunk: { type: 'boolean' },
     disableAssetsCache: { type: 'boolean' },
     enableLatestDecorators: { type: 'boolean' },
-    enableUsageBuiltIns: { type: 'boolean' },
     enableTsLoader: { type: 'boolean' },
     dataUriLimit: { type: 'number' },
     templateParameters: { type: 'object' },

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>(),
@@ -111,9 +119,11 @@ export const usePlugins = (plugins: string[]) =>
 export {
   defineConfig,
   AppContext,
+  ResolvedConfigContext,
   useAppContext,
   useConfigContext,
   useResolvedConfigContext,
+  ConfigContext,
 };
 
 export type { NormalizedConfig, IAppContext, UserConfig, ToolsConfig };
@@ -131,7 +141,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 +159,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 +201,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 +209,10 @@ const createCli = () => {
       argv,
     );
 
+    const { resolved } = await hooksRunner.resolvedConfig({
+      resolved: config,
+    });
+
     // update context value
     manager.run(() => {
       ConfigContext.set(loaded.config);
@@ -252,3 +270,5 @@ const createCli = () => {
 };
 
 export const cli = createCli();
+
+export { loadUserConfig, initAppDir, initAppContext };