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

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

@@ -1,186 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.runSpeedy = exports.getDefine = exports.getAlias = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _speedyCore = require("@speedy-js/speedy-core");
-var _speedyPluginEs = require("@speedy-js/speedy-plugin-es5");
-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; }
-const getAlias = api => {
-  const {
-    appDirectory,
-    srcDirectory
-  } = api.useAppContext();
-  const {
-    source
-  } = api.useResolvedConfigContext();
-  // TODO: maybe check tsconfig `paths`
-  const defaultAlias = {
-    '@': srcDirectory
-  };
-  const alias = (0, _utils.applyOptionsChain)(defaultAlias, source === null || source === void 0 ? void 0 : source.alias);
-  return Object.keys(alias).reduce((o, name) => {
-    return _objectSpread(_objectSpread({}, o), {}, {
-      [name]: (0, _utils.ensureAbsolutePath)(appDirectory, alias[name])
-    });
-  }, {});
-};
-exports.getAlias = getAlias;
-const getDefine = api => {
-  const {
-    source: {
-      envVars,
-      globalVars
-    }
-  } = api.useResolvedConfigContext();
-  const envVarsDefine = [...(envVars || [])].reduce((memo, name) => {
-    memo[`process.env.${name}`] = JSON.stringify(process.env[name]);
-    return memo;
-  }, {});
-  const globalVarsDefine = Object.keys(globalVars || {}).reduce((memo, name) => {
-    memo[name] = globalVars ? JSON.stringify(globalVars[name]) : '';
-    return memo;
-  }, {});
-  return _objectSpread(_objectSpread({}, envVarsDefine), globalVarsDefine);
-};
-exports.getDefine = getDefine;
-const getStyleOptionFromModern = async api => {
-  const runner = api.useHookRunners();
-  const {
-    appDirectory
-  } = api.useAppContext();
-  const modernConfig = api.useResolvedConfigContext();
-  const lessOption = await runner.moduleLessConfig({
-    modernConfig
-  }, {
-    onLast: async _ => undefined
-  });
-  const sassOption = await runner.moduleSassConfig({
-    modernConfig
-  }, {
-    onLast: async _ => undefined
-  });
-  const tailwindPlugin = await runner.moduleTailwindConfig({
-    modernConfig
-  }, {
-    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);
-  }
-  return {
-    less: lessOption === null || lessOption === void 0 ? void 0 : lessOption.lessOption,
-    sass: sassOption,
-    postcss: _objectSpread(_objectSpread({}, postcssOption.options), {}, {
-      plugins: postcssOption.plugins
-    })
-  };
-};
-const runSpeedy = async (api, config) => {
-  const {
-    appDirectory
-  } = api.useAppContext();
-  const {
-    output: {
-      path: distPath = 'dist'
-    },
-    tools: {
-      speedy: userSpeedyConfig
-    } = {
-      speedy: undefined
-    }
-  } = api.useResolvedConfigContext();
-  const {
-    target,
-    watch,
-    bundleOptions,
-    outputPath,
-    format,
-    sourceMap
-  } = config;
-  const {
-    entry,
-    platform,
-    splitting,
-    minify,
-    externals,
-    getModuleId
-  } = bundleOptions;
-  const distDir = _path.default.join(appDirectory, distPath, outputPath);
-  const titleText = `[Bundle:Speedy:${format}_${target}]`;
-  const style = await getStyleOptionFromModern(api);
-  const alias = getAlias(api);
-  const define = getDefine(api);
-  const watchPlugin = () => {
-    return {
-      name: 'watch-plugin',
-      apply(compiler) {
-        compiler.hooks.watchChange.tap('watch-plugin', async () => {
-          console.info((0, _utils2.watchSectionTitle)(titleText, _utils2.SectionTitleStatus.Log));
-        });
-      }
-    };
-  };
-  const plugins = target === 'es5' ? [(0, _speedyPluginEs.es5InputPlugin)()] : [];
-  plugins.push(watchPlugin());
-  // TODO: add speedy plugin about react
-  const internalSpeedyConfig = {
-    command: 'build',
-    mode: 'production',
-    html: false,
-    preset: 'webapp',
-    // support css and json
-    platform,
-    watch,
-    input: entry,
-    target,
-    clearScreen: false,
-    output: {
-      path: distDir,
-      format,
-      splitting,
-      filename: '[name]'
-    },
-    style,
-    resolve: {
-      alias
-    },
-    define,
-    sourceMap,
-    minify,
-    external: externals,
-    plugins,
-    getModuleId
-  };
-  const speedyConfig = (0, _utils.applyOptionsChain)(internalSpeedyConfig, userSpeedyConfig);
-  const compiler = await _speedyCore.SpeedyBundler.create(speedyConfig);
-  try {
-    if (watch) {
-      console.info((0, _utils2.watchSectionTitle)(titleText, _utils2.SectionTitleStatus.Log));
-    }
-    await compiler.build();
-  } catch (e) {
-    /**
-     * in watch mode
-     * use speedy watch log
-     */
-    if (e instanceof Error) {
-      throw new _error.InternalBuildError(e, {
-        target,
-        format,
-        buildType: 'bundle'
-      });
-    }
-  }
-};
-exports.runSpeedy = runSpeedy;

