@modern-js/babel-compiler 2.0.0-beta.0 → 2.0.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # @modern-js/babel-compiler
 
+## 2.0.0-beta.2
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/utils@2.0.0-beta.1
+
 ## 2.0.0-beta.0
 
 ### Major Changes

package/dist/js/modern/build.js

@@ -13,14 +13,11 @@ export const build = async (option, babelConfig = {}) => {
     quiet = false
   } = option;
   const virtualDists = [];
-
   if (clean) {
     await fs.remove(distDir);
   }
-
   fs.ensureDir(distDir);
   const messageDetails = [];
-
   for (const filename of filenames) {
     try {
       const dist = compiler({
@@ -33,7 +30,6 @@ export const build = async (option, babelConfig = {}) => {
         babelConfig,
         distFileExtMap
       });
-
       if (enableVirtualDist && dist) {
         virtualDists.push(dist);
       }
@@ -44,17 +40,15 @@ export const build = async (option, babelConfig = {}) => {
       });
     }
   }
-
   const happenError = messageDetails.length > 0;
-
   if (!quiet) {
     if (happenError) {
-      logger.error(`Compilation failure ${messageDetails.length} ${messageDetails.length !== 1 ? 'files' : 'file'} with Babel.`); // TODO: 具体的报错信息打印
+      logger.error(`Compilation failure ${messageDetails.length} ${messageDetails.length !== 1 ? 'files' : 'file'} with Babel.`);
+      // TODO: 具体的报错信息打印
     } else {
       logger.info(`Successfully compiled ${filenames.length} ${filenames.length !== 1 ? 'files' : 'file'} with Babel.`);
     }
   }
