@modern-js/module-tools 2.0.0-beta.0 → 2.0.0-beta.2

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

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.padSpaceWith = exports.isInternalError = exports.isExecaError = exports.ModuleBuildError = exports.InternalDTSError = exports.InternalBuildError = void 0;
-
 var _utils = require("@modern-js/utils");
-
 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 padSpaceWith = (str, targetL, opts = {}) => {
   const {
     endStr = '|',
@@ -16,51 +13,40 @@ const padSpaceWith = (str, targetL, opts = {}) => {
   } = opts;
   const l = str.length;
   const endStrL = endStr.length;
-  const resetL = targetL - l - endStrL; // str is 'aaa', targetL is 4, result is 'aaa|'
+  const resetL = targetL - l - endStrL;
 
+  // str is 'aaa', targetL is 4, result is 'aaa|'
   if (resetL === 0) {
     return (style ? style(str) : str) + endStr;
-  } // str is 'aaa', targetL is 5, result is 'aaa |'
-
+  }
 
+  // str is 'aaa', targetL is 5, result is 'aaa |'
   if (resetL > 0) {
     const padStr = str.padEnd(targetL - 1, ' ');
-
     if (style) {
       return style(str) + padStr.replace(str, '') + endStr;
     }
-
     return padStr + endStr;
   }
-
   return str;
 };
-
 exports.padSpaceWith = padSpaceWith;
