@modern-js/core 1.4.5 → 1.6.0

package/dist/js/node/index.js

@@ -4,16 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
+  cli: true,
+  initAppDir: true,
+  initAppContext: true,
   manager: true,
-  createPlugin: true,
-  registerHook: true,
   mountHook: true,
   usePlugins: true,
-  cli: true,
-  initAppDir: true,
+  createPlugin: true,
+  registerHook: true,
   AppContext: true,
   ConfigContext: true,
-  initAppContext: true,
   ResolvedConfigContext: true,
   useAppContext: true,
   useConfigContext: true,
@@ -22,46 +22,75 @@ var _exportNames = {
 Object.defineProperty(exports, "AppContext", {
   enumerable: true,
   get: function () {
-    return _context.AppContext;
+    return _pluginAPI.AppContext;
   }
 });
 Object.defineProperty(exports, "ConfigContext", {
   enumerable: true,
   get: function () {
-    return _context.ConfigContext;
+    return _pluginAPI.ConfigContext;
   }
 });
 Object.defineProperty(exports, "ResolvedConfigContext", {
   enumerable: true,
   get: function () {
-    return _context.ResolvedConfigContext;
+    return _pluginAPI.ResolvedConfigContext;
+  }
+});
+exports.cli = void 0;
+Object.defineProperty(exports, "createPlugin", {
+  enumerable: true,
+  get: function () {
+    return _manager.createPlugin;
   }
 });
-exports.createPlugin = exports.cli = void 0;
 Object.defineProperty(exports, "initAppContext", {
   enumerable: true,
   get: function () {
     return _context.initAppContext;
   }
 });
-exports.registerHook = exports.mountHook = exports.manager = exports.initAppDir = void 0;
+exports.initAppDir = void 0;
+Object.defineProperty(exports, "manager", {
+  enumerable: true,
+  get: function () {
+    return _manager.manager;
+  }
+});
+Object.defineProperty(exports, "mountHook", {
+  enumerable: true,
+  get: function () {
+    return _manager.mountHook;
+  }
+});
+Object.defineProperty(exports, "registerHook", {
+  enumerable: true,
+  get: function () {
+    return _manager.registerHook;
+  }
+});
 Object.defineProperty(exports, "useAppContext", {
   enumerable: true,
   get: function () {
-    return _context.useAppContext;
+    return _pluginAPI.useAppContext;
   }
 });
 Object.defineProperty(exports, "useConfigContext", {
   enumerable: true,
   get: function () {
-    return _context.useConfigContext;
+    return _pluginAPI.useConfigContext;
+  }
+});
+Object.defineProperty(exports, "usePlugins", {
+  enumerable: true,
+  get: function () {
+    return _manager.usePlugins;
   }
 });
-exports.usePlugins = void 0;
 Object.defineProperty(exports, "useResolvedConfigContext", {
   enumerable: true,
   get: function () {
-    return _context.useResolvedConfigContext;
+    return _pluginAPI.useResolvedConfigContext;
   }
 });
 
@@ -69,20 +98,6 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _plugin = require("@modern-js/plugin");
-
-Object.keys(_plugin).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _plugin[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _plugin[key];
-    }
-  });
-});
-
 var _node = require("@modern-js/plugin/node");
 
 Object.keys(_node).forEach(function (key) {
@@ -121,6 +136,24 @@ var _initWatcher = require("./initWatcher");
 
 var _loadEnv = require("./loadEnv");
 
+var _manager = require("./manager");
+
+var _plugin = require("@modern-js/plugin");
+
+Object.keys(_plugin).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _plugin[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _plugin[key];
+    }
+  });
+});
+
+var _pluginAPI = require("./pluginAPI");
+
 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); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -131,35 +164,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 _commander.program.name('modern').usage('<command> [options]').version(process.env.MODERN_JS_VERSION || '0.1.0');
 