package/dist/js/node/features/build/bundleless/copy-assets.js

@@ -1,84 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.copyStaticAssets = void 0;
-var path = _interopRequireWildcard(require("path"));
-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 copyUtils = _utils.Import.lazy('../../../utils/copy', require);
-const SRC_DIRS = 'src';
-const copyAssets = ({
-  targetDir,
-  outputDir
-}) => {
-  const assetsFiles = _utils.glob.sync(`${targetDir}/**/*.*`, {
-    ignore: ['**/*.{js,jsx,ts,tsx,d.ts,scss,less,css,sass}']
-  });
-  if (assetsFiles.length > 0) {
-    _utils.fs.ensureDirSync(outputDir);
-  }
-  for (const resource of assetsFiles) {
-    const file = path.relative(targetDir, resource);
-    _utils.fs.ensureDirSync(path.dirname(path.resolve(outputDir, file)));
-    _utils.fs.copyFileSync(resource, path.resolve(outputDir, file));
-  }
-};
-const watchAssets = (api, {
-  targetDir,
-  outputDir
-}) => {
-  (0, _utils.watch)(`${targetDir}/**/*.*`, async ({
-    changeType,
-    changedFilePath
-  }) => {
-    if (changeType === _utils.WatchChangeType.UNLINK) {
-      const removeFile = path.normalize(`${outputDir}/${path.relative(targetDir, changedFilePath)}`);
-      _utils.fs.removeSync(removeFile);
-      return;
-    }
-    const file = path.relative(targetDir, changedFilePath);
-    _utils.fs.copyFileSync(changedFilePath, path.resolve(outputDir, file));
-  }, ['**/*.{js,jsx,ts,tsx,d.ts,scss,less,css,sass}']);
-};
-const copyStaticAssets = async (api, config) => {
-  var _bundlelessOptions$so;
-  const appContext = api.useAppContext();
-  const modernConfig = api.useResolvedConfigContext();
-  const {
-    appDirectory
-  } = appContext;
-  const {
-    path: distPath = 'dist'
-  } = modernConfig.output;
-  const {
-    outputPath,
-    bundlelessOptions
-  } = config;
-  const {
-    static: {
-      path: staticPath = './'
-    } = {
-      path: './'
-    }
-  } = bundlelessOptions;
-  const srcDir = path.join(appDirectory, (_bundlelessOptions$so = bundlelessOptions.sourceDir) !== null && _bundlelessOptions$so !== void 0 ? _bundlelessOptions$so : SRC_DIRS);
-  const outputDirToSrc = path.join(appDirectory, distPath, outputPath, staticPath);
-  copyAssets({
-    targetDir: srcDir,
-    outputDir: outputDirToSrc
-  });
-  await copyUtils.copyTask({
-    modernConfig,
-    appContext
-  });
-  if (config.watch) {
-    watchAssets(api, {
-      targetDir: srcDir,
-      outputDir: outputDirToSrc
-    });
-  }
-};
-exports.copyStaticAssets = copyStaticAssets;

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

