@modern-js/module-tools 1.5.7 → 1.6.0-alpha.0

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

@@ -0,0 +1,209 @@
+"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 = ['NODE_ENV', ...(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
+    }
+  } = api.useResolvedConfigContext();
+  const {
+    target,
+    watch,
+    bundleOptions,
+    outputPath,
+    format,
+    sourceMap
+  } = config;
+  const {
+    entry,
+    platform,
+    splitting,
+    minify,
+    externals
+  } = bundleOptions;
+
+  const distDir = _path.default.join(appDirectory, distPath, outputPath);
+
+  const titleText = `[Bundle:Speedy:${format}_${target}]`;
+  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());
+  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
+  };
+  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/{tasks → features/build/bundleless}/copy-assets.js

@@ -1,5 +1,10 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.copyStaticAssets = void 0;
+
 var path = _interopRequireWildcard(require("path"));
 
 var _utils = require("@modern-js/utils");
@@ -8,13 +13,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 argv = _utils.Import.lazy('process.argv', require);
-
-const core = _utils.Import.lazy('@modern-js/core', require);
-
-const copyUtils = _utils.Import.lazy('../utils/copy', require);
+const copyUtils = _utils.Import.lazy('../../../utils/copy', require);
 
-const STYLE_DIRS = 'styles';
 const SRC_DIRS = 'src';
 
 const copyAssets = ({
@@ -38,11 +38,13 @@ const copyAssets = ({
   }
 };
 
-const watchAssets = ({
+const watchAssets = (api, {
   targetDir,
   outputDir
 }) => {
-  (0, _utils.watch)(`${targetDir}/**/*.*`, ({
+  const appContext = api.useAppContext();
+  const modernConfig = api.useResolvedConfigContext();
+  (0, _utils.watch)(`${targetDir}/**/*.*`, async ({
     changeType,
     changedFilePath
   }) => {
@@ -57,73 +59,53 @@ const watchAssets = ({
     const file = path.relative(targetDir, changedFilePath);
 
     _utils.fs.copyFileSync(changedFilePath, path.resolve(outputDir, file));
+
+    await copyUtils.copyTask({
+      modernConfig,
+      appContext
+    });
   }, ['**/*.{js,jsx,ts,tsx,d.ts,scss,less,css,sass}']);
 };
 
-const taskMain = ({
-  modernConfig,
-  appContext
-}) => {
-  const processArgv = argv(process.argv.slice(2));
-  const config = processArgv({});
+const copyStaticAssets = async (api, config) => {
+  var _bundlelessOptions$so;
+
+  const appContext = api.useAppContext();
+  const modernConfig = api.useResolvedConfigContext();
   const {
     appDirectory
   } = appContext;
   const {
-    jsPath = 'js',
-    assetsPath = 'styles',
-    path: outputPath = 'dist'
+    path: distPath = 'dist'
   } = modernConfig.output;
-  const srcDir = path.join(appDirectory, SRC_DIRS);
-  const outputDirToSrc = path.join(appDirectory, outputPath, jsPath, assetsPath);
-  const styleDir = path.join(appDirectory, STYLE_DIRS);
-  const outputDirToStyle = path.join(appDirectory, outputPath, assetsPath);
+  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
   });
-  copyAssets({
-    targetDir: styleDir,
-    outputDir: outputDirToStyle
-  });
-  copyUtils.copyTask({
+  await copyUtils.copyTask({
     modernConfig,
     appContext
   });
 
   if (config.watch) {
-    watchAssets({
+    watchAssets(api, {
       targetDir: srcDir,
       outputDir: outputDirToSrc
     });
-    watchAssets({
-      targetDir: styleDir,
-      outputDir: outputDirToStyle
-    });
   }
 };
 
-(async () => {
-  let options;
-
-  if (process.env.CORE_INIT_OPTION_FILE) {
-    ({
-      options
-    } = require(process.env.CORE_INIT_OPTION_FILE));
-  }
-
-  const {
-    resolved: modernConfig,
-    appContext
-  } = await core.cli.init([], options);
-  core.manager.run(() => {
-    try {
-      taskMain({
-        modernConfig,
-        appContext
-      });
-    } catch (e) {
-      console.error(e.message);
-    }
-  });
-})();
+exports.copyStaticAssets = copyStaticAssets;

package/dist/js/node/{tasks → features/build/bundleless}/generator-dts/index.js

@@ -1,16 +1,23 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.genDts = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("@modern-js/utils");
 
-var _utils2 = require("./utils");
+var _error = require("../../error");
 
-const core = _utils.Import.lazy('@modern-js/core', require);
+var _utils2 = require("../../utils");
 
-const argv = _utils.Import.lazy('process.argv', require);
+var _utils3 = require("./utils");
 
-const utils = _utils.Import.lazy('./utils', require);
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-let removeTsconfigPath = '';
+const utils = _utils.Import.lazy('./utils', require);
 
 const getProjectTsconfig = tsconfigPath => {
   if (!tsconfigPath || !_utils.fs.existsSync(tsconfigPath)) {
@@ -21,7 +28,6 @@ const getProjectTsconfig = tsconfigPath => {
 };
 
 const resolveLog = (childProgress, {
-  tsCheck: _tsCheck = false,
   watch: _watch = false
 } = {}) => {
   var _childProgress$stdout, _childProgress$stdout2, _childProgress$stderr;
@@ -32,11 +38,8 @@ const resolveLog = (childProgress, {
    * watch 模式下，则使用这里的信息
    */
   (_childProgress$stdout = childProgress.stdout) === null || _childProgress$stdout === void 0 ? void 0 : _childProgress$stdout.on('data', data => {
-    if (!_tsCheck) {
-      return;
-    }
-
     if (_watch) {
+      console.info((0, _utils2.watchSectionTitle)('[Bundleless:DTS]', _utils2.SectionTitleStatus.Log));
       console.info(data.toString());
     }
   }); // 正常以下内容都不会触发，因为tsc 不会产生以下类型的log信息，不过防止意外情况
@@ -53,96 +56,79 @@ const generatorDts = async (_, config) => {
   const {
     tsconfigPath,
     distDir,
-    sourceDirName = 'src',
-    projectData: {
-      appDirectory
-    },
-    tsCheck = false,
+    sourceDir = 'src',
+    appDirectory,
     watch = false
   } = config;
   const userTsconfig = getProjectTsconfig(tsconfigPath);
   const willDeleteTsconfigPath = utils.generatorTsConfig(userTsconfig, {
     appDirectory,
     distDir,
-    sourceDir: sourceDirName
+    sourceDir
   });
-  removeTsconfigPath = willDeleteTsconfigPath;
-  const tscBinFile = (0, _utils2.getTscBinPath)(appDirectory);
+  const tscBinFile = (0, _utils3.getTscBinPath)(appDirectory);
   const watchParams = watch ? ['-w'] : [];
-  const childProgress = (0, _utils.execa)(tscBinFile, ['-p', willDeleteTsconfigPath, ...watchParams], {
+  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, {
-    tsCheck,
     watch
   });
 
   try {
     await childProgress;
-    console.info('[TSC Compiler]: Successfully');
   } catch (e) {
-    if (!tsCheck) {
-      console.info(`There are some type warnings, which can be checked by configuring 'output.disableTsChecker = false'`);
-    } // 通过使用 execa，可以将 tsc 的 data 类型的报错信息变为异常错误信息
-    else if ((0, _utils.isObject)(e) && e.stdout) {
-      console.error(e.stdout);
-    } else {
-      console.error(e);
+    if (e instanceof Error) {
+      throw new _error.InternalDTSError(e, {
+        buildType: 'bundleless'
+      });
     }
   }
 
   _utils.fs.removeSync(willDeleteTsconfigPath);
 };
 
-const taskMain = async ({
-  modernConfig
-}) => {
-  const processArgv = argv(process.argv.slice(2));
-  const config = processArgv({
-    appDirectory: process.cwd(),
-    srcDir: 'src',
-    distDir: 'dist/types',
-    tsconfigPath: './tsconfig.json',
-    sourceDirName: 'src'
-  });
-  const option = {
-    srcDir: config.srcDir,
-    distDir: config.distDir,
-    projectData: {
-      appDirectory: config.appDirectory
+const genDts = async (api, config) => {
+  const {
+    outputPath,
+    tsconfig: tsconfigPath,
+    watch,
+    bundlelessOptions: {
+      sourceDir
     },
-    tsconfigPath: config.tsconfigPath,
-    watch: config.watch,
-    tsCheck: config.tsCheck,
-    sourceDirName: config.sourceDirName
-  };
-  await generatorDts(modernConfig, option); // // TODO: watch 模式下无法转换
-
-  utils.resolveAlias(modernConfig, option);
-};
-
-(async () => {
-  let options;
+    enableDts
+  } = config;
 
-  if (process.env.CORE_INIT_OPTION_FILE) {
-    ({
-      options
-    } = require(process.env.CORE_INIT_OPTION_FILE));
+  if (!enableDts) {
+    return;
   }
 
   const {
-    resolved
-  } = await core.cli.init([], options);
-  await core.manager.run(async () => {
-    try {
-      await taskMain({
-        modernConfig: resolved
-      });
-    } catch (e) {
-      console.error(e.message);
-
-      _utils.fs.removeSync(removeTsconfigPath);
+    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/{tasks → features/build/bundleless}/generator-dts/utils.js

@@ -21,11 +21,11 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 babel = _utils.Import.lazy('../../../../utils/babel', require);
 
-const tsPathsTransform = _utils.Import.lazy('../../utils/tspaths-transform', require);
+const tsPathsTransform = _utils.Import.lazy('../../../../utils/tspaths-transform', require);
 
-const constants = _utils.Import.lazy('../constants', require);
+const constants = _utils.Import.lazy('../../../../utils/constants', require);
 
 const generatorTsConfig = (projectTsconfig, {
   appDirectory,
@@ -87,14 +87,14 @@ const resolveAlias = (modernConfig, config, watchFilenames = []) => {
     absolute: true
   });
   const alias = babel.getFinalAlias(modernConfig, {
-    appDirectory: config.projectData.appDirectory,
-    tsconfigPath: config.tsconfigPath || path.join(config.projectData.appDirectory, './tsconfig.json'),
+    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.projectData.appDirectory, output.path || 'dist'),
+    baseUrl: path.join(config.appDirectory, output.path || 'dist'),
     paths: mergedPaths
   });
 

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

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.build = void 0;
+
+var _runBabel = require("./runBabel");
+
+var _style = require("./style");
+
+var _generatorDts = require("./generator-dts");
+
+var _copyAssets = require("./copy-assets");
+
+const build = async (api, config, legacyOptions) => {
+  if (legacyOptions !== null && legacyOptions !== void 0 && legacyOptions.styleOnly) {
+    await (0, _style.buildStyle)(api, config);
+    return;
+  }
+
+  const tasks = config.dtsOnly ? [(0, _generatorDts.genDts)(api, config)] : [(0, _runBabel.runBabelBuild)(api, config), (0, _generatorDts.genDts)(api, config), (0, _style.buildStyle)(api, config), (0, _copyAssets.copyStaticAssets)(api, config)];
+  await Promise.all(tasks);
+};
+
+exports.build = build;