@modern-js/core 1.4.5 → 1.6.0

package/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  root: true,
+  extends: ['@modern-js'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: ['./tsconfig.json'],
+  },
+};

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # @modern-js/core
 
+## 1.6.0
+
+### Minor Changes
+
+- 4e2026e4: feat: support new plugin config
+
+### Patch Changes
+
+- 05ce88a0: fix: set default value for type NormalizedConfig to ensure all config keys are required
+- a8df060e: support setup dev middleware first step
+- 6a7acb81: modify devServer type and name
+- Updated dependencies [c2046f37]
+- Updated dependencies [dc88abf9]
+- Updated dependencies [0462ff77]
+  - @modern-js/utils@1.3.6
+  - @modern-js/plugin@1.3.2
+
+## 1.5.0
+
+### Minor Changes
+
+- 80d8ddfe: feat: add `CliPlugin` type to define new plugin
+
+### Patch Changes
+
+- 80d3cfb7: fix: server.metrics type
+- 42c6b136: feat: support api.setAppContext
+- 4e7dcbd5: fix: server.logger type
+- 9e8bc4ab: fix: server.routes type
+- 0c556e59: fix: tools.less type
+- 2008fdbd: convert two packages server part, support server load plugin itself
+- Updated dependencies [5bf5868d]
+- Updated dependencies [80d8ddfe]
+- Updated dependencies [491145e3]
+  - @modern-js/utils@1.3.5
+  - @modern-js/plugin@1.3.0
+
+## 1.4.6
+
+### Patch Changes
+
+- cc5e8001: fix: load plugins
+- 2520ea86: fix: garfish schema
+- e81fd9b7: fix: update "server.metrics" type
+- 1c411e71: fix: mergeConfig util function
+- Updated dependencies [db43dce6]
+  - @modern-js/utils@1.3.4
+
 ## 1.4.4
 
 ### Patch Changes

package/dist/js/modern/config/defaults.js

@@ -96,5 +96,8 @@ export const defaults = {
   server: serverDefaults,
   dev: devDefaults,
   deploy: deployDefaults,
-  tools: toolsDefaults
+  tools: toolsDefaults,
+  plugins: [],
+  runtime: {},
+  runtimeByEntries: {}
 };

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

@@ -155,10 +155,10 @@ export const server = {
       instanceof: 'Function'
     },
     logger: {
-      type: 'object'
+      type: ['object', 'boolean']
     },
     metrics: {
-      type: 'object'
+      type: ['object', 'boolean']
     },
     proxy: {
       type: 'object'

package/dist/js/modern/context.js

@@ -4,8 +4,26 @@ import address from 'address';
 export const AppContext = createContext({});
 export const ConfigContext = createContext({});
 export const ResolvedConfigContext = createContext({});
+/**
+ * Set app context.
+ * @param value new app context. It will override previous app context.
+ */
+
+export const setAppContext = value => AppContext.set(value);
+/**
+ * Get app context, including directories, plugins and some static infos.
+ */
+
 export const useAppContext = () => AppContext.use().value;
+/**
+ * Get original content of user config.
+ */
+
 export const useConfigContext = () => ConfigContext.use().value;
+/**
+ * Get normalized content of user config.
+ */
+
 export const useResolvedConfigContext = () => ResolvedConfigContext.use().value;
 export const initAppContext = (appDirectory, plugins, configFile, options) => {
   const {

package/dist/js/modern/index.js

@@ -5,41 +5,23 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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, createAsyncWaterfall } from '@modern-js/plugin';
+import { pkgUp, ensureAbsolutePath, logger } from '@modern-js/utils';
 import { enable } from '@modern-js/plugin/node';
 import { program } from "./utils/commander";
 import { resolveConfig, loadUserConfig } from "./config";
 import { loadPlugins } from "./loadPlugins";
-import { AppContext, ConfigContext, initAppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext } from "./context";
+import { AppContext, ConfigContext, initAppContext, ResolvedConfigContext } from "./context";
 import { initWatcher } from "./initWatcher";
 import { loadEnv } from "./loadEnv";
+import { manager } from "./manager";
 export * from "./config";
 export * from '@modern-js/plugin';
-export * from '@modern-js/plugin/node';
+export * from '@modern-js/plugin/node'; // TODO: remove export after refactor all plugins
+
+export { manager, mountHook, usePlugins, createPlugin, registerHook } from "./manager";
+// TODO: remove export after refactor all plugins
+export { AppContext, ConfigContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext } from "./pluginAPI";
 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(),
-  commands: createAsyncWorkflow(),
-  watchFiles: createParallelWorkflow(),
-  fileChange: createAsyncWorkflow(),
-  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-  beforeExit: createAsyncWorkflow(),
-  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-  beforeRestart: createAsyncWorkflow()
-};
-export const manager = createAsyncManager(hooksMap);
-export const {
-  createPlugin,
-  registe: registerHook,
-  useRunner: mountHook
-} = manager;
-export const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin(compatRequire(require.resolve(plugin))));
-export { AppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, ConfigContext };
 
 const initAppDir = async cwd => {
   if (!cwd) {
@@ -75,8 +57,7 @@ const createCli = () => {
     loadEnv(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
     const loaded = await loadUserConfig(appDirectory, options === null || options === void 0 ? void 0 : options.configFile, options === null || options === void 0 ? void 0 : options.packageJsonConfig);
     const plugins = 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));
     const appContext = initAppContext(appDirectory, plugins, loaded.filePath, options === null || options === void 0 ? void 0 : options.options);

package/dist/js/modern/loadPlugins.js

@@ -1,10 +1,5 @@
-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; }
-
 import { isDepExists, createDebugger, compatRequire, INTERNAL_PLUGINS } from '@modern-js/utils';
+import { createPlugin } from "./manager";
 const debug = createDebugger('load-plugins');
 
 /**
@@ -32,7 +27,7 @@ const tryResolve = (name, appDirectory) => {
   return filePath;
 };
 
-export function getAppPlugins(appDirectory, pluginConfig, internalPlugins) {
+export function getAppPlugins(appDirectory, oldPluginConfig, internalPlugins) {
   const allPlugins = internalPlugins || INTERNAL_PLUGINS;
   const appPlugins = [...Object.keys(allPlugins).filter(name => {
     const config = allPlugins[name];
@@ -43,45 +38,44 @@ export function getAppPlugins(appDirectory, pluginConfig, internalPlugins) {
     }
 
     return 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 = compatRequire(path);
+
+  if (typeof module === 'function') {
+    const pluginOptions = Array.isArray(p) ? p[1] : undefined;
+    const result = module(pluginOptions);
+    return 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.
  */
 
-export 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 = 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 => {
+export const loadPlugins = (appDirectory, userConfig, options = {}) => {
+  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;
@@ -93,23 +87,12 @@ export 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;
     }
 
@@ -119,4 +102,16 @@ export 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: createPlugin(item.setup, item)
+      })));
+    }
+  }
+
+  return loadedPlugins;
 };

