@modern-js/module-tools 1.5.8 → 1.6.1

package/dist/js/modern/tasks/build-watch-source-code.js

@@ -1,162 +0,0 @@
-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 { Import, fs } from '@modern-js/utils';
-import { initEnv } from "../utils/init-env";
-const babelCompiler = Import.lazy('@modern-js/babel-compiler', require);
-const logger = Import.lazy('../features/build/logger', require);
-const ts = Import.lazy('../utils/tsconfig', require);
-const babel = Import.lazy('../utils/babel', require);
-const core = Import.lazy('@modern-js/core', require);
-const argv = Import.lazy('process.argv', require);
-
-const generatorRealFiles = virtualDists => {
-  for (const virtualDist of virtualDists) {
-    const {
-      distPath,
-      code,
-      sourcemap,
-      sourceMapPath
-    } = virtualDist;
-    fs.ensureFileSync(distPath);
-    fs.writeFileSync(distPath, code);
-
-    if (sourcemap.length > 0) {
-      fs.ensureFileSync(sourceMapPath);
-      fs.writeFileSync(sourceMapPath, sourcemap);
-    }
-  }
-};
-
-const runBabelCompiler = async (config, modernConfig) => {
-  const {
-    tsconfigPath
-  } = config;
-  const babelConfig = babel.resolveBabelConfig(config.appDirectory, modernConfig, {
-    sourceAbsDir: config.srcRootDir,
-    tsconfigPath,
-    syntax: config.syntax,
-    type: config.type
-  });
-  const tsconfig = ts.readTsConfig(tsconfigPath || '', {});
-  const isTs = Boolean(tsconfig);
-
-  const getExts = isTsProject => {
-    // TODO: 是否受控tsconfig.json 里的jsx配置
-    let exts = [];
-
-    if (isTsProject) {
-      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 emitter = await babelCompiler.compiler({
-    enableVirtualDist: true,
-    quiet: true,
-    enableWatch: true,
-    rootDir: config.srcRootDir,
-    distDir: config.distDir,
-    watchDir: config.srcRootDir,
-    extensions: getExts(isTs),
-    ignore: ['*.d.ts']
-  }, _objectSpread(_objectSpread({}, babelConfig), {}, {
-    sourceMaps: config.sourceMaps
-  }));
-  emitter.on(babelCompiler.BuildWatchEvent.compiling, () => {
-    console.info(logger.clearFlag, `Compiling...`);
-  });
-  emitter.on(babelCompiler.BuildWatchEvent.firstCompiler, result => {
-    if (result.code === 1) {
-      console.error(logger.clearFlag);
-      console.error(result.message);
-
-      for (const detail of result.messageDetails || []) {
-        console.error(detail.content);
-      }
-    } else {
-      generatorRealFiles(result.virtualDists);
-      console.info(logger.clearFlag, '[Babel Compiler]: Successfully');
-    }
-  });
-  emitter.on(babelCompiler.BuildWatchEvent.watchingCompiler, result => {
-    if (result.code === 1) {
-      var _result$virtualDists;
-
-      console.error(logger.clearFlag);
-      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);
-      }
-    } else {
-      generatorRealFiles(result.virtualDists);
-      console.info(result.message);
-    }
-  });
-  await emitter.watch();
-};
-
-const buildSourceCode = async (config, modernConfig) => {
-  const {
-    compiler
-  } = config;
-
-  if (compiler === 'babel') {
-    await runBabelCompiler(config, modernConfig);
-  }
-};
-
-const taskMain = async ({
-  modernConfig
-}) => {
-  const processArgv = argv(process.argv.slice(2));
-  const config = processArgv({
-    srcRootDir: `${process.cwd()}/src`,
-    distDir: '',
-    compiler: 'babel',
-    appDirectory: '',
-    sourceMaps: false,
-    tsconfigPath: '',
-    syntax: 'es5',
-    type: 'module'
-  });
-  process.env.BUILD_FORMAT = initEnv(config);
-  await buildSourceCode(config, modernConfig);
-};
-
-(async () => {
-  let options;
-
-  if (process.env.CORE_INIT_OPTION_FILE) {
-    ({
-      options
-    } = require(process.env.CORE_INIT_OPTION_FILE));
-  }
-
-  const {
-    resolved
-  } = await core.cli.init([], options);
-
-  (async () => {
-    try {
-      await taskMain({
-        modernConfig: resolved
-      });
-    } catch (e) {
-      console.error(e);
-    }
-  })();
-})();

