@modern-js/module-tools 1.5.7 → 1.6.0-alpha.0

package/dist/js/node/features/build/normalize.js

@@ -0,0 +1,322 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.normalizeModuleConfig = exports.normalizeBuildConfig = exports.getSourceMap = exports.getNormalizeModuleConfigByPackageModeAndFileds = exports.getFinalTsconfig = exports.getFinalDts = void 0;
+
+var _utils = require("@modern-js/utils");
+
+var _lodash = require("@modern-js/utils/lodash");
+
+var _constants = require("../../utils/constants");
+
+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 constants = _utils.Import.lazy('./constants', require);
+
+const legacyConstants = _utils.Import.lazy('./legacy-constants', require);
+
+const getNormalizeModuleConfigByPackageModeAndFileds = (api, buildFeatOption) => {
+  const {
+    output: {
+      packageMode,
+      packageFields,
+      disableTsChecker,
+      importStyle
+    }
+  } = api.useResolvedConfigContext();
+  let configs = [];
+
+  if (buildFeatOption.styleOnly) {
+    configs.push({
+      buildType: 'bundleless',
+      outputPath: './js/styles',
+      bundlelessOptions: {
+        sourceDir: './src',
+        style: {
+          compileMode: importStyle === 'source-code' ? 'only-source-code' : 'all'
+        }
+      }
+    });
+    configs.push({
+      buildType: 'bundleless',
+      outputPath: './styles',
+      bundlelessOptions: {
+        sourceDir: './styles',
+        style: {
+          compileMode: 'only-compiled-code'
+        }
+      }
+    });
+    return configs;
+  }
+
+  const commonConfig = {
+    buildType: 'bundleless',
+    bundlelessOptions: {
+      sourceDir: './src',
+      style: {
+        path: '../styles',
+        compileMode: false
+      },
+      static: {
+        path: '../styles'
+      }
+    },
+    outputPath: './'
+  };
+  commonConfig.tsconfig = getFinalTsconfig(commonConfig, buildFeatOption);
+
+  if (!packageFields || typeof packageFields === 'object' && Object.keys(packageFields).length === 0) {
+    const buildConfigs = legacyConstants.PACKAGE_MODES[packageMode || legacyConstants.DEFAULT_PACKAGE_MODE];
+    configs = buildConfigs.map(config => _utils.lodash.mergeWith({}, commonConfig, config));
+  } else {
+    const getConfigsByJsSyntaxType = (js, outputPath) => {
+      if (js === 'CJS+ES6') {
+        return _utils.lodash.mergeWith({}, commonConfig, {
+          format: 'cjs',
+          target: 'es6',
+          outputPath
+        });
+      } else if (js === 'ESM+ES5') {
+        return _utils.lodash.mergeWith({}, commonConfig, {
+          format: 'esm',
+          target: 'es5',
+          outputPath
+        });
+      }
+
+      return _utils.lodash.mergeWith({}, commonConfig, {
+        format: 'esm',
+        target: 'es6',
+        outputPath
+      });
+    };
+
+    if (!packageFields['jsnext:modern'] && !packageFields.main && !packageFields.module) {
+      throw new Error(`Unrecognized ${JSON.stringify(packageFields)} configuration, please use keys: 'modern, main, jupiter:modern' and use values: 'CJS+ES6, ESM+ES5, ESM+ES6'`);
+    } // The fields configured in packageFields correspond to the main, module, and jsnext:modern fields on package.json,
+    // and can also be used on package.json exports field.
+
+
+    if (packageFields['jsnext:modern']) {
+      configs.push(getConfigsByJsSyntaxType(packageFields['jsnext:modern'], 'modern'));
+    }
+
+    if (packageFields.main) {
+      configs.push(getConfigsByJsSyntaxType(packageFields.main, 'node'));
+    }
+
+    if (packageFields.module) {
+      configs.push(getConfigsByJsSyntaxType(packageFields.module, 'treeshaking'));
+    }
+  }
+
+  if (configs.length > 0) {
+    const firstConfig = configs[0];
+    firstConfig.bundlelessOptions = _utils.lodash.mergeWith({}, firstConfig.bundlelessOptions, {
+      style: {
+        compileMode: importStyle === 'source-code' ? 'only-source-code' : 'all'
+      }
+    });
+  } // [compatibe mode]: dts gen
+
+
+  if (buildFeatOption.legacyTsc && !disableTsChecker) {
+    configs.push({
+      buildType: 'bundleless',
+      outputPath: './types',
+      enableDts: true,
+      dtsOnly: true
+    });
+  }
+
+  configs.push({
+    buildType: 'bundleless',
+    outputPath: './styles',
+    bundlelessOptions: {
+      sourceDir: './styles',
+      style: {
+        compileMode: 'only-compiled-code'
+      }
+    }
+  });
+  return configs;
+};
+
+exports.getNormalizeModuleConfigByPackageModeAndFileds = getNormalizeModuleConfigByPackageModeAndFileds;
+
+const getFinalTsconfig = (config, buildFeatOption) => {
+  var _config$tsconfig;
+
+  // cli tsconfig option > buildPreset tsconfig option
+  // Since tsconfig configuration has default values,
+  // compare the two to see if the user is configured with cli tsconfig
+  if (buildFeatOption.tsconfigName !== _constants.cliTsConfigDefaultValue) {
+    return buildFeatOption.tsconfigName;
+  }
+
+  return (_config$tsconfig = config.tsconfig) !== null && _config$tsconfig !== void 0 ? _config$tsconfig : './tsconfig.json';
+};
+
+exports.getFinalTsconfig = getFinalTsconfig;
+
+const getFinalDts = (config, buildFeatOption) => {
+  var _config$enableDts;
+
+  // is js project, should return false
+  if (!buildFeatOption.isTsProject) {
+    return false;
+  } // when `build --dts`, then all build tasks`s enableDts is true
+
+
+  if (buildFeatOption.enableDtsGen) {
+    return true;
+  }
+
+  return (_config$enableDts = config.enableDts) !== null && _config$enableDts !== void 0 ? _config$enableDts : false;
+};
+
+exports.getFinalDts = getFinalDts;
+
+const getSourceMap = (config, buildType, api) => {
+  // TODO: remove
+  const {
+    output: {
+      disableSourceMap
+    }
+  } = api.useResolvedConfigContext();
+
+  if (disableSourceMap) {
+    return false;
+  }
+
+  if (config.sourceMap !== undefined) {
+    return config.sourceMap;
+  }
+
+  return buildType === 'bundle';
+};
+
+exports.getSourceMap = getSourceMap;
+
+const normalizeBuildConfig = (context, buildConfig) => {
+  const {
+    buildFeatOption,
+    api
+  } = context;
+  const configArray = Array.isArray(buildConfig) ? buildConfig : [buildConfig];
+  const normalizedModule = configArray.map(config => {
+    var _config$format, _config$target, _bundleOptions$minify, _config$outputPath, _config$dtsOnly;
+
+    const format = (_config$format = config.format) !== null && _config$format !== void 0 ? _config$format : 'cjs';
+    const target = (_config$target = config.target) !== null && _config$target !== void 0 ? _config$target : 'esnext';
+    const {
+      bundleOptions
+    } = config;
+
+    const normalizedBundleOption = _objectSpread(_objectSpread({}, bundleOptions), {}, {
+      entry: (bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.entry) || {
+        index: `src/index.${buildFeatOption.isTsProject ? 'ts' : 'js'}`
+      },
+      platform: (bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.platform) || 'node',
+      minify: (_bundleOptions$minify = bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.minify) !== null && _bundleOptions$minify !== void 0 ? _bundleOptions$minify : false
+    });
+
+    const normalizedBundlelessOptions = (0, _lodash.mergeWith)({}, {
+      sourceDir: './src',
+      style: {
+        compileMode: 'all',
+        path: './'
+      },
+      static: {
+        path: './'
+      }
+    }, config.bundlelessOptions);
+    const watch = buildFeatOption.enableWatchMode || false;
+    const tsconfig = getFinalTsconfig(config, buildFeatOption);
+    const enableDts = getFinalDts(config, buildFeatOption);
+    const outputPath = (_config$outputPath = config.outputPath) !== null && _config$outputPath !== void 0 ? _config$outputPath : './';
+    const sourceMap = getSourceMap(config, config.buildType, api);
+    const dtsOnly = (_config$dtsOnly = config.dtsOnly) !== null && _config$dtsOnly !== void 0 ? _config$dtsOnly : false;
+    const commmonConfig = {
+      format,
+      target,
+      watch,
+      tsconfig,
+      enableDts,
+      outputPath,
+      dtsOnly,
+      sourceMap
+    };
+
+    if (!buildFeatOption.isTsProject && (dtsOnly || enableDts)) {
+      console.warn('[WARN] dtsOnly、enableDts 配置仅在 Ts 项目下生效');
+    } else if (buildFeatOption.isTsProject && dtsOnly && !enableDts) {
+      console.warn('[WARN] dtsOnly 配置仅在 enableDts 为 true 的时候生效. 请检查当前的 dtsOnly、enableDts 是否配置正确');
+    }
+
+    if (config.buildType === 'bundle') {
+      return _objectSpread(_objectSpread({}, commmonConfig), {}, {
+        buildType: 'bundle',
+        bundleOptions: normalizedBundleOption
+      });
+    } else {
+      return _objectSpread(_objectSpread({}, commmonConfig), {}, {
+        buildType: 'bundleless',
+        bundlelessOptions: normalizedBundlelessOptions
+      });
+    }
+  });
+  return normalizedModule;
+};
+
+exports.normalizeBuildConfig = normalizeBuildConfig;
+
+const normalizeModuleConfig = context => {
+  const {
+    buildFeatOption,
+    api
+  } = context;
+  const {
+    output: {
+      buildConfig,
+      buildPreset
+    }
+  } = api.useResolvedConfigContext(); // buildConfig is the most important.
+
+  if (buildConfig) {
+    return normalizeBuildConfig(context, buildConfig);
+  } // buildPreset is the second important. It can be used when buildConfig is not defined.
+  // buildPreset -> buildConfig
+
+
+  if (buildPreset) {
+    const {
+      unPresetConfigs,
+      unPresetWithTargetConfigs
+    } = constants;
+
+    if (unPresetConfigs[buildPreset]) {
+      return normalizeBuildConfig(context, unPresetConfigs[buildPreset]);
+    } else if (unPresetWithTargetConfigs[buildPreset]) {
+      return normalizeBuildConfig(context, unPresetWithTargetConfigs[buildPreset]);
+    } // If the buildPreset is not found, then it is used 'npm-library'
+    // TODO: Warning: The buildPreset 'npm-library' is not supported.
+
+
+    return normalizeBuildConfig(context, unPresetConfigs['npm-library']);
+  } // If the user does not configure buildConfig and buildPreset,
+  // the configuration is generated based on packageMode and packageField
+
+
+  const legacyBuildConfig = getNormalizeModuleConfigByPackageModeAndFileds(api, buildFeatOption);
+  return normalizeBuildConfig(context, legacyBuildConfig);
+};
+
+exports.normalizeModuleConfig = normalizeModuleConfig;

