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

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # @modern-js/module-tools
 
+## 2.0.0-beta.1
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- d61ca88: update speedy version
+  更新依赖里 speedy 的版本
+- b8bbe036c7: feat: export Hooks type
+  feat: 导出 Hooks 类型
+- ebbeed1: update speedy-core to fix sass resolve error
+  更新 speedy-core 版本以修复 sass resolve 错误
+- d4a4566: chore: rename plugin-jarvis to plugin-lint
+
+  chore: 重命名 plugin-jarvis 为 plugin-lint
+
+- 14b712d: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [85edee888c]
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [d4a4566]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [f179749]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/core@2.0.0-beta.1
+  - @modern-js/utils@2.0.0-beta.1
+  - @modern-js/plugin-lint@2.0.0-beta.1
+  - @modern-js/plugin@2.0.0-beta.1
+  - @modern-js/babel-preset-module@2.0.0-beta.1
+  - @modern-js/plugin-changeset@2.0.0-beta.1
+  - @modern-js/plugin-i18n@2.0.0-beta.1
+  - @modern-js/new-action@2.0.0-beta.1
+  - @modern-js/babel-compiler@2.0.0-beta.1
+  - @modern-js/style-compiler@2.0.0-beta.1
+  - @modern-js/upgrade@2.0.0-beta.1
+
 ## 2.0.0-beta.0
 
 ### Major Changes

package/dist/js/modern/cli/build.js