package/dist/js/modern/tasks/build-watch-style.js

@@ -1,216 +0,0 @@
-import * as path from 'path';
-import { fs, glob, watch, WatchChangeType, Import } from '@modern-js/utils';
-const logger = Import.lazy('../features/build/logger', require);
-const cssConfig = Import.lazy('@modern-js/css-config', require);
-const hooks = Import.lazy('../hooks', require);
-const core = Import.lazy('@modern-js/core', require);
-const compiler = Import.lazy('@modern-js/style-compiler', require);
-const STYLE_DIRS = 'styles';
-const SRC_STYLE_DIRS = 'src';
-
-const checkStylesDirExist = option => {
-  const {
-    appDirectory
-  } = option;
-  return fs.existsSync(path.join(appDirectory, STYLE_DIRS));
-};
-
-const generatorFileAndReturnLog = (result, successMessage = '') => {
-  if (result.code === 0) {
-    for (const file of result.dists) {
-      fs.ensureFileSync(file.filename);
-      fs.writeFileSync(file.filename, file.content);
-    }
-
-    return successMessage;
-  } else {
-    return result.errors.join('\n');
-  }
-};
-
-const getPostcssOption = (appDirectory, modernConfig) => {
-  var _postcssOption$postcs;
-
-  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: {}
-  };
-};
-
-const copyOriginStyleFiles = ({
-  targetDir,
-  outputDir
-}) => {
-  const styleFiles = glob.sync(`${targetDir}/**/*.{css,sass,scss,less}`);
-
-  if (styleFiles.length > 0) {
-    fs.ensureDirSync(outputDir);
-  }
-
-  for (const styleFile of styleFiles) {
-    const file = path.relative(targetDir, styleFile);
-    fs.ensureFileSync(path.join(outputDir, file));
-    fs.copyFileSync(styleFile, path.join(outputDir, file));
-  }
-};
-
-const logCompilerMessage = compilerMessage => {
-  console.info(logger.clearFlag);
-  console.info(compilerMessage.src);
-  console.info(compilerMessage.styles);
-};
-
-const taskMain = async ({
-  modernConfig,
-  appContext
-}) => {
-  const {
-    assetsPath = 'styles',
-    path: outputPath = 'dist',
-    jsPath = 'js',
-    importStyle
-  } = modernConfig.output;
-  const {
-    appDirectory
-  } = appContext;
-  const lessOption = await core.mountHook().moduleLessConfig({
-    modernConfig
-  }, {
-    onLast: async _ => null
-  });
-  const sassOption = await core.mountHook().moduleSassConfig({
-    modernConfig
-  }, {
-    onLast: async _ => null
-  });
-  const postcssOption = getPostcssOption(appDirectory, modernConfig);
-  const existStylesDir = checkStylesDirExist({
-    appDirectory
-  });
-  const compilerMessage = {
-    src: '',
-    styles: ''
-  }; // 编译 styles 目录样式
-
-  let styleEmitter = null;
-
-  if (existStylesDir) {
-    styleEmitter = compiler.styleCompiler({
-      watch: true,
-      projectDir: appDirectory,
-      stylesDir: path.resolve(appDirectory, STYLE_DIRS),
-      outDir: path.join(appDirectory, outputPath, assetsPath),
-      enableVirtualDist: true,
-      compilerOption: {
-        less: lessOption,
-        sass: sassOption,
-        postcss: postcssOption
-      }
-    });
-    styleEmitter.on(compiler.BuildWatchEvent.firstCompiler, styleResult => {
-      compilerMessage.styles = generatorFileAndReturnLog(styleResult, `[Style Compiler] Successfully for 'styles' dir`);
-      logCompilerMessage(compilerMessage);
-    });
-    styleEmitter.on(compiler.BuildWatchEvent.compilering, () => {
-      compilerMessage.styles = `[${assetsPath}] Compiling...`;
-      logCompilerMessage(compilerMessage);
-    });
-    styleEmitter.on(compiler.BuildWatchEvent.watchingCompiler, styleResult => {
-      compilerMessage.styles = generatorFileAndReturnLog(styleResult, `[Style Compiler] Successfully for 'styles' dir`);
-      logCompilerMessage(compilerMessage);
-    }); // await styleEmitter.watch();
-  } // 编译 src 内的样式代码
-
-
-  const srcDir = path.resolve(appDirectory, SRC_STYLE_DIRS);
-  const outputDirToSrc = path.join(appDirectory, outputPath, jsPath, assetsPath);
-
-  if (importStyle === 'compiled-code') {
-    compilerMessage.src = `[src] Compiling`;
-    const srcStyleEmitter = compiler.styleCompiler({
-      watch: true,
-      projectDir: appDirectory,
-      stylesDir: srcDir,
-      outDir: outputDirToSrc,
-      enableVirtualDist: true,
-      compilerOption: {
-        less: lessOption,
-        sass: sassOption,
-        postcss: postcssOption
-      }
-    });
-    srcStyleEmitter.on(compiler.BuildWatchEvent.firstCompiler, srcStyleResult => {
-      compilerMessage.src = generatorFileAndReturnLog(srcStyleResult, `[Style Compiler] Successfully for 'src' dir`);
-      logCompilerMessage(compilerMessage);
-    });
-    srcStyleEmitter.on(compiler.BuildWatchEvent.compilering, () => {
-      compilerMessage.src = `[src] Compiling`;
-      logCompilerMessage(compilerMessage);
-    });
-    srcStyleEmitter.on(compiler.BuildWatchEvent.watchingCompiler, srcStyleResult => {
-      compilerMessage.src = generatorFileAndReturnLog(srcStyleResult, `[Style Compiler] Successfully for 'src' dir`);
-      logCompilerMessage(compilerMessage);
-    });
-    styleEmitter && (await styleEmitter.watch());
-    await srcStyleEmitter.watch();
-  } else {
-    compilerMessage.src = `['src' dir] Copying in progress`;
-    styleEmitter && (await styleEmitter.watch());
-    logCompilerMessage(compilerMessage);
-    copyOriginStyleFiles({
-      targetDir: srcDir,
-      outputDir: outputDirToSrc
-    });
-    compilerMessage.src = `[Style Compiler] Successfully for 'src' dir`;
-    logCompilerMessage(compilerMessage);
-    watch(`${srcDir}/**/*.{css,less,sass,scss}`, ({
-      changeType,
-      changedFilePath
-    }) => {
-      compilerMessage.src = `['src' dir] Copying in progress`;
-      logCompilerMessage(compilerMessage);
-
-      if (changeType === WatchChangeType.UNLINK) {
-        const removeFile = path.normalize(`${outputDirToSrc}/${path.relative(srcDir, changedFilePath)}`);
-        fs.removeSync(removeFile);
-      } else {
-        copyOriginStyleFiles({
-          targetDir: srcDir,
-          outputDir: outputDirToSrc
-        });
-      }
-
-      compilerMessage.src = `[Style Compiler] Successfully for 'src' dir`;
-      logCompilerMessage(compilerMessage);
-    });
-  }
-};
-
-(async () => {
-  let options;
-
-  if (process.env.CORE_INIT_OPTION_FILE) {
-    ({
-      options
-    } = require(process.env.CORE_INIT_OPTION_FILE));
-  }
-
-  hooks.buildLifeCycle();
-  const {
-    resolved: modernConfig,
-    appContext
-  } = await core.cli.init([], options);
-
-  (async () => {
-    try {
-      await taskMain({
-        modernConfig,
-        appContext
-      });
-    } catch (e) {
-      console.error(e);
-    }
-  })();
-})();