package/dist/js/node/features/build/utils.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.logTemplate = exports.getDtsMapper = exports.getCodeMapper = exports.getCodeInitMapper = exports.TimeCounter = exports.LogStack = void 0;
-
-var path = _interopRequireWildcard(require("path"));
+exports.watchSectionTitle = exports.logTemplate = exports.getPostcssOption = exports.SectionTitleStatus = exports.LogStack = void 0;
 
 var os = _interopRequireWildcard(require("os"));
 
@@ -17,141 +15,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 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 constants = _utils.Import.lazy('./constants', require); // 硬解字符串返回相应格式的对象
-
-
-const updateMapper = (packageFieldValue, outDir, mapper) => {
-  if (packageFieldValue === 'CJS+ES6') {
-    return [...mapper, {
-      type: 'commonjs',
-      syntax: 'es6+',
-      outDir
-    }];
-  } else if (packageFieldValue === 'ESM+ES5') {
-    return [...mapper, {
-      type: 'module',
-      syntax: 'es5',
-      outDir
-    }];
-  } else if (packageFieldValue === 'ESM+ES6') {
-    return [...mapper, {
-      type: 'module',
-      syntax: 'es6+',
-      outDir
-    }];
-  } else {
-    return [...mapper];
-  }
-};
+const constants = _utils.Import.lazy('./constants', require);
 