-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)(),
-  commands: (0, _plugin.createAsyncWorkflow)(),
-  watchFiles: (0, _plugin.createParallelWorkflow)(),
-  fileChange: (0, _plugin.createAsyncWorkflow)(),
-  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-  beforeExit: (0, _plugin.createAsyncWorkflow)(),
-  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-  beforeRestart: (0, _plugin.createAsyncWorkflow)()
-};
-const manager = (0, _plugin.createAsyncManager)(hooksMap);
-exports.manager = manager;
-const {
-  createPlugin,
-  registe: registerHook,
-  useRunner: mountHook
-} = manager;
-exports.mountHook = mountHook;
-exports.registerHook = registerHook;
-exports.createPlugin = createPlugin;
-
-const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin((0, _utils.compatRequire)(require.resolve(plugin))));
-
-exports.usePlugins = usePlugins;
-
 const initAppDir = async cwd => {
   if (!cwd) {
     // eslint-disable-next-line no-param-reassign
@@ -189,24 +193,27 @@ const createCli = () => {
     var _options$options$meta, _options$options;
 
     (0, _node.enable)();
-    manager.clear();
+
+    _manager.manager.clear();
+
     restartOptions = options;
     const appDirectory = await initAppDir();
     const metaName = (_options$options$meta = options === null || options === void 0 ? void 0 : (_options$options = options.options) === null || _options$options === void 0 ? void 0 : _options$options.metaName) !== null && _options$options$meta !== void 0 ? _options$options$meta : 'MODERN';
     (0, _loadEnv.loadEnv)(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
     const loaded = await (0, _config.loadUserConfig)(appDirectory, options === null || options === void 0 ? void 0 : options.configFile, options === null || options === void 0 ? void 0 : options.packageJsonConfig);
     const plugins = (0, _loadPlugins.loadPlugins)(appDirectory, loaded.config, {
-      internalPlugins: options === null || options === void 0 ? void 0 : options.plugins,
-      transformPlugin: options === null || options === void 0 ? void 0 : options.transformPlugin
+      internalPlugins: options === null || options === void 0 ? void 0 : options.plugins
     });
-    plugins.forEach(plugin => plugin.cli && manager.usePlugin(plugin.cli));
+    plugins.forEach(plugin => plugin.cli && _manager.manager.usePlugin(plugin.cli));
     const appContext = (0, _context.initAppContext)(appDirectory, plugins, loaded.filePath, options === null || options === void 0 ? void 0 : options.options);
-    manager.run(() => {
+
+    _manager.manager.run(() => {
       _context.ConfigContext.set(loaded.config);
 
       _context.AppContext.set(appContext);
     });
-    hooksRunner = await manager.init();
+
+    hooksRunner = await _manager.manager.init();
     ['SIGINT', 'SIGTERM', 'unhandledRejection', 'uncaughtException'].forEach(event => {
       process.on(event, async err => {
         await hooksRunner.beforeExit();
@@ -230,7 +237,7 @@ const createCli = () => {
       resolved: config
     }); // update context value
 
-    manager.run(() => {
+    _manager.manager.run(() => {
       _context.ConfigContext.set(loaded.config);
 
       _context.ResolvedConfigContext.set(resolved);
@@ -240,6 +247,7 @@ const createCli = () => {
         distDirectory: (0, _utils.ensureAbsolutePath)(appDirectory, resolved.output.path)
       }));
     });
+
     await hooksRunner.prepare();
     return {
       loadedConfig: loaded,
@@ -258,7 +266,8 @@ const createCli = () => {
       program: _commander.program
     });
     (0, _initWatcher.initWatcher)(loadedConfig, appContext.appDirectory, resolved.source.configDir, hooksRunner, argv);
-    manager.run(() => _commander.program.parse(process.argv));
+
+    _manager.manager.run(() => _commander.program.parse(process.argv));
   }
 
   async function restart() {
@@ -270,7 +279,9 @@ const createCli = () => {
     _utils.logger.info('Restart...\n');
 
     let hasGetError = false;
-    const runner = manager.useRunner();
+
+    const runner = _manager.manager.useRunner();
+
     await runner.beforeRestart();
 
     try {
@@ -280,7 +291,7 @@ const createCli = () => {
       hasGetError = true;
     } finally {
       if (!hasGetError) {
-        manager.run(() => _commander.program.parse(process.argv));
+        _manager.manager.run(() => _commander.program.parse(process.argv));
       }
     }
   }

package/dist/js/node/loadPlugins.js

@@ -8,11 +8,7 @@ exports.loadPlugins = void 0;
 
 var _utils = require("@modern-js/utils");
 
-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 = 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; }
+var _manager = require("./manager");
 
 const debug = (0, _utils.createDebugger)('load-plugins');
 
@@ -41,7 +37,7 @@ const tryResolve = (name, appDirectory) => {
   return filePath;
 };
 
-function getAppPlugins(appDirectory, pluginConfig, internalPlugins) {
+function getAppPlugins(appDirectory, oldPluginConfig, internalPlugins) {
   const allPlugins = internalPlugins || _utils.INTERNAL_PLUGINS;
   const appPlugins = [...Object.keys(allPlugins).filter(name => {
     const config = allPlugins[name];
@@ -52,46 +48,44 @@ function getAppPlugins(appDirectory, pluginConfig, internalPlugins) {
     }
 
     return (0, _utils.isDepExists)(appDirectory, name);
-  }).map(name => allPlugins[name]), ...pluginConfig];
+  }).map(name => allPlugins[name]), ...oldPluginConfig];
   return appPlugins;
 }
+
+const resolveCliPlugin = (p, appDirectory) => {
+  const pkg = typeof p === 'string' ? p : p[0];
+  const path = tryResolve(pkg, appDirectory);
+  const module = (0, _utils.compatRequire)(path);
+
+  if (typeof module === 'function') {
+    const pluginOptions = Array.isArray(p) ? p[1] : undefined;
+    const result = module(pluginOptions);
+    return (0, _manager.createPlugin)(result.setup, result);
+  }
+
+  return module;
+};
+
+const isOldPluginConfig = config => Array.isArray(config) && config.some(item => {
+  if (typeof item === 'string' || Array.isArray(item)) {
+    return true;
+  }
+
+  return 'cli' in item || 'server' in item;
+});
 /**
  * Load internal plugins which in @modern-js scope and user's custom plugins.
  * @param appDirectory - Application root directory.
  * @param userConfig - Resolved user config.
  * @param options.internalPlugins - Internal plugins.
- * @param options.transformPlugin - transform plugin before using it.
  * @returns Plugin Objects has been required.
  */
 
 
 const loadPlugins = (appDirectory, userConfig, options = {}) => {
-  const {
-    internalPlugins,
-    transformPlugin
-  } = options;
-
-  const resolvePlugin = p => {
-    const pkg = typeof p === 'string' ? p : p[0];
-    const path = tryResolve(pkg, appDirectory);
-    let module = (0, _utils.compatRequire)(path);
-    const pluginOptions = Array.isArray(p) ? p[1] : undefined;
-
-    if (transformPlugin) {
-      module = transformPlugin(module, userConfig, pluginOptions);
-    } else {
-      module = typeof module === 'function' ? module(pluginOptions) : module;
-    }
-
-    return {
-      pkg,
-      path,
-      module
-    };
-  };
-
-  const plugins = getAppPlugins(appDirectory, userConfig.plugins || [], internalPlugins);
-  return plugins.map(plugin => {
+  const pluginConfig = userConfig.plugins;
+  const plugins = getAppPlugins(appDirectory, isOldPluginConfig(pluginConfig) ? pluginConfig : [], options.internalPlugins);
+  const loadedPlugins = plugins.map(plugin => {
     const _plugin = typeof plugin === 'string' || Array.isArray(plugin) ? {
       cli: plugin
     } : plugin;
@@ -103,23 +97,12 @@ const loadPlugins = (appDirectory, userConfig, options = {}) => {
     const loadedPlugin = {};
 
     if (cli) {
-      const {
-        pkg,
-        path,
-        module
-      } = resolvePlugin(cli);
-      loadedPlugin.cli = _objectSpread(_objectSpread({}, module), {}, {
-        pluginPath: path
-      });
-      loadedPlugin.cliPkg = pkg;
+      loadedPlugin.cli = resolveCliPlugin(cli, appDirectory);
     } // server plugins don't support to accept params
 
 
     if (server && typeof server === 'string') {
-      const path = tryResolve(server, appDirectory);
-      loadedPlugin.server = {
-        pluginPath: path
-      };
+      loadedPlugin.server = server;
       loadedPlugin.serverPkg = server;
     }
 
@@ -129,6 +112,18 @@ const loadPlugins = (appDirectory, userConfig, options = {}) => {
     });
     return loadedPlugin;
   });
+
+  if (!isOldPluginConfig(pluginConfig)) {
+    const cliPlugins = Array.isArray(pluginConfig) ? pluginConfig : pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.cli;
+
+    if (cliPlugins !== null && cliPlugins !== void 0 && cliPlugins.length) {
+      loadedPlugins.push(...cliPlugins.map(item => ({
+        cli: (0, _manager.createPlugin)(item.setup, item)
+      })));
+    }
+  }
+
+  return loadedPlugins;
 };
 
 exports.loadPlugins = loadPlugins;

package/dist/js/node/manager.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.usePlugins = exports.registerHook = exports.mountHook = exports.manager = exports.createPlugin = void 0;
+
+var _plugin = require("@modern-js/plugin");
+
+var _utils = require("@modern-js/utils");
+
+var _pluginAPI = require("./pluginAPI");
+
+const baseHooks = {
+  config: (0, _plugin.createParallelWorkflow)(),
+  resolvedConfig: (0, _plugin.createAsyncWaterfall)(),
+  validateSchema: (0, _plugin.createParallelWorkflow)(),
+  prepare: (0, _plugin.createAsyncWorkflow)(),
+  commands: (0, _plugin.createAsyncWorkflow)(),
+  watchFiles: (0, _plugin.createParallelWorkflow)(),
+  fileChange: (0, _plugin.createAsyncWorkflow)(),
+  beforeExit: (0, _plugin.createAsyncWorkflow)(),
+  beforeRestart: (0, _plugin.createAsyncWorkflow)()
+};
+/** All hooks of cli plugin. */
+
+const manager = (0, _plugin.createAsyncManager)(baseHooks, _pluginAPI.pluginAPI);
+/** Plugin options of a cli plugin. */
+
+exports.manager = manager;
+const {
+  createPlugin,
+  registerHook,
+  useRunner: mountHook
+} = manager;
+exports.mountHook = mountHook;
+exports.registerHook = registerHook;
+exports.createPlugin = createPlugin;
+
+const usePlugins = plugins => plugins.forEach(pluginPath => {
+  const module = (0, _utils.compatRequire)(require.resolve(pluginPath));
+  manager.usePlugin(module);
+});
+
+exports.usePlugins = usePlugins;

package/dist/js/node/pluginAPI.js

@@ -0,0 +1,54 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "AppContext", {
+  enumerable: true,
+  get: function () {
+    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.pluginAPI = void 0;
+Object.defineProperty(exports, "useAppContext", {
+  enumerable: true,
+  get: function () {
+    return _context.useAppContext;
+  }
+});
+Object.defineProperty(exports, "useConfigContext", {
+  enumerable: true,
+  get: function () {
+    return _context.useConfigContext;
+  }
+});
+Object.defineProperty(exports, "useResolvedConfigContext", {
+  enumerable: true,
+  get: function () {
+    return _context.useResolvedConfigContext;
+  }
+});
+
+var _context = require("./context");
+
+const pluginAPI = {
+  setAppContext: _context.setAppContext,
+  useAppContext: _context.useAppContext,
+  useConfigContext: _context.useConfigContext,
+  useResolvedConfigContext: _context.useResolvedConfigContext
+};
+/** all apis for cli plugin */
+
+exports.pluginAPI = pluginAPI;

package/dist/types/config/defaults.d.ts

@@ -22,4 +22,7 @@ export declare const defaults: {
     terser: undefined;
     minifyCss: undefined;
   };
+  plugins: never[];
+  runtime: {};
+  runtimeByEntries: {};
 };

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

@@ -1,5 +1,8 @@
+/// <reference types="node" />
+import http from 'http';
 import { ErrorObject } from 'ajv';
 import { MetaOptions } from '@modern-js/utils';
+import type { NextFunction, ProxyOptions } from '@modern-js/types';
 import { PluginConfig } from '../loadPlugins';
 import { defaults } from './defaults';
 import { mergeConfig, NormalizedConfig } from './mergeConfig';
@@ -65,7 +68,7 @@ interface OutputConfig {
   enableTsLoader?: boolean;
 }
 interface ServerConfig {
-  routes?: Record<string, string | {
+  routes?: Record<string, string | string[] | {
     route: string | string[];
     disableSpa?: boolean;
   }>;
@@ -76,8 +79,8 @@ interface ServerConfig {
   ssrByEntries?: Record<string, boolean | Record<string, unknown>>;
   baseUrl?: string | Array<string>;
   port?: number;
-  logger?: Record<string, any>;
-  metrics?: Record<string, any>;
+  logger?: boolean | Record<string, any>;
+  metrics?: boolean | Record<string, any>;
   enableMicroFrontendDebug?: boolean;
 }
 interface DevConfig {
@@ -95,6 +98,14 @@ interface DeployConfig {
   domainByEntries?: Record<string, string | Array<string>>;
 }
 declare type ConfigFunction = Record<string, unknown> | ((config: Record<string, unknown>) => Record<string, unknown> | void);
+declare type RequestHandler = (req: http.IncomingMessage, res: http.ServerResponse, next: NextFunction) => void;
+declare type DevServerConfig = {
+  proxy?: ProxyOptions;
+  headers?: Record<string, string>;
+  before?: RequestHandler[];
+  after?: RequestHandler[];
+  [propsName: string]: any;
+};
 interface ToolsConfig {
   webpack?: ConfigFunction;
   babel?: ConfigFunction;
@@ -102,7 +113,7 @@ interface ToolsConfig {
   postcss?: ConfigFunction;
   styledComponents?: ConfigFunction;
   lodash?: ConfigFunction;
-  devServer?: Record<string, unknown>;
+  devServer?: DevServerConfig;
   tsLoader?: ConfigFunction;
   terser?: ConfigFunction;
   minifyCss?: ConfigFunction;

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

@@ -380,10 +380,10 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
           instanceof: string;
         };
         logger: {
-          type: string;
+          type: string[];
         };
         metrics: {
-          type: string;
+          type: string[];
         };
         proxy: {
           type: string;

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

@@ -167,10 +167,10 @@ export declare const server: {
       instanceof: string;
     };
     logger: {
-      type: string;
+      type: string[];
     };
     metrics: {
-      type: string;
+      type: string[];
     };
     proxy: {
       type: string;

package/dist/types/context.d.ts

@@ -6,10 +6,28 @@ export type { IAppContext };
 export declare const AppContext: import("@modern-js/plugin").Context<IAppContext>;
 export declare const ConfigContext: import("@modern-js/plugin").Context<UserConfig>;
 export declare const ResolvedConfigContext: import("@modern-js/plugin").Context<NormalizedConfig>;
+/**
+ * Set app context.
+ * @param value new app context. It will override previous app context.
+ */
+
+export declare const setAppContext: (value: IAppContext) => void;
+/**
+ * Get app context, including directories, plugins and some static infos.
+ */
+
 export declare const useAppContext: () => IAppContext;
+/**
+ * Get original content of user config.
+ */
+
 export declare const useConfigContext: () => UserConfig;
+/**
+ * Get normalized content of user config.
+ */
+
 export declare const useResolvedConfigContext: () => NormalizedConfig;
-export declare const initAppContext: (appDirectory: string, plugins: Array<LoadedPlugin>, configFile: string | false, options?: {
+export declare const initAppContext: (appDirectory: string, plugins: LoadedPlugin[], configFile: string | false, options?: {
   metaName?: string | undefined;
   srcDir?: string | undefined;
   distDir?: string | undefined;