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

package/dist/js/modern/features/build/bundleless/generator-dts/index.js

@@ -1,106 +0,0 @@
-import path from 'path';
-import { Import, execa, fs, json5 } from '@modern-js/utils';
-import { InternalDTSError } from "../../error";
-import { SectionTitleStatus, watchSectionTitle } from "../../utils";
-import { getTscBinPath } from "./utils";
-const utils = Import.lazy('./utils', require);
-const getProjectTsconfig = tsconfigPath => {
-  if (!tsconfigPath || !fs.existsSync(tsconfigPath)) {
-    return {};
-  }
-  return json5.parse(fs.readFileSync(tsconfigPath, 'utf-8'));
-};
-const resolveLog = (childProgress, {
-  watch: _watch = false
-} = {}) => {
-  var _childProgress$stdout, _childProgress$stdout2, _childProgress$stderr;
-  /**
-   * tsc 所有的log信息都是从stdout data 事件中获取
-   * 正常模式下，如果有报错信息，交给 resolveLog 后面的逻辑来处理
-   * watch 模式下，则使用这里的信息
-   */
-  (_childProgress$stdout = childProgress.stdout) === null || _childProgress$stdout === void 0 ? void 0 : _childProgress$stdout.on('data', data => {
-    if (_watch) {
-      console.info(watchSectionTitle('[Bundleless:DTS]', SectionTitleStatus.Log));
-      console.info(data.toString());
-    }
-  });
-  // 正常以下内容都不会触发，因为tsc 不会产生以下类型的log信息，不过防止意外情况
-  (_childProgress$stdout2 = childProgress.stdout) === null || _childProgress$stdout2 === void 0 ? void 0 : _childProgress$stdout2.on('error', error => {
-    console.error(error.message);
-  });
-  (_childProgress$stderr = childProgress.stderr) === null || _childProgress$stderr === void 0 ? void 0 : _childProgress$stderr.on('data', chunk => {
-    console.error(chunk.toString());
-  });
-};
-const generatorDts = async (_, config) => {
-  const {
-    tsconfigPath,
-    distDir,
-    sourceDir = 'src',
-    appDirectory,
-    watch = false
-  } = config;
-  const userTsconfig = getProjectTsconfig(tsconfigPath);
-  const willDeleteTsconfigPath = utils.generatorTsConfig(userTsconfig, {
-    appDirectory,
-    distDir,
-    sourceDir
-  });
-  const tscBinFile = getTscBinPath(appDirectory);
-  const watchParams = watch ? ['-w'] : [];
-  const childProgress = execa(tscBinFile, ['-p', willDeleteTsconfigPath, /* Required parameter, use it stdout have color */
-  '--pretty',
-  // https://github.com/microsoft/TypeScript/issues/21824
-  '--preserveWatchOutput', ...watchParams], {
-    stdio: 'pipe',
-    cwd: appDirectory
-  });
-  resolveLog(childProgress, {
-    watch
-  });
-  try {
-    await childProgress;
-  } catch (e) {
-    if (e instanceof Error) {
-      throw new InternalDTSError(e, {
-        buildType: 'bundleless'
-      });
-    }
-  }
-  fs.removeSync(willDeleteTsconfigPath);
-};
-export const genDts = async (api, config) => {
-  const {
-    outputPath,
-    tsconfig: tsconfigPath,
-    watch,
-    bundlelessOptions: {
-      sourceDir
-    },
-    enableDts
-  } = config;
-  if (!enableDts) {
-    return;
-  }
-  const {
-    appDirectory
-  } = api.useAppContext();
-  const modernConfig = api.useResolvedConfigContext();
-  const {
-    output: {
-      path: distPath = 'dist'
-    }
-  } = modernConfig;
-  const distDir = path.join(appDirectory, distPath, outputPath);
-  const option = {
-    appDirectory,
-    distDir,
-    tsconfigPath,
-    watch,
-    sourceDir
-  };
-  await generatorDts(modernConfig, option);
-  // TODO: watch 模式下无法转换
-  utils.resolveAlias(modernConfig, option);
-};

