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

package/dist/js/node/features/build/bundleless/runBabel.js

@@ -4,40 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.runBabelBuild = exports.jsFileSuffix = exports.haveNotAnyJsFile = exports.getWillCompilerCode = exports.buildSourceCode = exports.BabelBuildError = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _error = require("../error");
-
 var _utils2 = require("../utils");
-
 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; }
-
 class BabelBuildError extends Error {
   constructor(message, opts) {
     super(message);
-
     _defineProperty(this, "summary", void 0);
-
     _defineProperty(this, "details", void 0);
-
     Error.captureStackTrace(this, this.constructor);
     this.summary = opts === null || opts === void 0 ? void 0 : opts.summary;
     this.details = opts === null || opts === void 0 ? void 0 : opts.details;
   }
-
   toString() {
     return this.formatError().join('\n');
   }
-
   formatError() {
     const msgs = [];
     const {
@@ -45,64 +31,49 @@ class BabelBuildError extends Error {
       details = []
     } = this;
     msgs.push(_utils.chalk.red.bold(summary));
-
     for (const detail of details) {
       msgs.push(detail.content);
       msgs.push('\n');
     }
-
     return msgs;
   }
-
 }
-
 exports.BabelBuildError = BabelBuildError;
-
 const babelCompiler = _utils.Import.lazy('@modern-js/babel-compiler', require);
-
 const bc = _utils.Import.lazy('../../../utils/babel', require);
+const ts = _utils.Import.lazy('../../../utils/tsconfig', require);
 
-const ts = _utils.Import.lazy('../../../utils/tsconfig', require); // const logger: typeof import('../logger') = Import.lazy('../logger', require);
-
+// const logger: typeof import('../logger') = Import.lazy('../logger', require);
 
 const getExts = (isTs, tsconfig) => {
   // TODO: 是否受控tsconfig.json 里的jsx配置
   let exts = [];
-
   if (isTs) {
     var _tsconfig$compilerOpt;
-
     exts = tsconfig !== null && tsconfig !== void 0 && (_tsconfig$compilerOpt = tsconfig.compilerOptions) !== null && _tsconfig$compilerOpt !== void 0 && _tsconfig$compilerOpt.allowJs ? ['.ts', '.tsx', '.js', '.jsx'] : ['.ts', '.tsx'];
   } else {
     exts = ['.js', '.jsx'];
   }
-
   return exts;
 };
-
 const getWillCompilerCode = (srcDirOrFile, option) => {
   const {
     tsconfig,
     isTsProject
-  } = option; // 如果是一个文件路径，则直接返回
-
+  } = option;
+  // 如果是一个文件路径，则直接返回
   if (_utils.fs.existsSync(srcDirOrFile) && _utils.fs.lstatSync(srcDirOrFile).isFile()) {
     return [srcDirOrFile];
   }
-
   const exts = getExts(isTsProject, tsconfig);
   const globPattern = `${srcDirOrFile}/**/*{${exts.join(',')}}`;
-
   const files = _utils.glob.sync(globPattern, {
     ignore: [`${srcDirOrFile}/**/*.d.ts`],
     absolute: true
   });
-
   return files;
 };
-
 exports.getWillCompilerCode = getWillCompilerCode;