@@ -1,114 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.genDts = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-var _error = require("../../error");
-var _utils2 = require("../../utils");
-var _utils3 = require("./utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const utils = _utils.Import.lazy('./utils', require);
-const getProjectTsconfig = tsconfigPath => {
-  if (!tsconfigPath || !_utils.fs.existsSync(tsconfigPath)) {
-    return {};
-  }
-  return _utils.json5.parse(_utils.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((0, _utils2.watchSectionTitle)('[Bundleless:DTS]', _utils2.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 = (0, _utils3.getTscBinPath)(appDirectory);
-  const watchParams = watch ? ['-w'] : [];
-  const childProgress = (0, _utils.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 _error.InternalDTSError(e, {
-        buildType: 'bundleless'
-      });
-    }
-  }
-  _utils.fs.removeSync(willDeleteTsconfigPath);
-};
-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.default.join(appDirectory, distPath, outputPath);
-  const option = {
-    appDirectory,
-    distDir,
-    tsconfigPath,
-    watch,
-    sourceDir
-  };
-  await generatorDts(modernConfig, option);
-  // TODO: watch 模式下无法转换
-  utils.resolveAlias(modernConfig, option);
-};
-exports.genDts = genDts;

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

@@ -1,105 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.resolveAlias = exports.getTscBinPath = exports.generatorTsConfig = void 0;
-var path = _interopRequireWildcard(require("path"));
-var _utils = require("@modern-js/utils");
-var _lodash = require("@modern-js/utils/lodash");
-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 babel = _utils.Import.lazy('../../../../utils/babel', require);
-const tsPathsTransform = _utils.Import.lazy('../../../../utils/tspaths-transform', require);
-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()}.${(0, _utils.nanoid)()}.json`);
-  _utils.fs.ensureFileSync(tempTsconfigPath);
-  _utils.fs.writeJSONSync(tempTsconfigPath, (0, _lodash.merge)(recommendOption, projectTsconfig,
-  // 此处是必须要覆盖用户默认配置
-  resetConfig));
-  return tempTsconfigPath;
-};
-exports.generatorTsConfig = generatorTsConfig;
-const resolveAlias = (modernConfig, config, watchFilenames = []) => {
-  const {
-    output
-  } = modernConfig;
-  const defaultPaths = {
-    '@': ['./src']
-  };
-  const dtsDistPath = `${config.distDir}/**/*.d.ts`;
-  const dtsFilenames = watchFilenames.length > 0 ? watchFilenames : _utils.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) {
-    _utils.fs.writeFileSync(r.path, r.content);
-  }
-};
-exports.resolveAlias = resolveAlias;
-const getTscBinPath = appDirectory => {
-  const {
-    root
-  } = path.parse(appDirectory);
-  let currentDirectory = appDirectory;
-  while (currentDirectory !== root) {
-    const tscBinFile = path.join(currentDirectory, './node_modules/.bin/tsc');
-    if (_utils.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.');
-};
-exports.getTscBinPath = getTscBinPath;

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

@@ -1,29 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.build = void 0;
-var _utils = require("@modern-js/utils");
-var _pMap = _interopRequireDefault(require("p-map"));
-var _runBabel = require("./runBabel");
-var _style = require("./style");
-var _generatorDts = require("./generator-dts");
-var _copyAssets = require("./copy-assets");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const build = async (api, config, legacyOptions) => {
-  // valid format is umd
-  if (config.format === 'umd') {
-    console.info(_utils.chalk.yellowBright('bundleless 构建暂时不支持 umd 格式'));
-    return;
-  }
-  if (legacyOptions !== null && legacyOptions !== void 0 && legacyOptions.styleOnly) {
-    await (0, _style.buildStyle)(api, config);
-    return;
-  }
-  const tasks = config.dtsOnly ? [_generatorDts.genDts] : [_runBabel.runBabelBuild, _generatorDts.genDts, _style.buildStyle, _copyAssets.copyStaticAssets];
-  await (0, _pMap.default)(tasks, async task => {
-    await task(api, config);
-  });
-};
-exports.build = build;