package/dist/js/modern/features/build/bundleless/generator-dts/utils.js

@@ -1,94 +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 * as path from 'path';
-import { Import, glob, fs, nanoid } from '@modern-js/utils';
-import { merge as deepMerge } from '@modern-js/utils/lodash';
-const babel = Import.lazy('../../../../utils/babel', require);
-const tsPathsTransform = Import.lazy('../../../../utils/tspaths-transform', require);
-export const generatorTsConfig = (projectTsconfig, {
-  appDirectory,
-  distDir,
-  sourceDir: _sourceDir = 'src'
-}) => {
-  var _projectTsconfig$comp, _projectTsconfig$comp2, _ref, _projectTsconfig$excl;
-  const tempPath = path.resolve(appDirectory, './node_modules');
-  const resolvePath = path.relative(tempPath, appDirectory);
-  // const rootDir = projectTsconfig.compilerOptions?.rootDir
-  //   ? path.join(resolvePath, projectTsconfig.compilerOptions?.rootDir)
-  //   : resolvePath;
-  // 目前限制 rootDir 的路径为 sourceDir
-  const rootDir = path.join(resolvePath, _sourceDir);
-  const baseUrl = (_projectTsconfig$comp = projectTsconfig.compilerOptions) !== null && _projectTsconfig$comp !== void 0 && _projectTsconfig$comp.baseUrl ? path.join(appDirectory, (_projectTsconfig$comp2 = projectTsconfig.compilerOptions) === null || _projectTsconfig$comp2 === void 0 ? void 0 : _projectTsconfig$comp2.baseUrl) : appDirectory;
-  // if include = ['src'], final include should be ['../src']
-  // const include = projectTsconfig.include?.map(includePath =>
-  const include = (_ref = [_sourceDir]) === null || _ref === void 0 ? void 0 : _ref.map(includePath => path.join(resolvePath, includePath));
-  const exclude = (_projectTsconfig$excl = projectTsconfig.exclude) === null || _projectTsconfig$excl === void 0 ? void 0 : _projectTsconfig$excl.map(excludePath => path.join(resolvePath, excludePath));
-  const resetConfig = {
-    compilerOptions: {
-      rootDir,
-      baseUrl,
-      // Ensure that .d.ts files are created by tsc, but not .js files
-      declaration: true,
-      emitDeclarationOnly: true,
-      outDir: distDir
-    },
-    include,
-    exclude
-  };
-  if (projectTsconfig.extends) {
-    resetConfig.extends = projectTsconfig.extends.startsWith('.') ? path.join(resolvePath, projectTsconfig.extends) : projectTsconfig.extends;
-  }
-  const recommendOption = {
-    // Ensure that Babel can safely transpile files in the TypeScript project
-    compilerOptions: {
-      isolatedModules: true
-    }
-  };
-  const tempTsconfigPath = path.join(tempPath, `tsconfig.${Date.now()}.${nanoid()}.json`);
-  fs.ensureFileSync(tempTsconfigPath);
-  fs.writeJSONSync(tempTsconfigPath, deepMerge(recommendOption, projectTsconfig,
-  // 此处是必须要覆盖用户默认配置
-  resetConfig));
-  return tempTsconfigPath;
-};
-export const resolveAlias = (modernConfig, config, watchFilenames = []) => {
-  const {
-    output
-  } = modernConfig;
-  const defaultPaths = {
-    '@': ['./src']
-  };
-  const dtsDistPath = `${config.distDir}/**/*.d.ts`;
-  const dtsFilenames = watchFilenames.length > 0 ? watchFilenames : glob.sync(dtsDistPath, {
-    absolute: true
-  });
-  const alias = babel.getFinalAlias(modernConfig, {
-    appDirectory: config.appDirectory,
-    tsconfigPath: config.tsconfigPath || path.join(config.appDirectory, './tsconfig.json'),
-    sourceAbsDir: config.distDir
-  });
-  const mergedPaths = alias.isTsPath ? alias.paths || {} : _objectSpread(_objectSpread({}, defaultPaths), alias.paths || {});
-  const result = tsPathsTransform.transformDtsAlias({
-    filenames: dtsFilenames,
-    baseUrl: path.join(config.appDirectory, output.path || 'dist'),
-    paths: mergedPaths
-  });
-  for (const r of result) {
-    fs.writeFileSync(r.path, r.content);
-  }
-};
-export const getTscBinPath = appDirectory => {
-  const {
-    root
-  } = path.parse(appDirectory);
-  let currentDirectory = appDirectory;
-  while (currentDirectory !== root) {
-    const tscBinFile = path.join(currentDirectory, './node_modules/.bin/tsc');
-    if (fs.existsSync(tscBinFile)) {
-      return tscBinFile;
-    }
-    currentDirectory = path.dirname(currentDirectory);
-  }
-  throw new Error('Failed to excute the `tsc` command, please check if `typescript` is installed correctly in the current directory.');
-};