-
 const buildSourceCode = async config => {
   const {
     willCompilerDirOrFile,
@@ -117,7 +88,6 @@ const buildSourceCode = async config => {
     tsconfig,
     isTsProject: Boolean(tsconfig)
   });
-
   if (watch) {
     const emitter = await babelCompiler.compiler({
       quiet: true,
@@ -143,9 +113,7 @@ const buildSourceCode = async config => {
     }, babelConfig);
   }
 };
-
 exports.buildSourceCode = buildSourceCode;
-
 const generatorRealFiles = virtualDists => {
   for (const virtualDist of virtualDists) {
     const {
@@ -154,14 +122,10 @@ const generatorRealFiles = virtualDists => {
       sourcemap,
       sourceMapPath
     } = virtualDist;
-
     _utils.fs.ensureFileSync(distPath);
-
     _utils.fs.writeFileSync(distPath, code);
-
     if (sourcemap.length > 0) {
       _utils.fs.ensureFileSync(sourceMapPath);
-
       _utils.fs.writeFileSync(sourceMapPath, sourcemap);
     }
   }
@@ -171,8 +135,6 @@ const generatorRealFiles = virtualDists => {
  * @param outputResults
  * @param context
  */
-
-
 const outputDist = (outputResults, context) => {
   const {
     code,
@@ -180,7 +142,6 @@ const outputDist = (outputResults, context) => {
     messageDetails,
     virtualDists = []
   } = outputResults;
-
   if (code === 0) {
     generatorRealFiles(virtualDists);
   } else if (messageDetails && messageDetails.length > 0) {
@@ -193,17 +154,13 @@ const outputDist = (outputResults, context) => {
     }));
   }
 };
-
 const jsFileSuffix = ['js', 'jsx', 'ts', 'tsx'];
 exports.jsFileSuffix = jsFileSuffix;
-
 const haveNotAnyJsFile = async sourceDir => {
   const files = await (0, _utils.globby)((0, _utils.slash)(`${sourceDir}/**/*.{${jsFileSuffix.join(',')}}`));
   return files.length === 0;
 };
-
 exports.haveNotAnyJsFile = haveNotAnyJsFile;
-
 const runBabelBuild = async (api, config) => {
   const {
     bundlelessOptions,
@@ -226,16 +183,13 @@ const runBabelBuild = async (api, config) => {
   const {
     sourceDir = './src'
   } = bundlelessOptions;
-
   const sourceAbsDir = _path.default.join(appDirectory, sourceDir);
-
   const tsconfigPath = _path.default.join(appDirectory, tsconfig);
-
   if (await haveNotAnyJsFile(sourceAbsDir)) {
     return;
-  } // TODO: Refactoring based on format and target
-
+  }
 
+  // TODO: Refactoring based on format and target
   const syntax = target === 'es5' ? 'es5' : 'es6+';
   const type = format === 'cjs' ? 'commonjs' : 'module';
   const titleText = `[Bundleless:Babel: ${format}_${target}]`;
@@ -249,9 +203,7 @@ const runBabelBuild = async (api, config) => {
       type
     })
   };
-
   const distDir = _path.default.join(appDirectory, distPath, outputPath);
-
   const result = await buildSourceCode({
     appDirectory,
     distDir,
@@ -261,14 +213,12 @@ const runBabelBuild = async (api, config) => {
     babelConfig: buildConfig.babelConfig,
     watch
   });
-
   if (watch) {
     const emitter = result;
     emitter.on(babelCompiler.BuildWatchEvent.firstCompiler, result => {
       if (result.code === 1) {
         console.info((0, _utils2.watchSectionTitle)(titleText, _utils2.SectionTitleStatus.Fail));
         console.error(result.message);
-
         for (const detail of result.messageDetails || []) {
           console.error(detail.content);
         }
@@ -280,15 +230,12 @@ const runBabelBuild = async (api, config) => {
     emitter.on(babelCompiler.BuildWatchEvent.watchingCompiler, result => {
       if (result.code === 1) {
         var _result$virtualDists;
-
         // console.error(logger.clearFlag);
         console.info((0, _utils2.watchSectionTitle)(titleText, _utils2.SectionTitleStatus.Fail));
         console.error(result.message);
-
         for (const detail of result.messageDetails || []) {
           console.error(detail.content);
         }
-
         if (Array.isArray(result.virtualDists) && ((_result$virtualDists = result.virtualDists) === null || _result$virtualDists === void 0 ? void 0 : _result$virtualDists.length) > 0) {
           generatorRealFiles(result.virtualDists);
         }
@@ -305,5 +252,4 @@ const runBabelBuild = async (api, config) => {
     });
   }
 };
-
 exports.runBabelBuild = runBabelBuild;

package/dist/js/node/features/build/bundleless/style.js

@@ -4,44 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.styleFileSuffix = exports.runBuild = exports.haveNotAnyStyles = exports.buildStyle = exports.StyleBuildError = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _error = require("../error");
-
 var _utils2 = require("../utils");
-
 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 compiler = _utils.Import.lazy('@modern-js/style-compiler', require);
-
 class StyleBuildError extends Error {
   constructor(message, opts) {
     super(message);
-
     _defineProperty(this, "summary", void 0);
-
     _defineProperty(this, "details", void 0);
-
     Error.captureStackTrace(this, this.constructor);
     this.summary = opts === null || opts === void 0 ? void 0 : opts.summary;
     this.details = opts === null || opts === void 0 ? void 0 : opts.details;
   }
-
   toString() {
     return this.formatError().join('\n');
   }
-
   formatError() {
     const msgs = [];
     const {
@@ -49,32 +33,26 @@ class StyleBuildError extends Error {
       details = []
     } = this;
     msgs.push(_utils.chalk.red.bold(summary));
-
     for (const detail of details) {
       if (detail.error) {
         msgs.push(detail.error);
         msgs.push('\n');
       }
     }
-
     return msgs;
   }
-
 }
+
 /**
  * when modern build, only throw Error or silent
  * @param result
  * @param context
  */
-
-
 exports.StyleBuildError = StyleBuildError;
-
 const generatorFileOrLogError = (result, context) => {
   if (result.code === 0) {
     for (const file of result.dists) {
       _utils.fs.ensureFileSync(file.filename);
-
       _utils.fs.writeFileSync(file.filename, file.content);
     }
   } else {
@@ -90,45 +68,35 @@ const generatorFileOrLogError = (result, context) => {
     }, context));
   }
 };
-
 const generatorFileAndLog = (result, titleText) => {
   if (result.code === 0) {
     for (const file of result.dists) {
       _utils.fs.ensureFileSync(file.filename);
-
       _utils.fs.writeFileSync(file.filename, file.content);
     }
-
     console.info((0, _utils2.watchSectionTitle)(titleText, _utils2.SectionTitleStatus.Success));
   } else {
     console.info((0, _utils2.watchSectionTitle)(titleText, _utils2.SectionTitleStatus.Fail));
-
     for (const file of result.errors) {
       console.error(file.error);
     }
   }
 };
-
 const copyOriginStyleFiles = ({
   targetDir,
   outputDir,
   ignoreCSS: _ignoreCSS = false
 }) => {
   const styleFiles = _utils.glob.sync(`${targetDir}/**/*.{${_ignoreCSS ? '' : 'css,'}sass,scss,less}`);
-
   if (styleFiles.length > 0) {
     _utils.fs.ensureDirSync(outputDir);
   }
-
   for (const styleFile of styleFiles) {
     const file = path.relative(targetDir, styleFile);
-
     _utils.fs.ensureDirSync(path.dirname(path.join(outputDir, file)));
-
     _utils.fs.copyFileSync(styleFile, path.join(outputDir, file));
   }
 };
-
 const runBuild = async option => {
   const {
     watch,
@@ -139,7 +107,6 @@ const runBuild = async option => {
     sassOption,
     postcssOption
   } = option;
-
   if (watch) {
     const srcStyleEmitter = compiler.styleCompiler({
       watch: true,
@@ -169,21 +136,16 @@ const runBuild = async option => {
     return srcStyleResult;
   }
 };
-
 exports.runBuild = runBuild;
 const styleFileSuffix = ['css', 'less', 'sass', 'scss'];
 exports.styleFileSuffix = styleFileSuffix;
-
 const haveNotAnyStyles = async sourceDir => {
   const files = await (0, _utils.globby)((0, _utils.slash)(`${sourceDir}/**/*.{${styleFileSuffix.join(',')}}`));
   return files.length === 0;
 };
-
 exports.haveNotAnyStyles = haveNotAnyStyles;
-
 const buildStyle = async (api, config) => {
   var _style$path;
-
   const modernConfig = api.useResolvedConfigContext();
   const {
     appDirectory
@@ -203,11 +165,9 @@ const buildStyle = async (api, config) => {
     }
   } = modernConfig;
   const titleText = `[Bundleless:Style:${sourceDir}]`;
-
   if ((await haveNotAnyStyles(sourceDir)) || style.compileMode === false) {
     return;
   }
-
   const runner = api.useHookRunners();
   const lessOption = await runner.moduleLessConfig({
     modernConfig
@@ -225,16 +185,12 @@ const buildStyle = async (api, config) => {
     onLast: async _ => undefined
   });
   const postcssOption = (0, _utils2.getPostcssOption)(appDirectory, modernConfig);
-
   if (tailwindPlugin) {
     var _postcssOption$plugin;
-
     (_postcssOption$plugin = postcssOption.plugins) === null || _postcssOption$plugin === void 0 ? void 0 : _postcssOption$plugin.push(tailwindPlugin);
   }
-
   const srcDir = path.resolve(appDirectory, sourceDir);
   const outputDirToSrc = path.join(appDirectory, distPath, outputPath, (_style$path = style.path) !== null && _style$path !== void 0 ? _style$path : './');
-
   if (style.compileMode === 'all' || style.compileMode === 'only-compiled-code') {
     const result = await runBuild({
       appDirectory,
@@ -245,7 +201,6 @@ const buildStyle = async (api, config) => {
       sassOption,
       postcssOption
     });
-
     if (watch) {
       const emitter = result;
       emitter.on(compiler.BuildWatchEvent.firstCompiler, result => {
@@ -263,7 +218,6 @@ const buildStyle = async (api, config) => {
       });
     }
   }
-
   if (style.compileMode === 'all' || style.compileMode === 'only-source-code') {
     if (watch) {
       copyOriginStyleFiles({
@@ -278,7 +232,6 @@ const buildStyle = async (api, config) => {
       }) => {
         if (changeType === _utils.WatchChangeType.UNLINK) {
           const removeFile = path.normalize(`${outputDirToSrc}/${path.relative(srcDir, changedFilePath)}`);
-
           _utils.fs.removeSync(removeFile);
         } else {
           copyOriginStyleFiles({
@@ -287,7 +240,6 @@ const buildStyle = async (api, config) => {
             ignoreCSS: style.compileMode === 'all'
           });
         }
-
         console.info((0, _utils2.watchSectionTitle)(titleText, _utils2.SectionTitleStatus.Success));
       });
     } else {
@@ -299,5 +251,4 @@ const buildStyle = async (api, config) => {
     }
   }
 };
-
 exports.buildStyle = buildStyle;

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

@@ -4,28 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.unPresets = exports.unPresetWithTargetConfigs = exports.unPresetConfigs = exports.targets = exports.npmLibraryWithUmdPresetConfig = exports.npmLibraryPresetConfig = exports.npmComponentWithUmdPresetConfig = exports.npmComponentPresetConfig = exports.clearFlag = exports.buildingText = exports.buildSuccessText = exports.buildFailText = void 0;
-
 var _utils = require("@modern-js/utils");
-
 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 clearFlag = '\x1Bc';
 exports.clearFlag = clearFlag;
-
 const buildingText = _utils.chalk.blue('Building...');
-
 exports.buildingText = buildingText;
-
 const buildSuccessText = _utils.chalk.green('Build succeed');
-
 exports.buildSuccessText = buildSuccessText;
-
 const buildFailText = _utils.chalk.red('Build Failed:');
-
 exports.buildFailText = buildFailText;
 const targets = ['es5', 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'esnext'];
 exports.targets = targets;

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;