-const getCodeInitMapper = (api, _) => {
-  const {
-    output: {
-      packageFields,
-      packageMode
-    }
-  } = api.useResolvedConfigContext();
-  let initMapper = []; // 如果不存在packageFields配置或者packageFields为空对象，则使用 packageMode
-
-  if (!packageFields || typeof packageFields === 'object' && Object.keys(packageFields).length === 0) {
-    initMapper = constants.PACKAGE_MODES[packageMode || constants.DEFAULT_PACKAGE_MODE];
-  } else if (packageFields && Object.keys(packageFields).length > 0) {
-    if (packageFields.modern) {
-      initMapper = updateMapper(packageFields.modern, 'modern', initMapper);
-    }
-
-    if (packageFields.main) {
-      initMapper = updateMapper(packageFields.main, 'node', initMapper);
-    }
-
-    if (packageFields.module) {
-      initMapper = updateMapper(packageFields.module, 'treeshaking', initMapper);
-    } // TODO: 如果存在其他配置，需要提示
-
-
-    if (!packageFields.modern && !packageFields.main && !packageFields.module) {
-      console.error(_utils.chalk.red(`Unrecognized ${JSON.stringify(packageFields)} configuration, please use keys: 'modern, main, jupiter:modern' and use values: 'CJS+ES6, ESM+ES5, ESM+ES6'`)); // eslint-disable-next-line no-process-exit
-
-      process.exit(1);
-    }
-  }
-
-  return initMapper;
-}; // 获取执行构建源码的参数
-
-
-exports.getCodeInitMapper = getCodeInitMapper;
-
-const getCodeMapper = (api, {
-  logger,
-  taskPath,
-  config,
-  initMapper,
-  srcRootDir,
-  willCompilerDirOrFile
-}) => {
-  const {
-    appDirectory
-  } = api.useAppContext();
-  const modernConfig = api.useResolvedConfigContext();
-  const {
-    output: {
-      enableSourceMap,
-      jsPath = 'js',
-      path: distDir = 'dist'
-    }
-  } = modernConfig;
-  const {
-    tsconfigName = 'tsconfig.json'
-  } = config;
-  const tsconfigPath = path.join(appDirectory, tsconfigName);
-  return initMapper.map(option => {
-    var _option$copyDirs;
-
-    // 不是output.copy配置，而是内部的js copy逻辑
-    const copyDirs = (_option$copyDirs = option.copyDirs) === null || _option$copyDirs === void 0 ? void 0 : _option$copyDirs.map(copyDir => path.join(appDirectory, `./${distDir}/${jsPath}/${copyDir}`));
-    return {
-      logger,
-      taskPath,
-      params: [`--syntax=${option.syntax}`, `--type=${option.type}`, `--srcRootDir=${srcRootDir}`, `--willCompilerDirOrFile=${willCompilerDirOrFile}`, copyDirs ? `--copyDirs=${copyDirs.join(',')}` : '', `--distDir=${path.join(appDirectory, `./${distDir}/${jsPath}/${option.outDir}`)}`, `--appDirectory=${appDirectory}`, enableSourceMap ? '--sourceMaps' : '', `--tsconfigPath=${tsconfigPath}`]
-    };
-  });
-}; // 获取执行生成 d.ts 的参数
-
-
-exports.getCodeMapper = getCodeMapper;
-
-const getDtsMapper = (api, config, logger) => {
-  const {
-    appDirectory
-  } = api.useAppContext();
-  const modernConfig = api.useResolvedConfigContext();
-  const {
-    output: {
-      disableTsChecker,
-      path: outputPath = 'dist'
-    }
-  } = modernConfig;
-  const {
-    tsconfigName = 'tsconfig.json',
-    enableWatchMode,
-    sourceDir
-  } = config;
-  const srcDir = path.join(appDirectory, './src');
-  const tsconfigPath = path.join(appDirectory, tsconfigName);
-  return [{
-    logger,
-    taskPath: require.resolve("../../tasks/generator-dts"),
-    params: [`--srcDir=${srcDir}`, `--distDir=${path.join(appDirectory, `./${outputPath}/types`)}`, `--appDirectory=${appDirectory}`, `--tsconfigPath=${tsconfigPath}`, `--sourceDirName=${sourceDir}`, enableWatchMode ? `--watch` : '', disableTsChecker ? '' : `--tsCheck`]
-  }];
-};
+const cssConfig = _utils.Import.lazy('@modern-js/css-config', require);
 /**
  * 处理日志信息
  */
 
 