package/dist/js/modern/features/build/bundleless/index.js

@@ -1,21 +0,0 @@
-import { chalk } from '@modern-js/utils';
-import pMap from 'p-map';
-import { runBabelBuild } from "./runBabel";
-import { buildStyle } from "./style";
-import { genDts } from "./generator-dts";
-import { copyStaticAssets } from "./copy-assets";
-export const build = async (api, config, legacyOptions) => {
-  // valid format is umd
-  if (config.format === 'umd') {
-    console.info(chalk.yellowBright('bundleless 构建暂时不支持 umd 格式'));
-    return;
-  }
-  if (legacyOptions !== null && legacyOptions !== void 0 && legacyOptions.styleOnly) {
-    await buildStyle(api, config);
-    return;
-  }
-  const tasks = config.dtsOnly ? [genDts] : [runBabelBuild, genDts, buildStyle, copyStaticAssets];
-  await pMap(tasks, async task => {
-    await task(api, config);
-  });
-};

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

@@ -1,242 +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 path from 'path';
-import { Import, glob, fs, chalk, globby, slash } from '@modern-js/utils';
-import { InternalBuildError } from "../error";
-import { SectionTitleStatus, watchSectionTitle } from "../utils";
-export 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 {
-      summary,
-      details = []
-    } = this;
-    msgs.push(chalk.red.bold(summary));
-    for (const detail of details) {
-      msgs.push(detail.content);
-      msgs.push('\n');
-    }
-    return msgs;
-  }
-}
-const babelCompiler = Import.lazy('@modern-js/babel-compiler', require);
-const bc = Import.lazy('../../../utils/babel', require);
-const ts = Import.lazy('../../../utils/tsconfig', 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;
-};
-export const getWillCompilerCode = (srcDirOrFile, option) => {
-  const {
-    tsconfig,
-    isTsProject
-  } = option;
-  // 如果是一个文件路径，则直接返回
-  if (fs.existsSync(srcDirOrFile) && fs.lstatSync(srcDirOrFile).isFile()) {
-    return [srcDirOrFile];
-  }
-  const exts = getExts(isTsProject, tsconfig);
-  const globPattern = `${srcDirOrFile}/**/*{${exts.join(',')}}`;
-  const files = glob.sync(globPattern, {
-    ignore: [`${srcDirOrFile}/**/*.d.ts`],
-    absolute: true
-  });
-  return files;
-};
-export const buildSourceCode = async config => {
-  const {
-    willCompilerDirOrFile,
-    tsconfigPath,
-    babelConfig,
-    srcRootDir,
-    distDir,
-    watch
-  } = config;
-  const tsconfig = ts.readTsConfig(tsconfigPath);
-  const willCompilerFiles = getWillCompilerCode(willCompilerDirOrFile, {
-    tsconfig,
-    isTsProject: Boolean(tsconfig)
-  });
-  if (watch) {
-    const emitter = await babelCompiler.compiler({
-      quiet: true,
-      enableVirtualDist: true,
-      enableWatch: true,
-      rootDir: srcRootDir,
-      filenames: willCompilerFiles,
-      distDir,
-      watchDir: srcRootDir,
-      extensions: getExts(Boolean(tsconfig), tsconfig),
-      ignore: ['*.d.ts']
-    }, babelConfig);
-    return emitter;
-  } else {
-    return babelCompiler.compiler({
-      quiet: true,
-      enableVirtualDist: true,
-      rootDir: srcRootDir,
-      filenames: willCompilerFiles,
-      distDir,
-      // enableWatch: watch,
-      ignore: ['*.d.ts']
-    }, babelConfig);
-  }
-};
-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);
-    }
-  }
-};
-/**
- * when modern build, only throw Error or silent
- * @param outputResults
- * @param context
- */
-const outputDist = (outputResults, context) => {
-  const {
-    code,
-    message,
-    messageDetails,
-    virtualDists = []
-  } = outputResults;
-  if (code === 0) {
-    generatorRealFiles(virtualDists);
-  } else if (messageDetails && messageDetails.length > 0) {
-    const babelError = new BabelBuildError('bundleless failed', {
-      summary: message,
-      details: messageDetails
-    });
-    throw new InternalBuildError(babelError, _objectSpread(_objectSpread({}, context), {}, {
-      buildType: 'bundleless'
-    }));
-  }
-};
-export const jsFileSuffix = ['js', 'jsx', 'ts', 'tsx'];
-export const haveNotAnyJsFile = async sourceDir => {
-  const files = await globby(slash(`${sourceDir}/**/*.{${jsFileSuffix.join(',')}}`));
-  return files.length === 0;
-};
-export const runBabelBuild = async (api, config) => {
-  const {
-    bundlelessOptions,
-    tsconfig,
-    target,
-    format,
-    outputPath,
-    watch,
-    sourceMap
-  } = config;
-  const {
-    appDirectory
-  } = api.useAppContext();
-  const modernConfig = api.useResolvedConfigContext();
-  const {
-    output: {
-      path: distPath = 'dist'
-    }
-  } = modernConfig;
-  const {
-    sourceDir = './src'
-  } = bundlelessOptions;
-  const sourceAbsDir = path.join(appDirectory, sourceDir);
-  const tsconfigPath = path.join(appDirectory, tsconfig);
-  if (await haveNotAnyJsFile(sourceAbsDir)) {
-    return;
-  }
-
-  // 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}]`;
-  const buildConfig = {
-    format,
-    target,
-    babelConfig: bc.resolveBabelConfig(appDirectory, modernConfig, sourceMap, bundlelessOptions, {
-      sourceAbsDir,
-      tsconfigPath,
-      syntax,
-      type
-    })
-  };
-  const distDir = path.join(appDirectory, distPath, outputPath);
-  const result = await buildSourceCode({
-    appDirectory,
-    distDir,
-    srcRootDir: sourceAbsDir,
-    willCompilerDirOrFile: sourceAbsDir,
-    tsconfigPath,
-    babelConfig: buildConfig.babelConfig,
-    watch
-  });
-  if (watch) {
-    const emitter = result;
-    emitter.on(babelCompiler.BuildWatchEvent.firstCompiler, result => {
-      if (result.code === 1) {
-        console.info(watchSectionTitle(titleText, SectionTitleStatus.Fail));
-        console.error(result.message);
-        for (const detail of result.messageDetails || []) {
-          console.error(detail.content);
-        }
-      } else {
-        generatorRealFiles(result.virtualDists);
-        console.info(watchSectionTitle(titleText, SectionTitleStatus.Success));
-      }
-    });
-    emitter.on(babelCompiler.BuildWatchEvent.watchingCompiler, result => {
-      if (result.code === 1) {
-        var _result$virtualDists;
-        // console.error(logger.clearFlag);
-        console.info(watchSectionTitle(titleText, 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);
-        }
-      } else {
-        generatorRealFiles(result.virtualDists);
-        console.info(watchSectionTitle(titleText, SectionTitleStatus.Success));
-      }
-    });
-    await emitter.watch();
-  } else {
-    outputDist(result, {
-      target,
-      format
-    });
-  }
-};