@@ -2,7 +2,8 @@ import { Import } from '@modern-js/utils';
 const local = Import.lazy('../locale/index', require);
 const command = Import.lazy('../commands/build', require);
 export const buildCli = (program, api) => {
-  return program.command('build').usage('[options]').description(local.i18n.t(local.localeKeys.command.build.describe)).option('-w, --watch', local.i18n.t(local.localeKeys.command.build.watch)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').option('--style-only', local.i18n.t(local.localeKeys.command.build.style_only)).option('-p, --platform [platform]', local.i18n.t(local.localeKeys.command.build.platform)) // @deprecated
+  return program.command('build').usage('[options]').description(local.i18n.t(local.localeKeys.command.build.describe)).option('-w, --watch', local.i18n.t(local.localeKeys.command.build.watch)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').option('--style-only', local.i18n.t(local.localeKeys.command.build.style_only)).option('-p, --platform [platform]', local.i18n.t(local.localeKeys.command.build.platform))
+  // @deprecated
   // The `--no-tsc` option has been superceded by the `--no-dts` option.
   .option('--no-tsc', local.i18n.t(local.localeKeys.command.build.no_tsc)).option('--dts', local.i18n.t(local.localeKeys.command.build.dts)).option('--no-clear', local.i18n.t(local.localeKeys.command.build.no_clear)).option('-c --config <config>', local.i18n.t(local.localeKeys.command.build.config)).action(async subCommand => {
     await command.build(api, subCommand);

package/dist/js/modern/cli/dev.js

@@ -3,8 +3,8 @@ const local = Import.lazy('../locale', require);
 const commands = Import.lazy('../commands', require);
 export const devCli = (program, api) => {
   program.command('dev [subCmd]').usage('[options]').description(local.i18n.t(local.localeKeys.command.dev.describe)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').action(async (subCmd, params) => {
-    await commands.dev(api, params, subCmd); // support plugin-proxy
-
+    await commands.dev(api, params, subCmd);
+    // support plugin-proxy
     const runner = api.useHookRunners();
     await runner.afterDev();
   });

package/dist/js/modern/cli/new.js

@@ -1,9 +1,6 @@
 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 } from '@modern-js/utils';
 const newAction = Import.lazy('@modern-js/new-action', require);
 const local = Import.lazy('../locale', require);

package/dist/js/modern/commands/build.js

@@ -8,7 +8,6 @@ const buildFeature = Import.lazy('../features/build', require);
  * init work before build task.
  * @param api
  */
-
 export const init = api => {
   const {
     appDirectory
@@ -18,14 +17,12 @@ export const init = api => {
     if (code === 0) {
       return;
     }
-
     const tempTsconfigPathPattern = path.join(appDirectory, './node_modules', `./tsconfig.**.**.json`);
     const files = globby(slash(tempTsconfigPathPattern), {
       stats: true,
       absolute: true
     });
     const currentTime = Date.now();
-
     for (const file of files) {
       // over 30s, will delete it
       if (currentTime - file.stats.birthtimeMs >= 30 * 1000) {
@@ -36,7 +33,6 @@ export const init = api => {
 };
 export const build = async (api, buildCommandOption) => {
   var _modernConfig$output$;
-
   const {
     watch = false,
     tsconfig: tsconfigName,

package/dist/js/modern/commands/dev.js

@@ -3,9 +3,7 @@ import { dotenv, Import } from '@modern-js/utils';
 const devFeature = Import.lazy('../features/dev', require);
 const tsConfigutils = Import.lazy('../utils/tsconfig', require);
 const valid = Import.lazy('../utils/valide', require);
-
 const existSubCmd = subCmd => subCmd.length > 0;
-
 export const dev = async (api, option, subCmd = '') => {
   const {
     tsconfig: tsconfigName
@@ -22,16 +20,15 @@ export const dev = async (api, option, subCmd = '') => {
     tsconfigPath
   });
   const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
-
   if (existSubCmd(subCmd)) {
     await devFeature.runSubCmd(api, subCmd, {
       isTsProject,
       appDirectory
     });
     return;
-  } // Compatible with the use of jupiter, RUN_PLATFORM is used in jupiter
-
+  }
 
+  // Compatible with the use of jupiter, RUN_PLATFORM is used in jupiter
   if (process.env.RUN_PLATFORM) {
     await devFeature.showMenu(api, {
       isTsProject,

package/dist/js/modern/features/build/build-platform.js

@@ -1,9 +1,6 @@
 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 { execa, Import, chalk } from '@modern-js/utils';
 const lg = Import.lazy('./logger', require);
 const pMap = Import.lazy('p-map', require);
@@ -12,18 +9,16 @@ export const buildPlatform = async (api, option) => {
     isTsProject = false,
     platform
   } = option;
-  const lm = new lg.LoggerManager(); // 获取platforms的参数
-
+  const lm = new lg.LoggerManager();
+  // 获取platforms的参数
   const runners = api.useHookRunners();
   const buildTasks = await runners.platformBuild({
     isTsProject
   });
-
   if (buildTasks.length <= 0) {
     console.info(chalk.yellow('No build tasks detected.\nYou can use the `new` command to enable the more features'));
     return;
   }
-
   const loggerMap = {};
   const taskMapper = buildTasks.filter(task => platform === 'all' || task.name === platform).map(params => {
     const logger = lm.createLoggerText({
@@ -34,12 +29,10 @@ export const buildPlatform = async (api, option) => {
       logger
     }, params);
   });
-
   if (taskMapper.length <= 0) {
     console.info(chalk.yellow(`'${platform}' is undefined task`));
     return;
   }
-
   lm.showCompiling();
   await pMap(taskMapper, async ({
     taskPath,
@@ -49,23 +42,27 @@ export const buildPlatform = async (api, option) => {
     const childProcess = execa.node(taskPath, params, {
       stdio: 'inherit',
       all: true
-    }); // lm.addStdout(logger, childProcess.stdout, {
+    });
+
+    // lm.addStdout(logger, childProcess.stdout, {
     //   event: { data: true, error: true },
     // });
-    // lm.addStderr(logger, childProcess.stderr);
 
+    // lm.addStderr(logger, childProcess.stderr);
     try {
       await childProcess;
     } catch (_unused) {
       // eslint-disable-next-line no-process-exit
       process.exit(1);
-    } // lm.disappearCompiling();
+    }
+    // lm.disappearCompiling();
     // console.info(lg.colors.title(title));
     // console.info(a.all);
-
   }, {
     concurrency: 1
-  }); // lm.disappearCompiling();
+  });
+
+  // lm.disappearCompiling();
   // for (const key of Object.keys(loggerMap)) {
   //   console.info(loggerMap[key].value);
   // }

package/dist/js/modern/features/build/bundle/runRollup.js

@@ -1,30 +1,26 @@
 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 ts from 'typescript';
 import hashbangPlugin from 'rollup-plugin-hashbang';
 import jsonPlugin from '@rollup/plugin-json';
 import { InternalDTSError } from "../error";
-import { SectionTitleStatus, watchSectionTitle } from "../utils"; // Copied from https://github.com/egoist/tsup/blob/dev/src/rollup.ts
+import { SectionTitleStatus, watchSectionTitle } from "../utils";
+
+// Copied from https://github.com/egoist/tsup/blob/dev/src/rollup.ts
 
 const loadCompilerOptions = tsconfig => {
   if (!tsconfig) {
     return {};
   }
-
   const configFile = ts.readConfigFile(tsconfig, ts.sys.readFile);
   const {
     options
   } = ts.parseJsonConfigFileContent(configFile.config, ts.sys, './');
   return options;
 };
-
 const dtsPlugin = require('rollup-plugin-dts');
-
 const getRollupConfig = async (api, options) => {
   const {
     appDirectory
@@ -46,29 +42,23 @@ const getRollupConfig = async (api, options) => {
   };
   const ignoreFiles = {
     name: 'ignore-files',
-
     load(id) {
       if (!/\.(js|jsx|ts|tsx|json)$/.test(id)) {
         return '';
       }
-
       return null;
     }
-
   };
   return {
     inputConfig: {
       input: dtsOptions.entry,
       external: bundleOptions.externals,
-
       onwarn(warning, handler) {
         if (warning.code === 'UNRESOLVED_IMPORT' || warning.code === 'CIRCULAR_DEPENDENCY' || warning.code === 'EMPTY_BUNDLE') {
           return;
         }
-
         handler(warning);
       },
-
       plugins: [hashbangPlugin(), jsonPlugin(), ignoreFiles, dtsPlugin.default({
         // use external to prevent them which come from node_modules from be bundled.
         respectExternal: true,
@@ -98,7 +88,6 @@ const getRollupConfig = async (api, options) => {
     }
   };
 };
-
 async function runRollup(options, context) {
   try {
     const {
@@ -114,7 +103,6 @@ async function runRollup(options, context) {
     }
   }
 }
-
 async function watchRollup(options) {
   const {
     watch
@@ -128,15 +116,14 @@ async function watchRollup(options) {
       console.info(watchSectionTitle(titleText, SectionTitleStatus.Log));
     } else if (event.code === 'BUNDLE_END') {
       console.info(watchSectionTitle(titleText, SectionTitleStatus.Success));
-    } else if (event.code === 'ERROR') {// this is dts rollup plugin bug, error not complete message
+    } else if (event.code === 'ERROR') {
+      // this is dts rollup plugin bug, error not complete message
     }
   });
 }
-
 export const startRollup = async (api, options) => {
   if (options.enableDts) {
     const config = await getRollupConfig(api, options);
-
     if (options.watch) {
       watchRollup(config);
     } else {

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

@@ -1,9 +1,6 @@
 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 { SpeedyBundler } from '@speedy-js/speedy-core';
 import { es5InputPlugin } from '@speedy-js/speedy-plugin-es5';
@@ -17,8 +14,8 @@ export const getAlias = api => {
   } = api.useAppContext();
   const {
     source
-  } = api.useResolvedConfigContext(); // TODO: maybe check tsconfig `paths`
-
+  } = api.useResolvedConfigContext();
+  // TODO: maybe check tsconfig `paths`
   const defaultAlias = {
     '@': srcDirectory
   };
@@ -46,7 +43,6 @@ export const getDefine = api => {
   }, {});
   return _objectSpread(_objectSpread({}, envVarsDefine), globalVarsDefine);
 };
-
 const getStyleOptionFromModern = async api => {
   const runner = api.useHookRunners();
   const {
@@ -69,13 +65,10 @@ const getStyleOptionFromModern = async api => {
     onLast: async _ => undefined
   });
   const postcssOption = 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,
@@ -84,7 +77,6 @@ const getStyleOptionFromModern = async api => {
     })
   };
 };
-
 export const runSpeedy = async (api, config) => {
   const {
     appDirectory
@@ -118,23 +110,19 @@ export const runSpeedy = async (api, config) => {
   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(watchSectionTitle(titleText, SectionTitleStatus.Log));
         });
       }
-
     };
   };
-
   const plugins = target === 'es5' ? [es5InputPlugin()] : [];
-  plugins.push(watchPlugin()); // TODO: add speedy plugin about react
-
+  plugins.push(watchPlugin());
+  // TODO: add speedy plugin about react
   const internalSpeedyConfig = {
     command: 'build',
     mode: 'production',
@@ -165,12 +153,10 @@ export const runSpeedy = async (api, config) => {
   };
   const speedyConfig = applyOptionsChain(internalSpeedyConfig, userSpeedyConfig);
   const compiler = await SpeedyBundler.create(speedyConfig);
-
   try {
     if (watch) {
       console.info(watchSectionTitle(titleText, SectionTitleStatus.Log));
     }
-
     await compiler.build();
   } catch (e) {
     /**

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

@@ -2,7 +2,6 @@ import * as path from 'path';
 import { fs, watch, glob, WatchChangeType, Import } from '@modern-js/utils';
 const copyUtils = Import.lazy('../../../utils/copy', require);
 const SRC_DIRS = 'src';
-
 const copyAssets = ({
   targetDir,
   outputDir
@@ -10,18 +9,15 @@ const copyAssets = ({
   const assetsFiles = glob.sync(`${targetDir}/**/*.*`, {
     ignore: ['**/*.{js,jsx,ts,tsx,d.ts,scss,less,css,sass}']
   });
-
   if (assetsFiles.length > 0) {
     fs.ensureDirSync(outputDir);
   }
-
   for (const resource of assetsFiles) {
     const file = path.relative(targetDir, resource);
     fs.ensureDirSync(path.dirname(path.resolve(outputDir, file)));
     fs.copyFileSync(resource, path.resolve(outputDir, file));
   }
 };
-
 const watchAssets = (api, {
   targetDir,
   outputDir
@@ -35,15 +31,12 @@ const watchAssets = (api, {
       fs.removeSync(removeFile);
       return;
     }
-
     const file = path.relative(targetDir, changedFilePath);
     fs.copyFileSync(changedFilePath, path.resolve(outputDir, file));
   }, ['**/*.{js,jsx,ts,tsx,d.ts,scss,less,css,sass}']);
 };
-
 export const copyStaticAssets = async (api, config) => {
   var _bundlelessOptions$so;
-
   const appContext = api.useAppContext();
   const modernConfig = api.useResolvedConfigContext();
   const {
@@ -73,7 +66,6 @@ export const copyStaticAssets = async (api, config) => {
     modernConfig,
     appContext
   });
-
   if (config.watch) {
     watchAssets(api, {
       targetDir: srcDir,

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

@@ -4,20 +4,16 @@ 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 后面的逻辑来处理
@@ -28,8 +24,8 @@ const resolveLog = (childProgress, {
       console.info(watchSectionTitle('[Bundleless:DTS]', SectionTitleStatus.Log));
       console.info(data.toString());
     }
-  }); // 正常以下内容都不会触发，因为tsc 不会产生以下类型的log信息，不过防止意外情况
-
+  });
+  // 正常以下内容都不会触发，因为tsc 不会产生以下类型的log信息，不过防止意外情况
   (_childProgress$stdout2 = childProgress.stdout) === null || _childProgress$stdout2 === void 0 ? void 0 : _childProgress$stdout2.on('error', error => {
     console.error(error.message);
   });
@@ -37,7 +33,6 @@ const resolveLog = (childProgress, {
     console.error(chunk.toString());
   });
 };
-
 const generatorDts = async (_, config) => {
   const {
     tsconfigPath,
@@ -54,9 +49,9 @@ const generatorDts = async (_, config) => {
   });
   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
+  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
@@ -64,7 +59,6 @@ const generatorDts = async (_, config) => {
   resolveLog(childProgress, {
     watch
   });
-
   try {
     await childProgress;
   } catch (e) {
@@ -74,10 +68,8 @@ const generatorDts = async (_, config) => {
       });
     }
   }
-
   fs.removeSync(willDeleteTsconfigPath);
 };
-
 export const genDts = async (api, config) => {
   const {
     outputPath,
@@ -88,11 +80,9 @@ export const genDts = async (api, config) => {
     },
     enableDts
   } = config;
-
   if (!enableDts) {
     return;
   }
-
   const {
     appDirectory
   } = api.useAppContext();
@@ -110,7 +100,7 @@ export const genDts = async (api, config) => {
     watch,
     sourceDir
   };
-  await generatorDts(modernConfig, option); // TODO: watch 模式下无法转换
-
+  await generatorDts(modernConfig, option);
+  // TODO: watch 模式下无法转换
   utils.resolveAlias(modernConfig, option);
 };

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

@@ -1,9 +1,6 @@
 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';
@@ -15,17 +12,16 @@ export const generatorTsConfig = (projectTsconfig, {
   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
+  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 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 = {
@@ -40,11 +36,9 @@ export const generatorTsConfig = (projectTsconfig, {
     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: {
@@ -53,7 +47,8 @@ export const generatorTsConfig = (projectTsconfig, {
   };
   const tempTsconfigPath = path.join(tempPath, `tsconfig.${Date.now()}.${nanoid()}.json`);
   fs.ensureFileSync(tempTsconfigPath);
-  fs.writeJSONSync(tempTsconfigPath, deepMerge(recommendOption, projectTsconfig, // 此处是必须要覆盖用户默认配置
+  fs.writeJSONSync(tempTsconfigPath, deepMerge(recommendOption, projectTsconfig,
+  // 此处是必须要覆盖用户默认配置
   resetConfig));
   return tempTsconfigPath;
 };
@@ -79,7 +74,6 @@ export const resolveAlias = (modernConfig, config, watchFilenames = []) => {
     baseUrl: path.join(config.appDirectory, output.path || 'dist'),
     paths: mergedPaths
   });
-
   for (const r of result) {
     fs.writeFileSync(r.path, r.content);
   }
@@ -89,16 +83,12 @@ export const getTscBinPath = appDirectory => {
     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

@@ -10,12 +10,10 @@ export const build = async (api, config, legacyOptions) => {
     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);