@modern-js/core 1.1.1 → 1.1.4

package/CHANGELOG.md

@@ -1,5 +1,55 @@
 # @modern-js/core
 
+## 1.1.4
+
+### Patch Changes
+
+- d73ff455: support multi process product
+- d73ff455: support multi process product
+- d73ff455: support multi process product
+- d73ff455: support multi process product
+- d73ff455: support multi process product
+- Updated dependencies [d927bc83]
+- Updated dependencies [d73ff455]
+- Updated dependencies [9c1ab865]
+- Updated dependencies [d73ff455]
+- Updated dependencies [d73ff455]
+- Updated dependencies [d73ff455]
+- Updated dependencies [d73ff455]
+  - @modern-js/utils@1.1.4
+
+## 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
+
+- 6f7fe574: modern-js/core support extra options
+- 0fa83663: support more .env files
+- Updated dependencies [0fa83663]
+- Updated dependencies [f594fbc8]
+  - @modern-js/load-config@1.1.1
+  - @modern-js/plugin@1.1.2
+  - @modern-js/utils@1.1.2
+
 ## 1.1.1
 
 ### Patch Changes

package/dist/js/modern/config/index.js

@@ -1,6 +1,6 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

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

@@ -1,12 +1,12 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 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({
@@ -54,13 +55,18 @@ const createCli = () => {
   let hooksRunner;
   let isRestart = false;
 
-  const init = async (argv = []) => {
+  const init = async (argv = [], options) => {
     enable();
     manager.clear();
     const appDirectory = await initAppDir();
     loadEnv(appDirectory);
-    const loaded = await loadUserConfig(appDirectory);
-    const 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);
+    }
+
     plugins.forEach(plugin => plugin.cli && manager.usePlugin(plugin.cli));
     const appContext = initAppContext(appDirectory, plugins, loaded.filePath);
     manager.run(() => {
@@ -84,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);
@@ -102,12 +113,12 @@ const createCli = () => {
     };
   };
 
-  async function run(argv) {
+  async function run(argv, options) {
     const {
       loadedConfig,
       appContext,
       resolved
-    } = await init(argv);
+    } = await init(argv, options);
     await hooksRunner.commands({
       program
     });
@@ -139,4 +150,5 @@ const createCli = () => {
   };
 };
 
-export const cli = createCli();
+export const cli = createCli();
+export { loadUserConfig, initAppDir, initAppContext };

package/dist/js/modern/loadEnv.js

@@ -3,7 +3,9 @@ import path from 'path';
 import dotenv from 'dotenv';
 import dotenvExpand from 'dotenv-expand';
 export const loadEnv = (appDirectory, mode = process.env.NODE_ENV) => {
-  [`.env.${mode}`, '.env'].map(name => path.resolve(appDirectory, name)).filter(filePath => fs.existsSync(filePath) && !fs.statSync(filePath).isDirectory()).forEach(filePath => {
+  // Don't change the order of the filenames， since they are ordered by the priority.
+  // Files on the left have more priority than files on the right.
+  [`.env.${mode}.local`, '.env.local', `.env.${mode}`, '.env'].map(name => path.resolve(appDirectory, name)).filter(filePath => fs.existsSync(filePath) && !fs.statSync(filePath).isDirectory()).forEach(filePath => {
     const envConfig = dotenv.config({
       path: filePath
     });

package/dist/js/modern/loadPlugins.js

@@ -29,8 +29,8 @@ const resolvePlugin = (appDirectory, plugin) => {
 
   const resolved = {};
 
-  if (plugin.cli) {
-    resolved.cli = tryResolve(plugin.cli);
+  if (typeof plugin === 'string' || plugin.cli) {
+    resolved.cli = typeof plugin === 'string' ? tryResolve(plugin) : tryResolve(plugin.cli);
   }
 
   if (plugin.server) {
@@ -47,8 +47,8 @@ const resolvePlugin = (appDirectory, plugin) => {
  */
 
 
-export const loadPlugins = (appDirectory, pluginConfig) => {
-  const plugins = [...Object.keys(INTERNAL_PLUGINS).filter(name => isDepExists(appDirectory, name)).map(name => INTERNAL_PLUGINS[name]), ...pluginConfig];
+export const loadPlugins = (appDirectory, pluginConfig, internalPlugins) => {
+  const plugins = [...Object.keys(internalPlugins || INTERNAL_PLUGINS).filter(name => isDepExists(appDirectory, name)).map(name => (internalPlugins || INTERNAL_PLUGINS)[name]), ...pluginConfig];
   return plugins.map(plugin => {
     const {
       cli,
@@ -60,7 +60,9 @@ export const loadPlugins = (appDirectory, pluginConfig) => {
     });
     return {
       cli: cli && compatRequire(cli),
-      server: server && compatRequire(server)
+      cliPath: typeof plugin === 'string' ? plugin : plugin.cli,
+      server: server && compatRequire(server),
+      serverPath: typeof plugin === 'string' ? undefined : plugin.server
     };
   });
 };

package/dist/js/node/config/index.js

@@ -44,9 +44,9 @@ var _schema = require("./schema");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

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,
@@ -111,9 +141,9 @@ var _loadEnv = require("./loadEnv");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -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,17 +188,24 @@ const initAppDir = async () => {
   return _path.default.dirname(pkg);
 };
 
+exports.initAppDir = initAppDir;
+
 const createCli = () => {
   let hooksRunner;
   let isRestart = false;
 
-  const init = async (argv = []) => {
+  const init = async (argv = [], options) => {
     (0, _node.enable)();
     manager.clear();
     const appDirectory = await initAppDir();
     (0, _loadEnv.loadEnv)(appDirectory);
-    const loaded = await (0, _config.loadUserConfig)(appDirectory);
-    const 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);
+    }
+
     plugins.forEach(plugin => plugin.cli && manager.usePlugin(plugin.cli));
     const appContext = (0, _context.initAppContext)(appDirectory, plugins, loaded.filePath);
     manager.run(() => {
@@ -192,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);
@@ -212,12 +255,12 @@ const createCli = () => {
     };
   };
 
-  async function run(argv) {
+  async function run(argv, options) {
     const {
       loadedConfig,
       appContext,
       resolved
-    } = await init(argv);
+    } = await init(argv, options);
     await hooksRunner.commands({
       program: _commander.program
     });

package/dist/js/node/loadEnv.js

@@ -16,7 +16,9 @@ var _dotenvExpand = _interopRequireDefault(require("dotenv-expand"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const loadEnv = (appDirectory, mode = process.env.NODE_ENV) => {
-  [`.env.${mode}`, '.env'].map(name => _path.default.resolve(appDirectory, name)).filter(filePath => _fs.default.existsSync(filePath) && !_fs.default.statSync(filePath).isDirectory()).forEach(filePath => {
+  // Don't change the order of the filenames， since they are ordered by the priority.
+  // Files on the left have more priority than files on the right.
+  [`.env.${mode}.local`, '.env.local', `.env.${mode}`, '.env'].map(name => _path.default.resolve(appDirectory, name)).filter(filePath => _fs.default.existsSync(filePath) && !_fs.default.statSync(filePath).isDirectory()).forEach(filePath => {
     const envConfig = _dotenv.default.config({
       path: filePath
     });

package/dist/js/node/loadPlugins.js

@@ -37,8 +37,8 @@ const resolvePlugin = (appDirectory, plugin) => {
 
   const resolved = {};
 
-  if (plugin.cli) {
-    resolved.cli = tryResolve(plugin.cli);
+  if (typeof plugin === 'string' || plugin.cli) {
+    resolved.cli = typeof plugin === 'string' ? tryResolve(plugin) : tryResolve(plugin.cli);
   }
 
   if (plugin.server) {
@@ -55,8 +55,8 @@ const resolvePlugin = (appDirectory, plugin) => {
  */
 
 
-const loadPlugins = (appDirectory, pluginConfig) => {
-  const plugins = [...Object.keys(_utils.INTERNAL_PLUGINS).filter(name => (0, _utils.isDepExists)(appDirectory, name)).map(name => _utils.INTERNAL_PLUGINS[name]), ...pluginConfig];
+const loadPlugins = (appDirectory, pluginConfig, internalPlugins) => {
+  const plugins = [...Object.keys(internalPlugins || _utils.INTERNAL_PLUGINS).filter(name => (0, _utils.isDepExists)(appDirectory, name)).map(name => (internalPlugins || _utils.INTERNAL_PLUGINS)[name]), ...pluginConfig];
   return plugins.map(plugin => {
     const {
       cli,
@@ -68,7 +68,9 @@ const loadPlugins = (appDirectory, pluginConfig) => {
     });
     return {
       cli: cli && (0, _utils.compatRequire)(cli),
-      server: server && (0, _utils.compatRequire)(server)
+      cliPath: typeof plugin === 'string' ? plugin : plugin.cli,
+      server: server && (0, _utils.compatRequire)(server),
+      serverPath: typeof plugin === 'string' ? undefined : plugin.server
     };
   });
 };

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,8 +1,9 @@
-import { ParallelWorkflow, AsyncWorkflow, Progresses2Runners } from '@modern-js/plugin';
+import { INTERNAL_PLUGINS } from '@modern-js/utils';
+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';
@@ -10,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<{
@@ -23,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<{
@@ -36,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<{
@@ -48,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<{
@@ -60,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<{
@@ -72,17 +88,26 @@ 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 };
-export interface CoreOption {
-  dryRun?: boolean;
+declare const initAppDir: () => Promise<string>;
+export interface CoreOptions {
+  configFile?: string;
+  plugins?: typeof INTERNAL_PLUGINS;
+  beforeUsePlugins: (plugins: any, config: any) => {
+    cli: any;
+    cliPath: any;
+    server: any;
+    serverPath: any;
+  }[];
 }
 export declare const cli: {
-  init: (argv?: string[]) => Promise<{
+  init: (argv?: string[], options?: CoreOptions | undefined) => Promise<{
     loadedConfig: import("./config").LoadedConfig;
     appContext: IAppContext;
     resolved: NormalizedConfig;
   }>;
-  run: (argv: string[]) => Promise<void>;
+  run: (argv: string[], options?: CoreOptions | undefined) => Promise<void>;
   restart: () => Promise<void>;
-};
+};
+export { loadUserConfig, initAppDir, initAppContext };

package/dist/types/loadPlugins.d.ts

@@ -10,7 +10,14 @@ export declare type PluginConfig = Array<PluginConfigItem>;
  * @returns Plugin Objects has been required.
  */
 
-export declare const loadPlugins: (appDirectory: string, pluginConfig: PluginConfig) => {
+export declare const loadPlugins: (appDirectory: string, pluginConfig: PluginConfig, internalPlugins?: {
+  [name: string]: {
+    cli?: string | undefined;
+    server?: string | undefined;
+  };
+} | undefined) => {
   cli: any;
+  cliPath: string | undefined;
   server: any;
+  serverPath: string | undefined;
 }[];

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.1",
+  "version": "1.1.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -38,9 +38,9 @@
   "dependencies": {
     "@babel/code-frame": "^7.14.5",
     "@babel/runtime": "^7",
-    "@modern-js/load-config": "^1.1.0",
-    "@modern-js/plugin": "^1.1.1",
-    "@modern-js/utils": "^1.1.1",
+    "@modern-js/load-config": "^1.1.1",
+    "@modern-js/plugin": "^1.1.2",
+    "@modern-js/utils": "^1.1.4",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",
@@ -57,7 +57,7 @@
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.3",
-    "@modern-js/types": "^1.1.1",
+    "@modern-js/types": "^1.1.3",
     "@types/jest": "^26",
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/lodash.mergewith": "^4.6.6",
@@ -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": {
@@ -84,5 +84,6 @@
     "build": "modern build",
     "dev": "modern build --watch",
     "test": "modern test --passWithNoTests"
-  }
+  },
+  "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

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

@@ -4,6 +4,7 @@ import {
   pkgUp,
   ensureAbsolutePath,
   logger,
+  INTERNAL_PLUGINS,
 } from '@modern-js/utils';
 import {
   createAsyncManager,
@@ -12,6 +13,8 @@ import {
   ParallelWorkflow,
   AsyncWorkflow,
   Progresses2Runners,
+  createAsyncWaterfall,
+  AsyncWaterfall,
 } from '@modern-js/plugin';
 import { enable } from '@modern-js/plugin/node';
 
@@ -52,6 +55,9 @@ program
 
 export type HooksRunner = Progresses2Runners<{
   config: ParallelWorkflow<void>;
+  resolvedConfig: AsyncWaterfall<{
+    resolved: NormalizedConfig;
+  }>;
   validateSchema: ParallelWorkflow<void>;
   prepare: AsyncWorkflow<void, void>;
   commands: AsyncWorkflow<
@@ -72,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>(),
@@ -110,9 +119,11 @@ export const usePlugins = (plugins: string[]) =>
 export {
   defineConfig,
   AppContext,
+  ResolvedConfigContext,
   useAppContext,
   useConfigContext,
   useResolvedConfigContext,
+  ConfigContext,
 };
 
 export type { NormalizedConfig, IAppContext, UserConfig, ToolsConfig };
@@ -129,15 +140,20 @@ const initAppDir = async (): Promise<string> => {
   return path.dirname(pkg);
 };
 
-export interface CoreOption {
-  dryRun?: boolean;
+export interface CoreOptions {
+  configFile?: string;
+  plugins?: typeof INTERNAL_PLUGINS;
+  beforeUsePlugins: (
+    plugins: any,
+    config: any,
+  ) => { cli: any; cliPath: any; server: any; serverPath: any }[];
 }
 
 const createCli = () => {
   let hooksRunner: HooksRunner;
   let isRestart = false;
 
-  const init = async (argv: string[] = []) => {
+  const init = async (argv: string[] = [], options?: CoreOptions) => {
     enable();
 
     manager.clear();
@@ -146,9 +162,17 @@ const createCli = () => {
 
     loadEnv(appDirectory);
 
-    const loaded = await loadUserConfig(appDirectory);
+    const loaded = await loadUserConfig(appDirectory, options?.configFile);
+
+    let plugins = loadPlugins(
+      appDirectory,
+      loaded.config.plugins || [],
+      options?.plugins,
+    );
 
-    const plugins = loadPlugins(appDirectory, loaded.config.plugins || []);
+    if (options?.beforeUsePlugins) {
+      plugins = options.beforeUsePlugins(plugins, loaded.config);
+    }
 
     plugins.forEach(plugin => plugin.cli && manager.usePlugin(plugin.cli));
 
@@ -180,7 +204,7 @@ const createCli = () => {
 
     const extraSchemas = await hooksRunner.validateSchema();
 
-    const resolved = await resolveConfig(
+    const config = await resolveConfig(
       loaded,
       extraConfigs as any,
       extraSchemas as any,
@@ -188,6 +212,10 @@ const createCli = () => {
       argv,
     );
 
+    const { resolved } = await hooksRunner.resolvedConfig({
+      resolved: config,
+    });
+
     // update context value
     manager.run(() => {
       ConfigContext.set(loaded.config);
@@ -204,8 +232,8 @@ const createCli = () => {
     return { loadedConfig: loaded, appContext, resolved };
   };
 
-  async function run(argv: string[]) {
-    const { loadedConfig, appContext, resolved } = await init(argv);
+  async function run(argv: string[], options?: CoreOptions) {
+    const { loadedConfig, appContext, resolved } = await init(argv, options);
 
     await hooksRunner.commands({ program });
 
@@ -245,3 +273,5 @@ const createCli = () => {
 };
 
 export const cli = createCli();
+
+export { loadUserConfig, initAppDir, initAppContext };

package/src/loadEnv.ts

@@ -7,7 +7,9 @@ export const loadEnv = (
   appDirectory: string,
   mode: string = process.env.NODE_ENV as string,
 ) => {
-  [`.env.${mode}`, '.env']
+  // Don't change the order of the filenames， since they are ordered by the priority.
+  // Files on the left have more priority than files on the right.
+  [`.env.${mode}.local`, '.env.local', `.env.${mode}`, '.env']
     .map(name => path.resolve(appDirectory, name))
     .filter(
       filePath =>

package/src/loadPlugins.ts

@@ -37,8 +37,9 @@ const resolvePlugin = (appDirectory: string, plugin: PluginConfigItem) => {
 
   const resolved: PluginConfigItem = {};
 
-  if (plugin.cli) {
-    resolved.cli = tryResolve(plugin.cli);
+  if (typeof plugin === 'string' || plugin.cli) {
+    resolved.cli =
+      typeof plugin === 'string' ? tryResolve(plugin) : tryResolve(plugin.cli!);
   }
 
   if (plugin.server) {
@@ -57,11 +58,12 @@ const resolvePlugin = (appDirectory: string, plugin: PluginConfigItem) => {
 export const loadPlugins = (
   appDirectory: string,
   pluginConfig: PluginConfig,
+  internalPlugins?: typeof INTERNAL_PLUGINS,
 ) => {
   const plugins = [
-    ...Object.keys(INTERNAL_PLUGINS)
+    ...Object.keys(internalPlugins || INTERNAL_PLUGINS)
       .filter(name => isDepExists(appDirectory, name))
-      .map(name => INTERNAL_PLUGINS[name]),
+      .map(name => (internalPlugins || INTERNAL_PLUGINS)[name]),
     ...pluginConfig,
   ];
 
@@ -75,7 +77,9 @@ export const loadPlugins = (
 
     return {
       cli: cli && compatRequire(cli),
+      cliPath: typeof plugin === 'string' ? plugin : plugin.cli,
       server: server && compatRequire(server),
+      serverPath: typeof plugin === 'string' ? undefined : plugin.server,
     };
   });
 };

package/tests/loadEnv.test.ts

@@ -26,7 +26,7 @@ describe('load environment variables', () => {
 
   afterAll(() => {
     process.env = { ...defaultEnv };
-    fs.rmSync(fixture, {force: true, recursive: true})
+    fs.rmSync(fixture, { force: true, recursive: true });
   });
 
   test(`support .env file`, () => {
@@ -78,6 +78,52 @@ describe('load environment variables', () => {
     delete process.env.NODE_ENV;
   });
 
+  test(`should have correct priority`, () => {
+    createFixtures('priority', [
+      {
+        name: '.env',
+        content: `DB_HOST=localhost
+        DB_USER=user
+        DB_PASS=pass
+        `,
+      },
+      {
+        name: '.env.production',
+        content: `DB_USER=user_production
+        DB_PASS=pass_production
+        FOO=foo
+        BAR=bar
+        `,
+      },
+      {
+        name: '.env.local',
+        content: `FOO=foo_local
+        BAR=bar_local
+        `,
+      },
+      {
+        name: '.env.production.local',
+        content: `BAR=bar_production_local`,
+      },
+    ]);
+
+    process.env.NODE_ENV = 'production';
+
+    loadEnv(path.join(fixture, 'priority'));
+
+    expect(process.env.DB_HOST).toBe('localhost');
+
+    expect(process.env.DB_USER).toBe('user_production');
+
+    expect(process.env.DB_PASS).toBe('pass_production');
+
+    expect(process.env.FOO).toBe('foo_local');
+
+    expect(process.env.BAR).toBe('bar_production_local');
+
+    delete process.env.NODE_ENV;
+  });
+
   test(`support dotenv-expand`, () => {
     createFixtures('expand', [
       {

package/tests/loadPlugin.test.ts

@@ -14,8 +14,8 @@ describe('load plugins', () => {
     ]);
 
     expect(plugins).toEqual([
-      { cli: { name: 'a' } },
-      { server: { name: 'b' } },
+      { cli: { name: 'a' }, cliPath: path.join(fixture, './test-plugin-a.js') },
+      { server: { name: 'b' }, serverPath: './test-plugin-b' },
     ]);
   });