-exports.getDtsMapper = getDtsMapper;
-
 class LogStack {
   constructor() {
     _defineProperty(this, "_codeLogStack", void 0);
@@ -203,24 +74,39 @@ const logTemplate = (title, messageStack, maxLength, {
   const template = `${title}:
 ${_contentColor(messageFragments.join(os.EOL))}${_noBottomBorder ? '' : `\n${_bottomBorderText}`}`;
   return template;
-}; // eslint-disable-next-line @typescript-eslint/no-extraneous-class
-
+};
 
 exports.logTemplate = logTemplate;
-
-class TimeCounter {
-  static time() {
-    this._now = Date.now();
+let SectionTitleStatus;
+exports.SectionTitleStatus = SectionTitleStatus;
+
+(function (SectionTitleStatus) {
+  SectionTitleStatus[SectionTitleStatus["Success"] = 0] = "Success";
+  SectionTitleStatus[SectionTitleStatus["Fail"] = 1] = "Fail";
+  SectionTitleStatus[SectionTitleStatus["Log"] = 2] = "Log";
+})(SectionTitleStatus || (exports.SectionTitleStatus = SectionTitleStatus = {}));
+
+const watchSectionTitle = (str, status) => {
+  if (status === SectionTitleStatus.Success) {
+    return `${_utils.chalk.bgWhite.gray.underline(str)} ${_utils.chalk.green.underline('Successful')}`;
+  } else if (status === SectionTitleStatus.Fail) {
+    return `${_utils.chalk.bgWhite.gray.underline(str)} ${_utils.chalk.red.underline('Build Failed')}`;
   }
 
-  static timeEnd() {
-    const span = Date.now() - this._now;
+  return `${_utils.chalk.bgWhite.gray.underline(str)} ${_utils.chalk.blue.underline('Log')}`;
+};
 
-    return span < 1000 ? `${span}ms` : `${(span / 1000).toFixed(2)}s`;
-  }
+exports.watchSectionTitle = watchSectionTitle;
 
-}
+const getPostcssOption = (appDirectory, modernConfig) => {
+  var _postcssOption$postcs;
 
-exports.TimeCounter = TimeCounter;
+  const postcssOption = cssConfig.getPostcssConfig(appDirectory, modernConfig, false);
+  return {
+    plugins: (postcssOption === null || postcssOption === void 0 ? void 0 : (_postcssOption$postcs = postcssOption.postcssOptions) === null || _postcssOption$postcs === void 0 ? void 0 : _postcssOption$postcs.plugins) || [],
+    enableSourceMap: (postcssOption === null || postcssOption === void 0 ? void 0 : postcssOption.sourceMap) || false,
+    options: {}
+  };
+};
 
-_defineProperty(TimeCounter, "_now", void 0);
+exports.getPostcssOption = getPostcssOption;

package/dist/js/node/index.js

@@ -17,6 +17,8 @@ var _pluginChangeset = _interopRequireDefault(require("@modern-js/plugin-changes
 
 var _pluginAnalyze = _interopRequireDefault(require("@modern-js/plugin-analyze"));
 
+var _pluginJarvis = _interopRequireDefault(require("@modern-js/plugin-jarvis"));
+
 var _hooks = require("./hooks");
 
 var _core = require("@modern-js/core");
@@ -31,11 +33,13 @@ const schema = _utils.Import.lazy('./schema', require);
 
 const lang = _utils.Import.lazy('./utils/language', require);
 
+const isBuildMode = process.argv.slice(2)[0] === 'build';
+
 var _default = () => ({
   name: '@modern-js/module-tools',
   post: ['@modern-js/plugin-analyze', '@modern-js/plugin-changeset'],
   registerHook: _hooks.hooks,
-  usePlugins: [(0, _pluginChangeset.default)(), (0, _pluginAnalyze.default)()],
+  usePlugins: [(0, _pluginChangeset.default)(), ...(isBuildMode ? [] : [(0, _pluginAnalyze.default)()]), (0, _pluginJarvis.default)()],
   setup: api => {
     const locale = lang.getLocaleLanguage();
     local.i18n.changeLanguage({

package/dist/js/node/locale/en.js

@@ -11,9 +11,11 @@ const EN_LOCALE = {
       watch: 'building module in watch mode',
       tsconfig: 'Specify a path to the tsconfig.json file',
       style_only: 'only build style',
-      platform: 'building for other platforms',
-      no_tsc: 'close tsc compiler to emit d.ts',
-      no_clear: 'disable auto clear dist dir'
+      platform: 'build the specified task or all tasks, If exist. (tasks: "storybook", "docs")',
+      no_tsc: 'close tsc compiler to emit d.ts (Deprecated)',
+      dts: 'Turn on dts generation and type checking',
+      no_clear: 'disable auto clear dist dir',
+      config: 'specify config file'
     },
     dev: {
       describe: 'start dev server'

package/dist/js/node/locale/zh.js

@@ -11,9 +11,11 @@ const ZH_LOCALE = {
       watch: '使用 Watch 模式构建模块',
       tsconfig: '指定 tsconfig.json 文件的路径',
       style_only: '只构建样式文件',
-      platform: '构建其他平台产物',
-      no_tsc: '关闭 tsc 编译',
-      no_clear: '不清理产物目录'
+      platform: '如果存在的话，执行指定的构建任务或者全部构建任务. (构建任务包括: "storybook", "文档")',
+      no_tsc: '关闭 tsc 编译（废弃）',
+      dts: '开启 dts 文件的生成以及类型检查',
+      no_clear: '不清理产物目录',
+      config: '指定配置文件路径，可以为相对路径或绝对路径'
     },
     dev: {
       describe: '本地开发命令'