@modern-js/core 1.8.0 → 1.9.0

package/dist/js/modern/loadPlugins.js

@@ -1,122 +0,0 @@
-import { isDepExists, createDebugger, compatRequire, INTERNAL_PLUGINS } from '@modern-js/utils';
-import { createPlugin } from "./manager";
-const debug = createDebugger('load-plugins');
-
-/**
- * Try to resolve plugin entry file path.
- * @param name - Plugin name.
- * @param appDirectory - Application root directory.
- * @returns Resolved file path.
- */
-const tryResolve = (name, appDirectory) => {
-  let filePath = '';
-
-  try {
-    filePath = require.resolve(name, {
-      paths: [appDirectory]
-    });
-    delete require.cache[filePath];
-  } catch (err) {
-    if (err.code === 'MODULE_NOT_FOUND') {
-      throw new Error(`Can not find plugin ${name}.`);
-    }
-
-    throw err;
-  }
-
-  return filePath;
-};
-
-export function getAppPlugins(appDirectory, oldPluginConfig, internalPlugins) {
-  const allPlugins = internalPlugins || INTERNAL_PLUGINS;
-  const appPlugins = [...Object.keys(allPlugins).filter(name => {
-    const config = allPlugins[name];
-
-    if (config.forced === true) {
-      // 参考 packages/cli/core/src/cli.ts 文件
-      return true;
-    }
-
-    return isDepExists(appDirectory, name);
-  }).map(name => allPlugins[name]), ...oldPluginConfig];
-  return appPlugins;
-}
-
-const resolveCliPlugin = (p, userConfig, appDirectory, transformPlugin) => {
-  const pkg = typeof p === 'string' ? p : p[0];
-  const pluginOptions = typeof p === 'string' ? undefined : p[1];
-  const path = tryResolve(pkg, appDirectory);
-  let module = compatRequire(path);
-
-  if (transformPlugin) {
-    module = transformPlugin(module, userConfig, pluginOptions);
-  }
-
-  if (typeof module === 'function') {
-    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. Used for compatible with legacy jupiter plugins.
- * @returns Plugin Objects has been required.
- */
-
-
-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;
-
-    const {
-      cli,
-      server
-    } = _plugin;
-    const loadedPlugin = {};
-
-    if (cli) {
-      loadedPlugin.cli = resolveCliPlugin(cli, userConfig, appDirectory, options.transformPlugin);
-    } // server plugins don't support to accept params
-
-
-    if (server && typeof server === 'string') {
-      loadedPlugin.server = server;
-      loadedPlugin.serverPkg = server;
-    }
-
-    debug(`resolve plugin %s: %s`, plugin, {
-      cli: loadedPlugin.cli,
-      server: loadedPlugin.server
-    });
-    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

@@ -1,28 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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/modern/utils/commander.js

@@ -1,19 +0,0 @@
-import { program } from '@modern-js/utils';
-export function initCommandsMap() {
-  if (!program.hasOwnProperty('commandsMap')) {
-    Object.defineProperty(program, 'commandsMap', {
-      get() {
-        const map = new Map();
-
-        for (const command of program.commands) {
-          map.set(command._name, command);
-        }
-
-        return map;
-      },
-
-      configurable: false
-    });
-  }
-}
-export { program };

package/dist/js/modern/utils/repeatKeyWarning.js

@@ -1,18 +0,0 @@
-import { traverseSchema } from "../config/schema";
-export const deepGet = (obj, key) => {
-  for (const p of key.split('.')) {
-    // eslint-disable-next-line no-param-reassign
-    obj = obj ? obj[p] : undefined;
-  }
-
-  return obj;
-};
-export const repeatKeyWarning = (schema, jsConfig, pkgConfig) => {
-  const keys = traverseSchema(schema);
-
-  for (const key of keys) {
-    if (deepGet(jsConfig, key) !== undefined && deepGet(pkgConfig, key) !== undefined) {
-      throw new Error(`The same configuration ${key} exists in modern.config.js and package.json.\n Please remove it from package.json.`);
-    }
-  }
-};

package/dist/js/node/cli.js

@@ -1,35 +0,0 @@
-"use strict";
-
-var _path = _interopRequireDefault(require("path"));
-
-var _ = require(".");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// 这个文件跟 bin/modern-js.js 基本一样
-// 在开发阶段，因为 package.json 的 exports['./bin']['jsnext:source'] 配置
-// 了这个文件，所以需要保留, 后续如果找到更好的方式之后会移除这个文件
-const {
-  version
-} = require("../../package.json"); // XXX: 通过这个方式去掉了 package.json 里面对于 @modern-js/module-tools 的 devDependencies 依赖
-// 然后可以正常的执行 modern build
-
-
-const kModuleToolsCliPath = _path.default.resolve(__dirname, '../../../solutions/module-tools/src/index.ts');
-
-process.env.MODERN_JS_VERSION = version;
-
-if (!process.env.NODE_ENV) {
-  process.env.NODE_ENV = // eslint-disable-next-line no-nested-ternary
-  ['build', 'start', 'deploy'].includes(process.argv[2]) ? 'production' : process.argv[2] === 'test' ? 'test' : 'development';
-}
-
-_.cli.run(process.argv.slice(2), {
-  plugins: {
-    '@modern-js/module-tools': {
-      cli: kModuleToolsCliPath,
-      // 是否需要强制加载这个组件，跳过 loadPlugins 里面 filter 的检测逻辑
-      forced: true
-    }
-  }
-});

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

@@ -1,110 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.defaults = void 0;
-const sourceDefaults = {
-  entries: undefined,
-  disableDefaultEntries: false,
-  entriesDir: './src',
-  configDir: './config',
-  apiDir: './api',
-  envVars: [],
-  globalVars: undefined,
-  alias: undefined,
-  moduleScopes: undefined,
-  include: []
-};
-const outputDefaults = {
-  assetPrefix: '/',
-  htmlPath: 'html',
-  jsPath: 'static/js',
-  cssPath: 'static/css',
-  mediaPath: 'static/media',
-  path: 'dist',
-  title: '',
-  titleByEntries: undefined,
-  meta: {
-    charset: {
-      charset: 'utf-8'
-    },
-    viewport: 'width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
-    'http-equiv': {
-      'http-equiv': 'x-ua-compatible',
-      content: 'ie=edge'
-    },
-    renderer: 'webkit',
-    layoutmode: 'standard',
-    imagemode: 'force',
-    'wap-font-scale': 'no',
-    'format-detection': 'telephone=no'
-  },
-  metaByEntries: undefined,
-  inject: 'head',
-  injectByEntries: undefined,
-  mountId: 'root',
-  favicon: '',
-  faviconByEntries: undefined,
-  copy: undefined,
-  scriptExt: undefined,
-  disableHtmlFolder: false,
-  disableCssModuleExtension: false,
-  disableCssExtract: false,
-  enableCssModuleTSDeclaration: false,
-  disableMinimize: false,
-  enableInlineStyles: false,
-  enableInlineScripts: false,
-  disableSourceMap: false,
-  disableInlineRuntimeChunk: false,
-  disableAssetsCache: false,
-  enableLatestDecorators: false,
-  polyfill: 'entry',
-  dataUriLimit: 10000,
-  templateParameters: {},
-  templateParametersByEntries: undefined,
-  cssModuleLocalIdentName: '[name]__[local]--[hash:base64:5]',
-  enableModernMode: false,
-  federation: undefined,
-  disableNodePolyfill: false,
-  enableTsLoader: false
-};
-const serverDefaults = {
-  routes: undefined,
-  publicRoutes: undefined,
-  ssr: undefined,
-  ssrByEntries: undefined,
-  baseUrl: '/',
-  port: 8080
-};
-const devDefaults = {
-  assetPrefix: false,
-  https: false
-};
-const deployDefaults = {
-  domain: '',
-  domainByEntries: undefined
-};
-const toolsDefaults = {
-  webpack: undefined,
-  babel: undefined,
-  postcss: undefined,
-  autoprefixer: undefined,
-  lodash: undefined,
-  devServer: undefined,
-  tsLoader: undefined,
-  terser: undefined,
-  minifyCss: undefined
-};
-const defaults = {
-  source: sourceDefaults,
-  output: outputDefaults,
-  server: serverDefaults,
-  dev: devDefaults,
-  deploy: deployDefaults,
-  tools: toolsDefaults,
-  plugins: [],
-  runtime: {},
-  runtimeByEntries: {}
-};
-exports.defaults = defaults;

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

@@ -1,182 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {
-  addServerConfigToDeps: true,
-  defineConfig: true,
-  loadUserConfig: true,
-  resolveConfig: true,
-  defaultsConfig: true,
-  mergeConfig: true
-};
-exports.addServerConfigToDeps = void 0;
-Object.defineProperty(exports, "defaultsConfig", {
-  enumerable: true,
-  get: function () {
-    return _defaults.defaults;
-  }
-});
-exports.loadUserConfig = exports.defineConfig = void 0;
-Object.defineProperty(exports, "mergeConfig", {
-  enumerable: true,
-  get: function () {
-    return _mergeConfig.mergeConfig;
-  }
-});
-exports.resolveConfig = void 0;
-
-var _loadConfig = require("@modern-js/load-config");
-
-var _ajv = _interopRequireDefault(require("ajv"));
-
-var _ajvKeywords = _interopRequireDefault(require("ajv-keywords"));
-
-var _utils = require("@modern-js/utils");
-
-var _lodash = require("@modern-js/utils/lodash");
-
-var _betterAjvErrors = _interopRequireDefault(require("better-ajv-errors"));
-
-var _codeFrame = require("@babel/code-frame");
-
-var _repeatKeyWarning = require("../utils/repeatKeyWarning");
-
-var _defaults = require("./defaults");
-
-var _mergeConfig = require("./mergeConfig");
-
-var _schema = require("./schema");
-
-var _types = require("./types");
-
-Object.keys(_types).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _types[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _types[key];
-    }
-  });
-});
-
-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; }
-
-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; }
-
-const debug = (0, _utils.createDebugger)('resolve-config');
-
-const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
-  const serverConfig = await (0, _utils.getServerConfig)(appDirectory, serverConfigFile);
-
-  if (serverConfig) {
-    dependencies.push(serverConfig);
-  }
-};
-
-exports.addServerConfigToDeps = addServerConfigToDeps;
-
-const defineConfig = config => config;
-
-exports.defineConfig = defineConfig;
-
-const loadUserConfig = async (appDirectory, filePath, packageJsonConfig) => {
-  const loaded = await (0, _loadConfig.loadConfig)(appDirectory, filePath, packageJsonConfig);
-  const config = !loaded ? {} : await (typeof loaded.config === 'function' ? loaded.config(0) : loaded.config);
-  return {
-    config: (0, _lodash.mergeWith)({}, config || {}, (loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig) || {}),
-    jsConfig: config || {},
-    pkgConfig: (loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig) || {},
-    filePath: loaded === null || loaded === void 0 ? void 0 : loaded.path,
-    dependencies: (loaded === null || loaded === void 0 ? void 0 : loaded.dependencies) || []
-  };
-};
-
-exports.loadUserConfig = loadUserConfig;
-
-const showAdditionalPropertiesError = error => {
-  if (error.keyword === 'additionalProperties' && error.params.additionalProperty) {
-    const target = [error.instancePath.slice(1), error.params.additionalProperty].filter(Boolean).join('.');
-    const name = Object.keys(_utils.PLUGIN_SCHEMAS).find(key => _utils.PLUGIN_SCHEMAS[key].some(schemaItem => schemaItem.target === target));
-
-    if (name) {
-      _utils.signale.warn(`The configuration of ${_utils.chalk.bold(target)} is provided by plugin ${_utils.chalk.bold(name)}. Please use ${_utils.chalk.bold('yarn new')} to enable the corresponding capability.\n`);
-    }
-  }
-};
-
-const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv, onSchemaError = showAdditionalPropertiesError) => {
-  var _validate$errors;
-
-  const {
-    config: userConfig,
-    jsConfig,
-    pkgConfig
-  } = loaded;
-  const ajv = new _ajv.default({
-    $data: true,
-    strict: false
-  });
-  (0, _ajvKeywords.default)(ajv);
-  const validateSchema = (0, _schema.patchSchema)(schemas);
-  const validate = ajv.compile(validateSchema);
-  (0, _repeatKeyWarning.repeatKeyWarning)(validateSchema, jsConfig, pkgConfig); // validate user config.
-
-  const valid = validate(userConfig);
-
-  if (!valid && (_validate$errors = validate.errors) !== null && _validate$errors !== void 0 && _validate$errors.length) {
-    var _validate$errors2;
-
-    onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
-    const errors = (0, _betterAjvErrors.default)(validateSchema, userConfig, (_validate$errors2 = validate.errors) === null || _validate$errors2 === void 0 ? void 0 : _validate$errors2.map(e => _objectSpread(_objectSpread({}, e), {}, {
-      dataPath: e.instancePath
-    })), {
-      format: 'js',
-      indent: 2
-    });
-
-    _utils.signale.log((0, _codeFrame.codeFrameColumns)(JSON.stringify(userConfig, null, 2), {
-      start: errors === null || errors === void 0 ? void 0 : errors[0].start,
-      end: errors === null || errors === void 0 ? void 0 : errors[0].end
-    }, {
-      highlightCode: true,
-      message: errors === null || errors === void 0 ? void 0 : errors[0].error
-    }));
-
-    throw new Error(`Validate configuration error`);
-  } // validate config from plugins.
-
-
-  for (const config of configs) {
-    if (!validate(config)) {
-      _utils.signale.error(validate.errors);
-
-      throw new Error(`Validate configuration error.`);
-    }
-  }
-
-  const resolved = (0, _mergeConfig.mergeConfig)([_defaults.defaults, ...configs, userConfig]);
-  resolved._raw = loaded.config;
-
-  if ((0, _utils.isDev)() && argv[0] === 'dev') {
-    if (restartWithExistingPort > 0) {
-      // dev server is restarted, should use existing port number
-      resolved.server.port = restartWithExistingPort;
-    } else {
-      // get port for new dev server
-      resolved.server.port = await (0, _utils.getPort)(resolved.server.port);
-    }
-  }
-
-  debug('resolved %o', resolved);
-  return resolved;
-};
-
-exports.resolveConfig = resolveConfig;