package/dist/js/modern/manager.js

@@ -0,0 +1,28 @@
+import { createAsyncManager, createAsyncWorkflow, createAsyncWaterfall, createParallelWorkflow } from '@modern-js/plugin';
+import { compatRequire } from '@modern-js/utils';
+import { pluginAPI } from "./pluginAPI";
+const baseHooks = {
+  config: createParallelWorkflow(),
+  resolvedConfig: createAsyncWaterfall(),
+  validateSchema: createParallelWorkflow(),
+  prepare: createAsyncWorkflow(),
+  commands: createAsyncWorkflow(),
+  watchFiles: createParallelWorkflow(),
+  fileChange: createAsyncWorkflow(),
+  beforeExit: createAsyncWorkflow(),
+  beforeRestart: createAsyncWorkflow()
+};
+/** All hooks of cli plugin. */
+
+export const manager = createAsyncManager(baseHooks, pluginAPI);
+/** Plugin options of a cli plugin. */
+
+export const {
+  createPlugin,
+  registerHook,
+  useRunner: mountHook
+} = manager;
+export const usePlugins = plugins => plugins.forEach(pluginPath => {
+  const module = compatRequire(require.resolve(pluginPath));
+  manager.usePlugin(module);
+});

package/dist/js/modern/pluginAPI.js

@@ -0,0 +1,11 @@
+import { AppContext, ConfigContext, setAppContext, useAppContext, useConfigContext, ResolvedConfigContext, useResolvedConfigContext } from "./context";
+export const pluginAPI = {
+  setAppContext,
+  useAppContext,
+  useConfigContext,
+  useResolvedConfigContext
+};
+/** all apis for cli plugin */
+
+// TODO: only export types after refactor all plugins
+export { AppContext, ConfigContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext };

package/dist/js/node/config/defaults.js

@@ -102,6 +102,9 @@ const defaults = {
   server: serverDefaults,
   dev: devDefaults,
   deploy: deployDefaults,
-  tools: toolsDefaults
+  tools: toolsDefaults,
+  plugins: [],
+  runtime: {},
+  runtimeByEntries: {}
 };
 exports.defaults = defaults;

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

@@ -163,10 +163,10 @@ const server = {
       instanceof: 'Function'
     },
     logger: {
-      type: 'object'
+      type: ['object', 'boolean']
     },
     metrics: {
-      type: 'object'
+      type: ['object', 'boolean']
     },
     proxy: {
       type: 'object'

package/dist/js/node/context.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useResolvedConfigContext = exports.useConfigContext = exports.useAppContext = exports.initAppContext = exports.ResolvedConfigContext = exports.ConfigContext = exports.AppContext = void 0;
+exports.useResolvedConfigContext = exports.useConfigContext = exports.useAppContext = exports.setAppContext = exports.initAppContext = exports.ResolvedConfigContext = exports.ConfigContext = exports.AppContext = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -18,13 +18,34 @@ exports.AppContext = AppContext;
 const ConfigContext = (0, _plugin.createContext)({});
 exports.ConfigContext = ConfigContext;
 const ResolvedConfigContext = (0, _plugin.createContext)({});
+/**
+ * Set app context.
+ * @param value new app context. It will override previous app context.
+ */
+
 exports.ResolvedConfigContext = ResolvedConfigContext;
 
+const setAppContext = value => AppContext.set(value);
+/**
+ * Get app context, including directories, plugins and some static infos.
+ */
+
+
+exports.setAppContext = setAppContext;
+
 const useAppContext = () => AppContext.use().value;
+/**
+ * Get original content of user config.
+ */
+
 
 exports.useAppContext = useAppContext;
 
 const useConfigContext = () => ConfigContext.use().value;
+/**
+ * Get normalized content of user config.
+ */
+
 
 exports.useConfigContext = useConfigContext;