-
   if (happenError) {
     return {
       code: 1,
@@ -62,7 +56,6 @@ export const build = async (option, babelConfig = {}) => {
       messageDetails
     };
   }
-
   return {
     code: 0,
     message: `Successfully compiled ${filenames.length} ${filenames.length !== 1 ? 'files' : 'file'} with Babel.`,

package/dist/js/modern/buildWatch.js

@@ -1,9 +1,6 @@
 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 * as path from 'path';
 import * as Event from 'events';
 import { logger, watch, WatchChangeType } from '@modern-js/utils';
@@ -17,22 +14,17 @@ export const BuildWatchEvent = {
 export class BuildWatchEmitter extends Event.EventEmitter {
   constructor(...args) {
     super(...args);
-
     _defineProperty(this, "_initFn", void 0);
   }
-
   setInitFn(fn) {
     this._initFn = fn;
   }
-
   async watch() {
     if (typeof this._initFn === 'function') {
       return this._initFn(this);
     }
-
     return null;
   }
-
 }
 export const runBuildWatch = async (option, babelConfig = {}, emitter) => {
   emitter.emit(BuildWatchEvent.compiling);
@@ -41,33 +33,28 @@ export const runBuildWatch = async (option, babelConfig = {}, emitter) => {
   const {
     distDir,
     quiet
-  } = option; // 第一次正常构建
-
+  } = option;
+  // 第一次正常构建
   const firstBuildResult = await build(option, babelConfig);
   const {
     code
   } = firstBuildResult;
-
   if (code === 1) {
     errorResult.init(firstBuildResult);
     emitter.emit(BuildWatchEvent.firstCompiler, errorResult.value);
   } else {
     emitter.emit(BuildWatchEvent.firstCompiler, firstBuildResult);
   }
-
   return watch(`${watchDir}/**/*.{js,jsx,ts,tsx}`, async ({
     changeType,
     changedFilePath
   }) => {
     emitter.emit(BuildWatchEvent.compiling);
-
     if (changeType === WatchChangeType.UNLINK) {
       const removeFiles = [path.normalize(`./${distDir}/${path.relative(watchDir, changedFilePath)}`)];
-
       if (!quiet) {
         logger.info(`remove file: ${removeFiles.join(',')}`);
       }
-
       const result = {
         code: 0,
         message: `remove file: ${removeFiles.join(',')}`,
@@ -76,18 +63,16 @@ export const runBuildWatch = async (option, babelConfig = {}, emitter) => {
       emitter.emit(BuildWatchEvent.watchingCompiler, result);
       return;
     }
-
     const result = await build(_objectSpread(_objectSpread({}, option), {}, {
       filenames: [changedFilePath]
     }), babelConfig);
-
     if (result.code === 1) {
       errorResult.update(result.messageDetails || []);
       emitter.emit(BuildWatchEvent.watchingCompiler, errorResult.value);
       !quiet && logger.info(errorResult.value.message);
     } else {
-      errorResult.removeByFileName(changedFilePath); // 如果该文件没有报错，则更新该文件状态并检查是否还存在其他报错文件
-
+      errorResult.removeByFileName(changedFilePath);
+      // 如果该文件没有报错，则更新该文件状态并检查是否还存在其他报错文件
       if (errorResult.checkExistError()) {
         emitter.emit(BuildWatchEvent.watchingCompiler, _objectSpread(_objectSpread({}, errorResult.value), {}, {
           virtualDists: result.virtualDists

package/dist/js/modern/compiler.js

@@ -1,9 +1,6 @@
 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 * as path from 'path';
 import * as babel from '@babel/core';
 import { logger, fs } from '@modern-js/utils';
@@ -30,21 +27,17 @@ export const resolveSourceMap = option => {
   } = option;
   const mapLoc = `${distFilePath}.map`;
   babelRes.code = utils.addSourceMappingUrl(babelRes.code, mapLoc);
-
   if (babelRes.map) {
     babelRes.map.file = path.basename(distFilePath);
     babelRes.map.sources = [path.relative(path.dirname(distFilePath), sourceFilePath)];
   }
-
   const sourceMapVirtualDist = {
     sourcemap: JSON.stringify(babelRes.map),
     sourceMapPath: mapLoc
   };
-
   if (enableVirtualDist) {
     return sourceMapVirtualDist;
   }
-
   fs.ensureDirSync(path.dirname(mapLoc));
   fs.writeFileSync(mapLoc, JSON.stringify(babelRes.map));
   return sourceMapVirtualDist;
@@ -62,18 +55,15 @@ export const compiler = option => {
   } = option;
   const babelRes = babel.transformFileSync(filepath, babelConfig);
   let virtualDist = null;
-
   if (!isRes(babelRes)) {
     throw new Error(`${filepath} happen error`);
   }
-
   const distFilePath = getDistFilePath({
     filepath,
     rootDir,
     distDir,
     extMap: distFileExtMap
   });
-
   if (enableVirtualDist) {
     virtualDist = {
       distPath: distFilePath,
@@ -82,7 +72,6 @@ export const compiler = option => {
       sourcemap: ''
     };
   }
-
   if (babelRes !== null && babelRes !== void 0 && babelRes.map && babelConfig.sourceMaps && babelConfig.sourceMaps !== 'inline') {
     if (virtualDist) {
       virtualDist = _objectSpread(_objectSpread({}, virtualDist), resolveSourceMap({
@@ -100,7 +89,6 @@ export const compiler = option => {
       });
     }
   }
-
   if (virtualDist) {
     virtualDist = _objectSpread(_objectSpread({}, virtualDist), {}, {
       distPath: distFilePath,
@@ -110,10 +98,8 @@ export const compiler = option => {
     fs.ensureDirSync(path.dirname(distFilePath));
     fs.writeFileSync(distFilePath, babelRes.code);
   }
-
   if (verbose && !quiet) {
     logger.info(`${filepath} => ${distFilePath}`);
   }
-
   return virtualDist;
 };

package/dist/js/modern/compilerErrorResult.js

@@ -1,16 +1,12 @@
 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; }
-
 export class CompilerErrorResult {
   constructor(initErrorResult) {
     _defineProperty(this, "_messageDetails", void 0);
-
     this.init(initErrorResult);
   }
-
   init(initErrorResult) {
     this._messageDetails = (initErrorResult === null || initErrorResult === void 0 ? void 0 : initErrorResult.messageDetails) || [];
   }
-
   update(messageDetails) {
     for (const messageDetail of messageDetails) {
       // 遍历存不存在该文件报错信息，不存在则增加，否则更新内容
@@ -20,32 +16,25 @@ export class CompilerErrorResult {
           detail.content = messageDetail.content;
           return true;
         }
-
         return false;
       });
-
       if (addError) {
         this._messageDetails.push(messageDetail);
       }
     }
   }
-
   removeByFileName(filename) {
     this._messageDetails = this._messageDetails.filter(detail => detail.filename !== filename);
   }
-
   get value() {
     var _this$_messageDetails;
-
     return {
       code: 1,
       message: `Compilation failure ${(_this$_messageDetails = this._messageDetails) === null || _this$_messageDetails === void 0 ? void 0 : _this$_messageDetails.length} files with Babel.`,
       messageDetails: this._messageDetails
     };
   }
-
   checkExistError() {
     return this._messageDetails.length > 0;
   }
-
 }

package/dist/js/modern/defaults.js

@@ -1,9 +1,6 @@
 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 { defaultDistFileExtMap } from "./constants";
 const defaultOptions = {
   enableWatch: false,

package/dist/js/modern/getFinalOption.js

@@ -1,9 +1,6 @@
 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 { glob } from '@modern-js/utils';
 import { DEFAULT_EXTENSIONS } from '@babel/core';
 import { mergeDefaultOption } from "./defaults";
@@ -18,9 +15,7 @@ export const getGlobPattern = (dir, extensions) => {
 };
 export const getFinalExtensions = extensions => {
   const isExtensions = ext => Array.isArray(ext);
-
   const isExtensionsFunc = ext => typeof ext === 'function';
-
   if (isExtensions(extensions)) {
     return [...extensions, ...DEFAULT_EXTENSIONS];
   } else if (isExtensionsFunc(extensions)) {
@@ -52,7 +47,6 @@ export const getFinalCompilerOption = option => {
   } = option;
   let globFindFilenames = [];
   const finalExt = getFinalExtensions(extensions);
-
   if (sourceDir) {
     globFindFilenames = getFilesFromDir({
       dir: sourceDir,
@@ -60,7 +54,6 @@ export const getFinalCompilerOption = option => {
       finalExt
     });
   }
-
   if (enableWatch) {
     // 开启watch模式，清空通过 sourceDir 找到的文件，而改为使用watchDirs
     globFindFilenames = getFilesFromDir({
@@ -69,7 +62,6 @@ export const getFinalCompilerOption = option => {
       finalExt
     });
   }
-
   return _objectSpread(_objectSpread({}, optionWithDefault), {}, {
     filenames: [...optionWithDefault.filenames, ...globFindFilenames]
   });

package/dist/js/modern/index.js

@@ -4,13 +4,10 @@ import { buildWatch } from "./buildWatch";
 import { validate } from "./validate";
 export async function compiler(compilerOptions, babelOptions = {}) {
   const validRet = validate(compilerOptions);
-
   if (validRet) {
     return validRet;
   }
-
   const finalCompilerOption = getFinalCompilerOption(compilerOptions);
-
   if (compilerOptions.enableWatch) {
     return buildWatch(finalCompilerOption, babelOptions);
   } else {

package/dist/js/modern/validate.js

@@ -7,19 +7,16 @@ export const validateSourceDirAndFileNames = compilerOptions => {
     filenames,
     quiet
   } = compilerOptions;
-
   if (!sourceDir && !filenames) {
     if (!quiet) {
       logger.error(sourceDirAndFileNamesValidMessage);
     }
-
     return {
       code: 1,
       message: sourceDirAndFileNamesValidMessage,
       virtualDists: []
     };
   }
-
   return null;
 };
 export const validateWatchDir = compilerOptions => {
@@ -28,25 +25,21 @@ export const validateWatchDir = compilerOptions => {
     enableWatch,
     quiet
   } = compilerOptions;
-
   if (enableWatch && !watchDir) {
     if (!quiet) {
       logger.error(watchDirValidMessage);
     }
-
     return {
       code: 1,
       message: watchDirValidMessage,
       virtualDists: []
     };
   }
-
   return null;
 };
 export const validate = compilerOptions => {
   if (compilerOptions.enableWatch) {
     return validateWatchDir(compilerOptions);
   }
-
   return validateSourceDirAndFileNames(compilerOptions);
 };

package/dist/js/node/build.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.build = void 0;
-
 var _utils = require("@modern-js/utils");
-
 var _constants = require("./constants");
-
 var _compiler = require("./compiler");
-
 const build = async (option, babelConfig = {}) => {
   const {
     rootDir,
@@ -23,15 +19,11 @@ const build = async (option, babelConfig = {}) => {
     quiet = false
   } = option;
   const virtualDists = [];
-
   if (clean) {
     await _utils.fs.remove(distDir);
   }
-
   _utils.fs.ensureDir(distDir);
-
   const messageDetails = [];
-
   for (const filename of filenames) {
     try {
       const dist = (0, _compiler.compiler)({
@@ -44,7 +36,6 @@ const build = async (option, babelConfig = {}) => {
         babelConfig,
         distFileExtMap
       });
-
       if (enableVirtualDist && dist) {
         virtualDists.push(dist);
       }
@@ -55,18 +46,15 @@ const build = async (option, babelConfig = {}) => {
       });
     }
   }
-
   const happenError = messageDetails.length > 0;
-
   if (!quiet) {
     if (happenError) {
-      _utils.logger.error(`Compilation failure ${messageDetails.length} ${messageDetails.length !== 1 ? 'files' : 'file'} with Babel.`); // TODO: 具体的报错信息打印
-
+      _utils.logger.error(`Compilation failure ${messageDetails.length} ${messageDetails.length !== 1 ? 'files' : 'file'} with Babel.`);
+      // TODO: 具体的报错信息打印
     } else {
       _utils.logger.info(`Successfully compiled ${filenames.length} ${filenames.length !== 1 ? 'files' : 'file'} with Babel.`);
     }
   }
-
   if (happenError) {
     return {
       code: 1,
@@ -74,12 +62,10 @@ const build = async (option, babelConfig = {}) => {
       messageDetails
     };
   }
-
   return {
     code: 0,
     message: `Successfully compiled ${filenames.length} ${filenames.length !== 1 ? 'files' : 'file'} with Babel.`,
     virtualDists
   };
 };
-
 exports.build = build;

package/dist/js/node/buildWatch.js

@@ -4,57 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.runBuildWatch = exports.buildWatch = exports.BuildWatchEvent = exports.BuildWatchEmitter = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var Event = _interopRequireWildcard(require("events"));
-
 var _utils = require("@modern-js/utils");
-
 var _build = require("./build");
-
 var _compilerErrorResult = require("./compilerErrorResult");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 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 BuildWatchEvent = {
   firstCompiler: 'first-compiler',
   compiling: 'compiling',
   watchingCompiler: 'watching-compiler'
 };
 exports.BuildWatchEvent = BuildWatchEvent;
-
 class BuildWatchEmitter extends Event.EventEmitter {
   constructor(...args) {
     super(...args);
-
     _defineProperty(this, "_initFn", void 0);
   }
-
   setInitFn(fn) {
     this._initFn = fn;
   }
-
   async watch() {
     if (typeof this._initFn === 'function') {
       return this._initFn(this);
     }
-
     return null;
   }
-
 }
-
 exports.BuildWatchEmitter = BuildWatchEmitter;
-
 const runBuildWatch = async (option, babelConfig = {}, emitter) => {
   emitter.emit(BuildWatchEvent.compiling);
   const errorResult = new _compilerErrorResult.CompilerErrorResult();
@@ -62,33 +43,28 @@ const runBuildWatch = async (option, babelConfig = {}, emitter) => {
   const {
     distDir,
     quiet
-  } = option; // 第一次正常构建
-
+  } = option;
+  // 第一次正常构建
   const firstBuildResult = await (0, _build.build)(option, babelConfig);
   const {
     code
   } = firstBuildResult;
-
   if (code === 1) {
     errorResult.init(firstBuildResult);
     emitter.emit(BuildWatchEvent.firstCompiler, errorResult.value);
   } else {
     emitter.emit(BuildWatchEvent.firstCompiler, firstBuildResult);
   }
-
   return (0, _utils.watch)(`${watchDir}/**/*.{js,jsx,ts,tsx}`, async ({
     changeType,
     changedFilePath
   }) => {
     emitter.emit(BuildWatchEvent.compiling);
-
     if (changeType === _utils.WatchChangeType.UNLINK) {
       const removeFiles = [path.normalize(`./${distDir}/${path.relative(watchDir, changedFilePath)}`)];
-
       if (!quiet) {
         _utils.logger.info(`remove file: ${removeFiles.join(',')}`);
       }
-
       const result = {
         code: 0,
         message: `remove file: ${removeFiles.join(',')}`,
@@ -97,18 +73,16 @@ const runBuildWatch = async (option, babelConfig = {}, emitter) => {
       emitter.emit(BuildWatchEvent.watchingCompiler, result);
       return;
     }
-
     const result = await (0, _build.build)(_objectSpread(_objectSpread({}, option), {}, {
       filenames: [changedFilePath]
     }), babelConfig);
-
     if (result.code === 1) {
       errorResult.update(result.messageDetails || []);
       emitter.emit(BuildWatchEvent.watchingCompiler, errorResult.value);
       !quiet && _utils.logger.info(errorResult.value.message);
     } else {
-      errorResult.removeByFileName(changedFilePath); // 如果该文件没有报错，则更新该文件状态并检查是否还存在其他报错文件
-
+      errorResult.removeByFileName(changedFilePath);
+      // 如果该文件没有报错，则更新该文件状态并检查是否还存在其他报错文件
       if (errorResult.checkExistError()) {
         emitter.emit(BuildWatchEvent.watchingCompiler, _objectSpread(_objectSpread({}, errorResult.value), {}, {
           virtualDists: result.virtualDists
@@ -121,13 +95,10 @@ const runBuildWatch = async (option, babelConfig = {}, emitter) => {
     }
   }, [`${watchDir}/**/*.d.ts`]);
 };
-
 exports.runBuildWatch = runBuildWatch;
-
 const buildWatch = (option, babelConfig = {}) => {
   const buildWatchEmitter = new BuildWatchEmitter();
   buildWatchEmitter.setInitFn(runBuildWatch.bind(null, option, babelConfig));
   return buildWatchEmitter;
 };
-
 exports.buildWatch = buildWatch;

package/dist/js/node/compiler.js

@@ -4,33 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolveSourceMap = exports.isRes = exports.getDistFilePath = exports.compiler = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var babel = _interopRequireWildcard(require("@babel/core"));
-
 var _utils = require("@modern-js/utils");
-
 var utils = _interopRequireWildcard(require("./utils"));
-
 var _constants = require("./constants");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 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 defaultDistDir = 'dist';
-
 const isRes = r => Boolean(r);
-
 exports.isRes = isRes;
-
 const getDistFilePath = option => {
   const {
     filepath,
@@ -41,9 +27,7 @@ const getDistFilePath = option => {
   const ext = path.extname(filepath);
   return path.join(distDir, path.relative(rootDir, filepath).replace(ext, extMap[ext]));
 };
-
 exports.getDistFilePath = getDistFilePath;
-
 const resolveSourceMap = option => {
   const {
     babelRes,
@@ -53,30 +37,22 @@ const resolveSourceMap = option => {
   } = option;
   const mapLoc = `${distFilePath}.map`;
   babelRes.code = utils.addSourceMappingUrl(babelRes.code, mapLoc);
-
   if (babelRes.map) {
     babelRes.map.file = path.basename(distFilePath);
     babelRes.map.sources = [path.relative(path.dirname(distFilePath), sourceFilePath)];
   }
-
   const sourceMapVirtualDist = {
     sourcemap: JSON.stringify(babelRes.map),
     sourceMapPath: mapLoc
   };
-
   if (enableVirtualDist) {
     return sourceMapVirtualDist;
   }
-
   _utils.fs.ensureDirSync(path.dirname(mapLoc));
-
   _utils.fs.writeFileSync(mapLoc, JSON.stringify(babelRes.map));
-
   return sourceMapVirtualDist;
 };
-
 exports.resolveSourceMap = resolveSourceMap;
-
 const compiler = option => {
   const {
     filepath,
@@ -90,18 +66,15 @@ const compiler = option => {
   } = option;
   const babelRes = babel.transformFileSync(filepath, babelConfig);
   let virtualDist = null;
-
   if (!isRes(babelRes)) {
     throw new Error(`${filepath} happen error`);
   }
-
   const distFilePath = getDistFilePath({
     filepath,
     rootDir,
     distDir,
     extMap: distFileExtMap
   });
-
   if (enableVirtualDist) {
     virtualDist = {
       distPath: distFilePath,
@@ -110,7 +83,6 @@ const compiler = option => {
       sourcemap: ''
     };
   }
-
   if (babelRes !== null && babelRes !== void 0 && babelRes.map && babelConfig.sourceMaps && babelConfig.sourceMaps !== 'inline') {
     if (virtualDist) {
       virtualDist = _objectSpread(_objectSpread({}, virtualDist), resolveSourceMap({
@@ -128,7 +100,6 @@ const compiler = option => {
       });
     }
   }
-
   if (virtualDist) {
     virtualDist = _objectSpread(_objectSpread({}, virtualDist), {}, {
       distPath: distFilePath,
@@ -136,15 +107,11 @@ const compiler = option => {
     });
   } else {
     _utils.fs.ensureDirSync(path.dirname(distFilePath));
-
     _utils.fs.writeFileSync(distFilePath, babelRes.code);
   }
-
   if (verbose && !quiet) {
     _utils.logger.info(`${filepath} => ${distFilePath}`);
   }
-
   return virtualDist;
 };
-
 exports.compiler = compiler;

package/dist/js/node/compilerErrorResult.js

@@ -4,20 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CompilerErrorResult = void 0;
-
 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; }
-
 class CompilerErrorResult {
   constructor(initErrorResult) {
     _defineProperty(this, "_messageDetails", void 0);
-
     this.init(initErrorResult);
   }
-
   init(initErrorResult) {
     this._messageDetails = (initErrorResult === null || initErrorResult === void 0 ? void 0 : initErrorResult.messageDetails) || [];
   }
-
   update(messageDetails) {
     for (const messageDetail of messageDetails) {
       // 遍历存不存在该文件报错信息，不存在则增加，否则更新内容
@@ -27,34 +22,26 @@ class CompilerErrorResult {
           detail.content = messageDetail.content;
           return true;
         }
-
         return false;
       });
-
       if (addError) {
         this._messageDetails.push(messageDetail);
       }
     }
   }
-
   removeByFileName(filename) {
     this._messageDetails = this._messageDetails.filter(detail => detail.filename !== filename);
   }
-
   get value() {
     var _this$_messageDetails;
-
     return {
       code: 1,
       message: `Compilation failure ${(_this$_messageDetails = this._messageDetails) === null || _this$_messageDetails === void 0 ? void 0 : _this$_messageDetails.length} files with Babel.`,
       messageDetails: this._messageDetails
     };
   }
-
   checkExistError() {
     return this._messageDetails.length > 0;
   }
-
 }
-
 exports.CompilerErrorResult = CompilerErrorResult;

package/dist/js/node/defaults.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mergeDefaultOption = void 0;
-
 var _constants = require("./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 defaultOptions = {
   enableWatch: false,
   enableVirtualDist: false,
@@ -24,7 +19,5 @@ const defaultOptions = {
   verbose: false,
   clean: false
 };
-
 const mergeDefaultOption = compilerOptions => _objectSpread(_objectSpread({}, defaultOptions), compilerOptions);
-
 exports.mergeDefaultOption = mergeDefaultOption;

package/dist/js/node/getFinalOption.js

@@ -4,19 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getGlobPattern = exports.getFinalExtensions = exports.getFinalCompilerOption = exports.getFilesFromDir = void 0;
-
 var _utils = require("@modern-js/utils");
-
 var _core = require("@babel/core");
-
 var _defaults = require("./defaults");
-
 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 getGlobPattern = (dir, extensions) => {
   if (extensions.length > 1) {
     return `${dir}/**/*{${extensions.join(',')}}`;
@@ -26,14 +19,10 @@ const getGlobPattern = (dir, extensions) => {
     return `${dir}/**/*`;
   }
 };
-
 exports.getGlobPattern = getGlobPattern;
-
 const getFinalExtensions = extensions => {
   const isExtensions = ext => Array.isArray(ext);
-
   const isExtensionsFunc = ext => typeof ext === 'function';
-
   if (isExtensions(extensions)) {
     return [...extensions, ..._core.DEFAULT_EXTENSIONS];
   } else if (isExtensionsFunc(extensions)) {
@@ -42,9 +31,7 @@ const getFinalExtensions = extensions => {
     return _core.DEFAULT_EXTENSIONS;
   }
 };
-
 exports.getFinalExtensions = getFinalExtensions;
-
 const getFilesFromDir = ({
   dir,
   finalExt: _finalExt = [],
@@ -57,9 +44,7 @@ const getFilesFromDir = ({
   });
   return globFindFilenames;
 };
-
 exports.getFilesFromDir = getFilesFromDir;
-
 const getFinalCompilerOption = option => {
   const optionWithDefault = (0, _defaults.mergeDefaultOption)(option);
   const {
@@ -71,7 +56,6 @@ const getFinalCompilerOption = option => {
   } = option;
   let globFindFilenames = [];
   const finalExt = getFinalExtensions(extensions);
-
   if (sourceDir) {
     globFindFilenames = getFilesFromDir({
       dir: sourceDir,
@@ -79,7 +63,6 @@ const getFinalCompilerOption = option => {
       finalExt
     });
   }
-
   if (enableWatch) {
     // 开启watch模式，清空通过 sourceDir 找到的文件，而改为使用watchDirs
     globFindFilenames = getFilesFromDir({
@@ -88,10 +71,8 @@ const getFinalCompilerOption = option => {
       finalExt
     });
   }
-
   return _objectSpread(_objectSpread({}, optionWithDefault), {}, {
     filenames: [...optionWithDefault.filenames, ...globFindFilenames]
   });
 };
-
 exports.getFinalCompilerOption = getFinalCompilerOption;

package/dist/js/node/index.js

@@ -7,13 +7,9 @@ var _exportNames = {
   compiler: true
 };
 exports.compiler = compiler;
-
 var _getFinalOption = require("./getFinalOption");
-
 var _build = require("./build");
-
 var _buildWatch = require("./buildWatch");
-
 Object.keys(_buildWatch).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -25,11 +21,8 @@ Object.keys(_buildWatch).forEach(function (key) {
     }
   });
 });
-
 var _validate = require("./validate");
-
 var _type = require("./type");
-
 Object.keys(_type).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -41,16 +34,12 @@ Object.keys(_type).forEach(function (key) {
     }
   });
 });
-
 async function compiler(compilerOptions, babelOptions = {}) {
   const validRet = (0, _validate.validate)(compilerOptions);
-
   if (validRet) {
     return validRet;
   }
-
   const finalCompilerOption = (0, _getFinalOption.getFinalCompilerOption)(compilerOptions);
-
   if (compilerOptions.enableWatch) {
     return (0, _buildWatch.buildWatch)(finalCompilerOption, babelOptions);
   } else {

package/dist/js/node/utils.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.addSourceMappingUrl = addSourceMappingUrl;
-
 var path = _interopRequireWildcard(require("path"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function addSourceMappingUrl(code, loc) {
   return `${code}\n//# sourceMappingURL=${path.normalize(path.basename(loc))}`;
 }

package/dist/js/node/validate.js

@@ -4,68 +4,53 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.watchDirValidMessage = exports.validateWatchDir = exports.validateSourceDirAndFileNames = exports.validate = exports.sourceDirAndFileNamesValidMessage = void 0;
-
 var _utils = require("@modern-js/utils");
-
 const sourceDirAndFileNamesValidMessage = 'At least one of the sourceDir and filenames configurations must be configured';
 exports.sourceDirAndFileNamesValidMessage = sourceDirAndFileNamesValidMessage;
 const watchDirValidMessage = 'should set watchDir when enableWatch is true';
 exports.watchDirValidMessage = watchDirValidMessage;
-
 const validateSourceDirAndFileNames = compilerOptions => {
   const {
     sourceDir,
     filenames,
     quiet
   } = compilerOptions;
-
   if (!sourceDir && !filenames) {
     if (!quiet) {
       _utils.logger.error(sourceDirAndFileNamesValidMessage);
     }
-
     return {
       code: 1,
       message: sourceDirAndFileNamesValidMessage,
       virtualDists: []
     };
   }
-
   return null;
 };
-
 exports.validateSourceDirAndFileNames = validateSourceDirAndFileNames;
-
 const validateWatchDir = compilerOptions => {
   const {
     watchDir,
     enableWatch,
     quiet
   } = compilerOptions;
-
   if (enableWatch && !watchDir) {
     if (!quiet) {
       _utils.logger.error(watchDirValidMessage);
     }
-
     return {
       code: 1,
       message: watchDirValidMessage,
       virtualDists: []
     };
   }
-
   return null;
 };
-
 exports.validateWatchDir = validateWatchDir;
-
 const validate = compilerOptions => {
   if (compilerOptions.enableWatch) {
     return validateWatchDir(compilerOptions);
   }
-
   return validateSourceDirAndFileNames(compilerOptions);
 };
-
 exports.validate = validate;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "2.0.0-beta.0"
+    "@modern-js/utils": "2.0.0-beta.2"
   },
   "devDependencies": {
     "@babel/plugin-transform-classes": "^7.18.0",
@@ -40,9 +40,9 @@
     "@types/jest": "^27",
     "@types/node": "^14",
     "typescript": "^4",
-    "@scripts/build": "2.0.0-beta.0",
     "jest": "^27",
-    "@scripts/jest-config": "2.0.0-beta.0"
+    "@scripts/build": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -55,8 +55,8 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern new",
-    "build": "modern build",
+    "new": "modern-lib new",
+    "build": "modern-lib build",
     "test": "jest --passWithNoTests"
   }
 }