package/dist/js/node/config/mergeConfig.js

@@ -1,32 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.mergeConfig = void 0;
-
-var _lodash = require("@modern-js/utils/lodash");
-
-var _utils = require("@modern-js/utils");
-
-/**
- * merge configuration from  modern.config.js and plugins.
- *
- * @param configs - Configuration from modern.config.ts or plugin's config hook.
- * @returns - normalized user config.
- */
-const mergeConfig = configs => (0, _lodash.mergeWith)({}, ...configs, (target, source) => {
-  if (Array.isArray(target)) {
-    if (Array.isArray(source)) {
-      return [...target, ...source];
-    } else {
-      return typeof source !== 'undefined' ? [...target, source] : target;
-    }
-  } else if ((0, _utils.isFunction)(source)) {
-    return typeof target !== 'undefined' ? [target, source] : [source];
-  }
-
-  return undefined;
-});
-
-exports.mergeConfig = mergeConfig;

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

@@ -1,26 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.deploy = void 0;
-
-var _utils = require("@modern-js/utils");
-
-const deploy = {
-  type: 'object',
-  properties: {
-    domain: {
-      type: ['array', 'string']
-    },
-    domainByEntries: {
-      type: 'object',
-      patternProperties: {
-        [_utils.ENTRY_NAME_PATTERN]: {
-          type: ['array', 'string']
-        }
-      }
-    }
-  }
-};
-exports.deploy = deploy;