package/dist/js/modern/tasks/constants.js

@@ -1 +0,0 @@
-export const tempTsconfigName = './tsconfig.temp.json';

package/dist/js/node/features/build/build-watch.js

@@ -1,121 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.buildInWatchMode = void 0;
-
-var path = _interopRequireWildcard(require("path"));
-
-var os = _interopRequireWildcard(require("os"));
-
-var _utils = require("@modern-js/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; }
-
-const lg = _utils.Import.lazy('./logger', require);
-
-const pMap = _utils.Import.lazy('p-map', require);
-
-const utils = _utils.Import.lazy('./utils', require);
-
-const constants = _utils.Import.lazy('./constants', require);
-
-const buildInWatchMode = async (api, config, _) => {
-  const {
-    appDirectory
-  } = api.useAppContext();
-  const {
-    sourceDir,
-    enableTscCompiler
-  } = config;
-  const srcRootDir = path.join(appDirectory, sourceDir);
-  const concurrency = os.cpus().length;
-  const lm = new lg.LoggerManager();
-  const codeLog = lm.createLoggerText({
-    title: constants.runBabelCompilerTitle
-  });
-  const dtsLog = lm.createLoggerText({
-    title: constants.runTscWatchTitle
-  });
-  const styleLog = lm.createLoggerText({
-    title: constants.runStyleCompilerTitle
-  });
-  const copyLog = lm.createLoggerText({
-    title: 'Copy Log:'
-  });
-  const initCodeMapper = utils.getCodeInitMapper(api, config);
-  const taskMapper = [...utils.getCodeMapper(api, {
-    logger: codeLog,
-    taskPath: require.resolve("../../tasks/build-watch-source-code"),
-    config,
-    willCompilerDirOrFile: sourceDir,
-    initMapper: initCodeMapper,
-    srcRootDir
-  }), ...(enableTscCompiler ? utils.getDtsMapper(api, config, dtsLog) : []), {
-    logger: styleLog,
-    taskPath: require.resolve("../../tasks/build-watch-style")
-  }, {
-    logger: copyLog,
-    taskPath: require.resolve("../../tasks/copy-assets"),
-    params: ['--watch']
-  }];
-  lm.on('data', () => {
-    console.info(constants.clearFlag);
-    enableTscCompiler && console.info(dtsLog.value);
-    console.info(codeLog.value);
-    console.info(styleLog.value);
-  });
-  await pMap(taskMapper, async ({
-    logger,
-    taskPath,
-    params
-  }) => {
-    const childProcess = _utils.execa.node(taskPath, params, {
-      stdio: 'pipe'
-    });
-
-    if (logger === codeLog) {
-      lm.addStdout(logger, childProcess.stdout, {
-        event: {
-          error: true,
-          data: true
-        } // colors: { data: s => s },
-
-      });
-      lm.addStderr(logger, childProcess.stderr);
-    }
-
-    if (logger === dtsLog) {
-      lm.addStdout(logger, childProcess.stdout, {
-        event: {
-          data: true,
-          error: true
-        },
-        colors: {
-          // tsc 的log信息无论是错误还是正确都是从 data event 中获取到的
-          data: s => s
-        }
-      });
-    }
-
-    if (logger === styleLog || logger === copyLog) {
-      lm.addStdout(logger, childProcess.stdout, {
-        event: {
-          error: true,
-          data: true
-        } // colors: { data: s => s },
-
-      });
-      lm.addStderr(logger, childProcess.stderr);
-    }
-
-    await childProcess;
-  }, {
-    concurrency
-  });
-};
-
-exports.buildInWatchMode = buildInWatchMode;

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

@@ -1,143 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.buildSourceCode = void 0;
-
-var path = _interopRequireWildcard(require("path"));
-
-var os = _interopRequireWildcard(require("os"));
-
-var _utils = require("@modern-js/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; }
-
-const pMap = _utils.Import.lazy('p-map', require);
-
-const utils = _utils.Import.lazy('./utils', require);
-
-const lg = _utils.Import.lazy('./logger', require);
-
-const constants = _utils.Import.lazy('./constants', require);
-
-const buildSourceCode = async (api, config, _) => {
-  const {
-    sourceDir,
-    enableTscCompiler,
-    styleOnly
-  } = config;
-  const {
-    appDirectory
-  } = api.useAppContext();
-  const concurrency = os.cpus().length;
-  const srcRootDir = path.join(appDirectory, sourceDir);
-  const lm = new lg.LoggerManager();
-  const codeLog = lm.createLoggerText({
-    title: constants.runBabelCompilerTitle
-  });
-  const dtsLog = lm.createLoggerText({
-    title: constants.runTscTitle
-  });
-  const styleLog = lm.createLoggerText({
-    title: constants.runStyleCompilerTitle
-  });
-  const copyLog = lm.createLoggerText({
-    title: 'Copy Log:'
-  });
-  const initCodeMapper = utils.getCodeInitMapper(api, config);
-  let taskMapper = [];
-
-  if (styleOnly) {
-    taskMapper = [{
-      logger: styleLog,
-      taskPath: require.resolve("../../tasks/build-style")
-    }, {
-      logger: copyLog,
-      taskPath: require.resolve("../../tasks/copy-assets")
-    }];
-  } else {
-    taskMapper = [...utils.getCodeMapper(api, {
-      logger: codeLog,
-      taskPath: require.resolve("../../tasks/build-source-code"),
-      config,
-      willCompilerDirOrFile: sourceDir,
-      initMapper: initCodeMapper,
-      srcRootDir
-    }), ...(enableTscCompiler ? utils.getDtsMapper(api, config, dtsLog) : []), {
-      logger: styleLog,
-      taskPath: require.resolve("../../tasks/build-style")
-    }, {
-      logger: copyLog,
-      taskPath: require.resolve("../../tasks/copy-assets")
-    }];
-  }
-
-  lm.showCompiling();
-  await pMap(taskMapper, async ({
-    logger,
-    taskPath,
-    params
-  }) => {
-    const childProcess = _utils.execa.node(taskPath, params, {
-      stdio: 'pipe'
-    });
-
-    if (logger === codeLog || logger === copyLog) {
-      lm.addStdout(logger, childProcess.stdout, {
-        event: {
-          data: true,
-          error: true
-        }
-      });
-      lm.addStderr(logger, childProcess.stderr);
-    }
-
-    if (logger === dtsLog) {
-      lm.addStdout(dtsLog, childProcess.stdout, {
-        event: {
-          data: true,
-          error: true
-        }
-      });
-      lm.addStderr(dtsLog, childProcess.stderr);
-    }
-
-    if (logger === styleLog) {
-      lm.addStdout(logger, childProcess.stdout, {
-        event: {
-          data: true,
-          error: true
-        }
-      });
-      lm.addStderr(logger, childProcess.stderr);
-    }
-
-    await childProcess;
-  }, {
-    concurrency
-  });
-  lm.disappearCompiling();
-
-  if (!styleOnly) {
-    enableTscCompiler && console.info(dtsLog.value);
-    console.info(codeLog.value);
-  }
-
-  if (styleLog.hasMessages()) {
-    console.info(styleLog.value);
-  }
-
-  if (copyLog.hasMessages()) {
-    console.info(copyLog.value);
-  }
-
-  if (dtsLog.hasErrorMessage || codeLog.hasErrorMessage || styleLog.hasErrorMessage || copyLog.hasErrorMessage) {
-    // eslint-disable-next-line no-process-exit
-    process.exit(1);
-  }
-};
-
-exports.buildSourceCode = buildSourceCode;