-
 class InternalBuildError extends Error {
   constructor(e, opts) {
     super(e.message);
-
     _defineProperty(this, "buildType", void 0);
-
     _defineProperty(this, "target", void 0);
-
     _defineProperty(this, "format", void 0);
-
     _defineProperty(this, "e", void 0);
-
     Error.captureStackTrace(this, this.constructor);
     this.e = e;
     this.buildType = opts.buildType;
     this.target = opts.target;
     this.format = opts.format;
   }
-
   toString() {
     return this.formatError().join('\n');
   }
-
   formatError() {
     const msgs = [];
     const {
@@ -91,28 +77,20 @@ class InternalBuildError extends Error {
     msgs.push(e.stack || '');
     return msgs;
   }
-
 }
-
 exports.InternalBuildError = InternalBuildError;
-
 class InternalDTSError extends Error {
   constructor(e, opts) {
     super(e.message);
-
     _defineProperty(this, "buildType", void 0);
-
     _defineProperty(this, "e", void 0);
-
     Error.captureStackTrace(this, this.constructor);
     this.e = e;
     this.buildType = opts.buildType;
   }
-
   toString() {
     return this.formatError().join('\n');
   }
-
   formatError() {
     const msgs = [];
     const {
@@ -120,7 +98,6 @@ class InternalDTSError extends Error {
       buildType
     } = this;
     msgs.push(_utils.chalk.red.bold(`${buildType} DTS failed:`));
-
     if (isExecaError(e)) {
       /**
        * `shortMeessage` content like:
@@ -129,47 +106,34 @@ class InternalDTSError extends Error {
        */
       if (e.stack) {
         var _e$stack;
-
         msgs.push((_e$stack = e.stack) === null || _e$stack === void 0 ? void 0 : _e$stack.replace(`${e.name}: ${e.shortMessage}`, ''));
       }
     } else {
       msgs.push(e.stack);
     }
-
     return msgs;
   }
-
 }
-
 exports.InternalDTSError = InternalDTSError;
-
 class ModuleBuildError extends Error {
   constructor(e) {
     super(`\n\n${e}`);
     Error.captureStackTrace(this, this.constructor);
     this.name = 'ModuleBuildError';
   }
-
 }
-
 exports.ModuleBuildError = ModuleBuildError;
-
 const isInternalError = e => {
   if (e instanceof InternalBuildError || e instanceof InternalDTSError) {
     return true;
   }
-
   return false;
 };
-
 exports.isInternalError = isInternalError;
-
 const isExecaError = e => {
   if (e.stdout) {
     return true;
   }
-
   return false;
 };
-
 exports.isExecaError = isExecaError;

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

@@ -4,39 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.runBuild = exports.checkPlatformAndRunBuild = exports.buildInNormalMode = exports.build = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _pMap = _interopRequireDefault(require("p-map"));
-
 var _readline = require("../../utils/readline");
-
 var _normalize = require("./normalize");
-
 var _constants = require("./constants");
-
 var _error = require("./error");
-
 var _utils2 = require("./utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const bundle = _utils.Import.lazy('./bundle', require);
-
 const bundleless = _utils.Import.lazy('./bundleless', require);
-
 const bp = _utils.Import.lazy('./build-platform', require);
-
 const copyUtils = _utils.Import.lazy('../../utils/copy', require);
-
 const checkPlatformAndRunBuild = async (platform, options) => {
   const {
     api,
     isTsProject
   } = options;
-
   if (typeof platform === 'boolean' && platform) {
     if (process.env.RUN_PLATFORM) {
       await bp.buildPlatform(api, {
@@ -44,12 +29,10 @@ const checkPlatformAndRunBuild = async (platform, options) => {
         isTsProject
       });
     }
-
     return {
       exit: true
     };
   }
-
   if (typeof platform === 'string') {
     if (process.env.RUN_PLATFORM) {
       await bp.buildPlatform(api, {
@@ -57,19 +40,15 @@ const checkPlatformAndRunBuild = async (platform, options) => {
         isTsProject
       });
     }
-
     return {
       exit: true
     };
   }
-
   return {
     exit: false
   };
 };
-
 exports.checkPlatformAndRunBuild = checkPlatformAndRunBuild;
-
 const runBuild = async (api, normalizedModuleConfig, config) => {
   await (0, _pMap.default)(normalizedModuleConfig, async moduleConfig => {
     if (moduleConfig.buildType === 'bundle') {
@@ -79,24 +58,18 @@ const runBuild = async (api, normalizedModuleConfig, config) => {
     }
   });
 };
-
 exports.runBuild = runBuild;
-
 const buildInNormalMode = async (api, normalizedModuleConfig, config) => {
   console.info(_utils.chalk.blue.bold(_constants.buildingText));
-
   try {
     // eslint-disable-next-line no-console
     console.time(_constants.buildSuccessText);
     await runBuild(api, normalizedModuleConfig, config);
-
-    _readline.ReadlineUtils.clearPrevLine(process.stdout); // eslint-disable-next-line no-console
-
-
+    _readline.ReadlineUtils.clearPrevLine(process.stdout);
+    // eslint-disable-next-line no-console
     console.timeEnd(_constants.buildSuccessText);
   } catch (e) {
     _readline.ReadlineUtils.clearPrevLine(process.stdout);
-
     if ((0, _error.isInternalError)(e)) {
       throw new _error.ModuleBuildError(e);
     } else {
@@ -104,9 +77,7 @@ const buildInNormalMode = async (api, normalizedModuleConfig, config) => {
     }
   }
 };
-
 exports.buildInNormalMode = buildInNormalMode;
-
 const build = async (api, config) => {
   const {
     platform,
@@ -122,23 +93,22 @@ const build = async (api, config) => {
     output: {
       path: outputPath = 'dist'
     }
-  } = modernConfig; // build platform
+  } = modernConfig;
 
+  // build platform
   const platformBuildRet = await checkPlatformAndRunBuild(platform, {
     api,
     isTsProject
   });
-
   if (platformBuildRet.exit) {
     return;
   }
-
   if (clear) {
     _utils.fs.removeSync(_path.default.join(appDirectory, outputPath));
   }
+  const deps = (0, _utils2.getAllDeps)(appDirectory);
 
-  const deps = (0, _utils2.getAllDeps)(appDirectory); // should normalize module tool config here, ensure the same config for build
-
+  // should normalize module tool config here, ensure the same config for build
   const normalizedModuleConfig = (0, _normalize.normalizeModuleConfig)({
     buildFeatOption: config,
     api,
@@ -148,7 +118,6 @@ const build = async (api, config) => {
     modernConfig,
     appContext
   });
-
   if (config.enableWatchMode) {
     console.info(_utils.chalk.blue.underline('start build in watch mode...\n'));
     await runBuild(api, normalizedModuleConfig, config);
@@ -156,5 +125,4 @@ const build = async (api, config) => {
     await buildInNormalMode(api, normalizedModuleConfig, config);
   }
 };
-
 exports.build = build;

package/dist/js/node/features/build/legacy-constants.js

@@ -22,8 +22,9 @@ const universalJs = [{
   format: 'esm',
   target: 'es6',
   outputPath: './js/modern'
-}]; // Universal JS 的优化选择，两份构建产物，对现代浏览器无优化
+}];
 
+// Universal JS 的优化选择，两份构建产物，对现代浏览器无优化
 const universalJsLite = [{
   format: 'esm',
   target: 'es5',
@@ -41,8 +42,9 @@ const universalJsLite = [{
   format: 'esm',
   target: 'es5',
   outputPath: './js/modern'
-}]; // 纯前端代码的默认选择，两份构建产物
+}];
 
+// 纯前端代码的默认选择，两份构建产物
 const browserJs = [{
   format: 'esm',
   target: 'es5',
@@ -60,8 +62,9 @@ const browserJs = [{
   format: 'esm',
   target: 'es6',
   outputPath: './js/modern'
-}]; // 纯前端代码的优化选择，单份构建产物，对现代浏览器无优化
+}];
 
+// 纯前端代码的优化选择，单份构建产物，对现代浏览器无优化
 const browserJsLite = [{
   format: 'esm',
   target: 'es5',
@@ -79,8 +82,9 @@ const browserJsLite = [{
   format: 'esm',
   target: 'es5',
   outputPath: './js/modern'
-}]; // 纯 Node.js 代码的默认选择，两份构建产物
+}];
 
+// 纯 Node.js 代码的默认选择，两份构建产物
 const nodeJs = [{
   format: 'cjs',
   target: 'es6',

package/dist/js/node/features/build/logger/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _logText = require("./logText");
-
 Object.keys(_logText).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _logText[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_logText).forEach(function (key) {
     }
   });
 });
-
 var _loggerManager = require("./loggerManager");
-
 Object.keys(_loggerManager).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _loggerManager[key]) return;

package/dist/js/node/features/build/logger/logText.js

@@ -4,18 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.logTemplate = exports.colors = exports.clearFlag = exports.LoggerText = void 0;
-
 var _utils = require("@modern-js/utils");
-
 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 colors = {
   title: _utils.chalk.rgb(218, 152, 92)
 };
 exports.colors = colors;
 const clearFlag = '\x1Bc';
 exports.clearFlag = clearFlag;
-
 const logTemplate = (title, messageStack, {
   noBottomBorder: _noBottomBorder = false,
   bottomBorderText: _bottomBorderText = '',
@@ -24,7 +20,6 @@ const logTemplate = (title, messageStack, {
   contentColor: _contentColor = s => s
 } = {}) => {
   const maxLength = Infinity; // TODO: 考虑后面是否提供该参数
-
   const leftBorderFlag = _noLeftBorder ? '' : _leftBorder;
   const messageFragments = messageStack.map(p => {
     p.trim();
@@ -32,44 +27,33 @@ const logTemplate = (title, messageStack, {
   }) // 移除 clearFlag
   .filter(s => s !== leftBorderFlag) // 过滤空字符串
   .slice(0, maxLength); // 控制长度
-
   const template = `${colors.title(title)}:
 ${_contentColor(messageFragments.join(''))}${_noBottomBorder ? '' : `\n${_bottomBorderText}`}`;
   return template;
 };
-
 exports.logTemplate = logTemplate;
-
 // 处理Log内容如何展示
 class LoggerText {
   constructor(option) {
     _defineProperty(this, "messages", void 0);
-
     _defineProperty(this, "hasErrorMessage", void 0);
-
     _defineProperty(this, "option", void 0);
-
     this.messages = [];
     this.option = option;
     this.hasErrorMessage = false;
   }
-
   append(message) {
     if (message.includes(clearFlag)) {
       this.messages = [];
     }
-
     this.messages.push(message);
   }
-
   errorHappen() {
     this.hasErrorMessage = true;
   }
-
   hasMessages() {
     return this.messages.length > 0;
   }
-
   get value() {
     const {
       title,
@@ -78,7 +62,5 @@ class LoggerText {
     const messages = [...new Set(this.messages)];
     return logTemplate(title, messages, contentConfig);
   }
-
 }
-
 exports.LoggerText = LoggerText;

package/dist/js/node/features/build/logger/loggerManager.js

@@ -4,38 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LoggerManager = void 0;
-
 var _events = _interopRequireDefault(require("events"));
-
 var _utils = require("@modern-js/utils");
-
 let _ = t => t,
-    _t;
-
+  _t;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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 logText = _utils.Import.lazy('./logText', require);
-
 const readline = _utils.Import.lazy('../../../utils/readline', require);
-
 class LoggerManager extends _events.default {
   constructor() {
     super();
-
     _defineProperty(this, "_compilering", void 0);
-
     _defineProperty(this, "_listeners", void 0);
-
     this._compilering = false;
     this._listeners = [];
   }
-
   createLoggerText(option) {
     return new logText.LoggerText(option);
   }
-
   addStdout(loggerText, stdout, config = {}) {
     const {
       event = {
@@ -48,7 +35,6 @@ class LoggerManager extends _events.default {
         warning: _utils.chalk.yellow
       }
     } = config;
-
     if (event.data) {
       stdout === null || stdout === void 0 ? void 0 : stdout.on('data', chunk => {
         const data = chunk.toString();
@@ -57,7 +43,6 @@ class LoggerManager extends _events.default {
         this.emit('data');
       });
     }
-
     if (event.error) {
       stdout === null || stdout === void 0 ? void 0 : stdout.on('error', error => {
         console.info('error');
@@ -68,10 +53,8 @@ class LoggerManager extends _events.default {
         this.emit('data');
       });
     }
-
     this._listeners.push(stdout);
   }
-
   addStderr(loggerText, stderr, color = _utils.chalk.red) {
     stderr === null || stderr === void 0 ? void 0 : stderr.on('data', chunk => {
       const data = chunk.toString();
@@ -80,29 +63,27 @@ class LoggerManager extends _events.default {
       this.emit('data');
     });
   }
-
   showCompiling() {
     if (!this._compilering) {
       this._compilering = true;
       console.info(_utils.chalk.green(_t || (_t = _`Compiling in progress...`)));
     }
   }
-
   disappearCompiling() {
     if (this._compilering) {
       readline.ReadlineUtils.clearLine(process.stdout);
       this._compilering = false;
     }
   }
-
-  listenDateAndShow(logTexts // stdout: NodeJS.WriteStream & {
+  listenDateAndShow(logTexts
+  // stdout: NodeJS.WriteStream & {
   //   fd: 1;
   // } = process.stdout,
   ) {
     this.on('data', () => {
       this.disappearCompiling();
-      const content = logTexts.map(logtext => logtext.value).join(''); // 每次更新，使用新的内容覆盖旧的内容，有几率出现内容错乱问题
-
+      const content = logTexts.map(logtext => logtext.value).join('');
+      // 每次更新，使用新的内容覆盖旧的内容，有几率出现内容错乱问题
       console.info(content);
     });
     return () => {
@@ -110,7 +91,5 @@ class LoggerManager extends _events.default {
       process.exit(0);
     };
   }
-
 }
-
 exports.LoggerManager = LoggerManager;