@modern-js/module-tools 1.3.1 → 1.4.1

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # @modern-js/module-tools
 
+## 1.4.1
+
+### Patch Changes
+
+- 02ff289d: Modify the type of error text and display log messages
+- 54786e58: add ts check
+- 6668a1bf: feat: upgrade @modern-js/codesmith-api-app version
+- fab92861: fix: @modern-js/core phantom dep
+- Updated dependencies [deeaa602]
+- Updated dependencies [54786e58]
+- Updated dependencies [6668a1bf]
+- Updated dependencies [6668a1bf]
+- Updated dependencies [fab92861]
+  - @modern-js/plugin-analyze@1.3.3
+  - @modern-js/utils@1.3.2
+  - @modern-js/core@1.4.3
+  - @modern-js/new-action@1.3.2
+  - @modern-js/plugin-changeset@1.2.2
+  - @modern-js/module-tools-hooks@1.2.2
+
+## 1.4.0
+
+### Minor Changes
+
+- 67503500: add alais subCmd
+
+### Patch Changes
+
+- Updated dependencies [118da5b4]
+- Updated dependencies [b376c8d6]
+- Updated dependencies [e62c4efd]
+- Updated dependencies [6891e4c2]
+- Updated dependencies [e2a8233f]
+  - @modern-js/css-config@1.2.2
+  - @modern-js/style-compiler@1.2.2
+  - @modern-js/core@1.4.2
+  - @modern-js/plugin-analyze@1.3.2
+
+## 1.3.2
+
+### Patch Changes
+
+- c78400c7: fix: remove stylus support
+- Updated dependencies [b7a9eeba]
+- Updated dependencies [53aca274]
+- Updated dependencies [78279953]
+- Updated dependencies [e116ace5]
+- Updated dependencies [4d72edea]
+  - @modern-js/plugin-analyze@1.3.1
+  - @modern-js/core@1.4.1
+  - @modern-js/utils@1.3.1
+
 ## 1.3.1
 
 ### Patch Changes

package/dist/js/modern/features/dev/index.js

@@ -41,7 +41,7 @@ export const devStorybook = async config => {
 };
 export const runSubCmd = async (subCmd, config) => {
   const metas = await core.mountHook().moduleToolsMenu(undefined);
-  const devMeta = metas.find(meta => meta.value === subCmd);
+  const devMeta = metas.find(meta => meta.value === subCmd || Array.isArray(meta.aliasValues) && meta.aliasValues.includes(subCmd));
 
   if (devMeta) {
     await devMeta.runTask(config);

package/dist/js/modern/schema/output.js

@@ -9,11 +9,6 @@ export const outputSchema = [{
   schema: {
     typeof: 'object'
   }
-}, {
-  target: 'output.disableTsChecker',
-  schema: {
-    typeof: 'boolean'
-  }
 }, {
   target: 'output.enableSourceMap',
   schema: {

package/dist/js/modern/tasks/generator-dts/index.js

@@ -0,0 +1,144 @@
+import * as path from 'path';
+import { Import, fs } from '@modern-js/utils';
+const core = Import.lazy('@modern-js/core', require);
+const execa = Import.lazy('execa', require);
+const JSON5 = Import.lazy('json5', require);
+const argv = Import.lazy('process.argv', require);
+const utils = Import.lazy('./utils', require);
+let removeTsconfigPath = '';
+
+const getProjectTsconfig = tsconfigPath => {
+  if (!tsconfigPath || !fs.existsSync(tsconfigPath)) {
+    return {};
+  }
+
+  return JSON5.parse(fs.readFileSync(tsconfigPath, 'utf-8'));
+};
+
+const resolveLog = (childProgress, {
+  tsCheck: _tsCheck = false,
+  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 (!_tsCheck) {
+      return;
+    }
+
+    if (_watch) {
+      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,
+    sourceDirName = 'src',
+    projectData: {
+      appDirectory
+    },
+    tsCheck = false,
+    watch = false
+  } = config;
+  const userTsconfig = getProjectTsconfig(tsconfigPath);
+  const willDeleteTsconfigPath = utils.generatorTsConfig(userTsconfig, {
+    appDirectory,
+    distDir,
+    sourceDir: sourceDirName
+  });
+  removeTsconfigPath = willDeleteTsconfigPath;
+  const tscBinFile = path.join(appDirectory, './node_modules/.bin/tsc');
+  const watchParams = watch ? ['-w'] : [];
+  const childProgress = execa(tscBinFile, ['-p', willDeleteTsconfigPath, ...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'`);
+    } else {
+      const isRecord = input => typeof input === 'object'; // 通过使用 execa，可以将tsc 的 data 类型的报错信息变为异常错误信息
+
+
+      if (isRecord(e)) {
+        console.error(e.stdout);
+      }
+    }
+  }
+
+  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
+    },
+    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;
+
+  if (process.env.CORE_INIT_OPTION_FILE) {
+    ({
+      options
+    } = require(process.env.CORE_INIT_OPTION_FILE));
+  }
+
+  const {
+    resolved
+  } = await core.cli.init([], options);
+  await core.manager.run(async () => {
+    try {
+      await taskMain({
+        modernConfig: resolved
+      });
+    } catch (e) {
+      console.error(e.message);
+      fs.removeSync(removeTsconfigPath);
+    }
+  });
+})();

package/dist/js/modern/tasks/generator-dts/utils.js

@@ -0,0 +1,82 @@
+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, fs } from '@modern-js/utils';
+const glob = Import.lazy('glob', require);
+const babel = Import.lazy('../../utils/babel', require);
+const tsPathsTransform = Import.lazy('../../utils/tspaths-transform', require);
+const constants = Import.lazy('../constants', require);
+const deepMerge = Import.lazy('lodash.merge', require);
+export const generatorTsConfig = (projectTsconfig, {
+  appDirectory,
+  distDir,
+  sourceDir: _sourceDir = 'src'
+}) => {
+  var _projectTsconfig$comp, _projectTsconfig$comp2, _projectTsconfig$incl, _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$incl = projectTsconfig.include) === null || _projectTsconfig$incl === void 0 ? void 0 : _projectTsconfig$incl.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
+  };
+  const recommendOption = {
+    // Ensure that Babel can safely transpile files in the TypeScript project
+    compilerOptions: {
+      isolatedModules: true
+    }
+  };
+  const tempTsconfigPath = path.join(tempPath, constants.tempTsconfigName);
+  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.projectData.appDirectory,
+    tsconfigPath: config.tsconfigPath || path.join(config.projectData.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'),
+    paths: mergedPaths
+  });
+
+  for (const r of result) {
+    fs.writeFileSync(r.path, r.content);
+  }
+};

package/dist/js/node/features/dev/index.js

@@ -61,7 +61,7 @@ exports.devStorybook = devStorybook;
 
 const runSubCmd = async (subCmd, config) => {
   const metas = await core.mountHook().moduleToolsMenu(undefined);
-  const devMeta = metas.find(meta => meta.value === subCmd);
+  const devMeta = metas.find(meta => meta.value === subCmd || Array.isArray(meta.aliasValues) && meta.aliasValues.includes(subCmd));
 
   if (devMeta) {
     await devMeta.runTask(config);

package/dist/js/node/schema/output.js

@@ -15,11 +15,6 @@ const outputSchema = [{
   schema: {
     typeof: 'object'
   }
-}, {
-  target: 'output.disableTsChecker',
-  schema: {
-    typeof: 'boolean'
-  }
 }, {
   target: 'output.enableSourceMap',
   schema: {

package/dist/js/node/tasks/generator-dts/index.js

@@ -0,0 +1,158 @@
+"use strict";
+
+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 core = _utils.Import.lazy('@modern-js/core', require);
+
+const execa = _utils.Import.lazy('execa', require);
+
+const JSON5 = _utils.Import.lazy('json5', require);
+
+const argv = _utils.Import.lazy('process.argv', require);
+
+const utils = _utils.Import.lazy('./utils', require);
+
+let removeTsconfigPath = '';
+
+const getProjectTsconfig = tsconfigPath => {
+  if (!tsconfigPath || !_utils.fs.existsSync(tsconfigPath)) {
+    return {};
+  }
+
+  return JSON5.parse(_utils.fs.readFileSync(tsconfigPath, 'utf-8'));
+};
+
+const resolveLog = (childProgress, {
+  tsCheck: _tsCheck = false,
+  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 (!_tsCheck) {
+      return;
+    }
+
+    if (_watch) {
+      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,
+    sourceDirName = 'src',
+    projectData: {
+      appDirectory
+    },
+    tsCheck = false,
+    watch = false
+  } = config;
+  const userTsconfig = getProjectTsconfig(tsconfigPath);
+  const willDeleteTsconfigPath = utils.generatorTsConfig(userTsconfig, {
+    appDirectory,
+    distDir,
+    sourceDir: sourceDirName
+  });
+  removeTsconfigPath = willDeleteTsconfigPath;
+  const tscBinFile = path.join(appDirectory, './node_modules/.bin/tsc');
+  const watchParams = watch ? ['-w'] : [];
+  const childProgress = execa(tscBinFile, ['-p', willDeleteTsconfigPath, ...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'`);
+    } else {
+      const isRecord = input => typeof input === 'object'; // 通过使用 execa，可以将tsc 的 data 类型的报错信息变为异常错误信息
+
+
+      if (isRecord(e)) {
+        console.error(e.stdout);
+      }
+    }
+  }
+
+  _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
+    },
+    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;
+
+  if (process.env.CORE_INIT_OPTION_FILE) {
+    ({
+      options
+    } = require(process.env.CORE_INIT_OPTION_FILE));
+  }
+
+  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);
+    }
+  });
+})();

package/dist/js/node/tasks/{generator-dts.js → generator-dts/utils.js}

@@ -1,8 +1,11 @@
 "use strict";
 
-var path = _interopRequireWildcard(require("path"));
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveAlias = exports.generatorTsConfig = void 0;
 
-var os = _interopRequireWildcard(require("os"));
+var path = _interopRequireWildcard(require("path"));
 
 var _utils = require("@modern-js/utils");
 
@@ -16,26 +19,16 @@ 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 tsPathsTransform = _utils.Import.lazy('../utils/tspaths-transform', require);
-
-const babel = _utils.Import.lazy('../utils/babel', require);
-
-const constants = _utils.Import.lazy('./constants', require);
-
-const core = _utils.Import.lazy('@modern-js/core', require);
+const glob = _utils.Import.lazy('glob', require);
 
-const execa = _utils.Import.lazy('execa', require);
+const babel = _utils.Import.lazy('../../utils/babel', require);
 
-const JSON5 = _utils.Import.lazy('json5', require);
+const tsPathsTransform = _utils.Import.lazy('../../utils/tspaths-transform', require);
 
-const argv = _utils.Import.lazy('process.argv', require);
+const constants = _utils.Import.lazy('../constants', require);
 
 const deepMerge = _utils.Import.lazy('lodash.merge', require);
 
-const glob = _utils.Import.lazy('glob', require);
-
-let removeTsconfigPath = '';
-
 const generatorTsConfig = (projectTsconfig, {
   appDirectory,
   distDir,
@@ -82,90 +75,7 @@ const generatorTsConfig = (projectTsconfig, {
   return tempTsconfigPath;
 };
 
-const getProjectTsconfig = tsconfigPath => {
-  if (!tsconfigPath || !_utils.fs.existsSync(tsconfigPath)) {
-    return {};
-  }
-
-  return JSON5.parse(_utils.fs.readFileSync(tsconfigPath, 'utf-8'));
-};
-
-const resolveLog = (childProgress, {
-  tsCheck: _tsCheck = false,
-  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 (!_tsCheck) {
-      return;
-    }
-
-    if (_watch) {
-      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,
-    sourceDirName = 'src',
-    projectData: {
-      appDirectory
-    },
-    tsCheck = false,
-    watch = false
-  } = config;
-  const userTsconfig = getProjectTsconfig(tsconfigPath);
-  const willDeleteTsconfigPath = generatorTsConfig(userTsconfig, {
-    appDirectory,
-    distDir,
-    sourceDir: sourceDirName
-  });
-  removeTsconfigPath = willDeleteTsconfigPath;
-  const tscBinFile = path.join(appDirectory, './node_modules/.bin/tsc');
-  const watchParams = watch ? ['-w'] : [];
-  const childProgress = execa(tscBinFile, ['-p', willDeleteTsconfigPath, ...watchParams], {
-    stdio: 'pipe',
-    cwd: appDirectory
-  });
-  resolveLog(childProgress, {
-    tsCheck,
-    watch
-  });
-
-  try {
-    await childProgress;
-    console.info('[Tsc Compiler]: Successfully');
-  } catch (e) {
-    if (!tsCheck) {
-      console.warn(`There are some type issues, which can be checked by configuring 'source.enableTsChecker = true' ${os.EOL} in modern.config.js`);
-    } else {
-      const isRecord = input => typeof input === 'object'; // 通过使用 execa，可以将tsc 的 data 类型的报错信息变为异常错误信息
-
-
-      if (isRecord(e)) {
-        console.error(e.stdout);
-      }
-    }
-  }
-
-  _utils.fs.removeSync(willDeleteTsconfigPath);
-};
+exports.generatorTsConfig = generatorTsConfig;
 
 const resolveAlias = (modernConfig, config, watchFilenames = []) => {
   const {
@@ -195,54 +105,4 @@ const resolveAlias = (modernConfig, config, watchFilenames = []) => {
   }
 };
 
-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
-    },
-    tsconfigPath: config.tsconfigPath,
-    watch: config.watch,
-    tsCheck: config.tsCheck,
-    sourceDirName: config.sourceDirName
-  };
-  await generatorDts(modernConfig, option); // TODO: watch 模式下无法转换
-
-  resolveAlias(modernConfig, option);
-};
-
-(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);
-  await core.manager.run(async () => {
-    try {
-      await taskMain({
-        modernConfig: resolved
-      });
-    } catch (e) {
-      console.error(e.message);
-
-      _utils.fs.removeSync(removeTsconfigPath);
-    }
-  });
-})();
+exports.resolveAlias = resolveAlias;

package/dist/types/index.d.ts

@@ -13,8 +13,10 @@ declare const _default: import("@modern-js/core").AsyncPlugin<Partial<import("@m
   watchFiles: import("@modern-js/core").ParallelWorkflow<void, unknown>;
   fileChange: import("@modern-js/core").AsyncWorkflow<{
     filename: string;
+    eventType: "add" | "unlink" | "change";
   }, void>;
   beforeExit: import("@modern-js/core").AsyncWorkflow<void, void>;
+  beforeRestart: import("@modern-js/core").AsyncWorkflow<void, void>;
 } & import("@modern-js/core").ClearDraftProgress<import("@modern-js/core").Hooks>>>>;
 
 export default _default;

package/dist/types/tasks/generator-dts/utils.d.ts

@@ -0,0 +1,23 @@
+import type { NormalizedConfig } from '@modern-js/core';
+import type { ITsconfig } from '../../types';
+export interface IGeneratorConfig {
+  sourceDirName?: string;
+  srcDir: string;
+  distDir: string;
+  projectData: {
+    appDirectory: string;
+  };
+  tsconfigPath?: string;
+  tsCheck?: boolean;
+  watch?: boolean;
+}
+export declare const generatorTsConfig: (projectTsconfig: ITsconfig, {
+  appDirectory,
+  distDir,
+  sourceDir
+}: {
+  appDirectory: string;
+  distDir: string;
+  sourceDir?: string | undefined;
+}) => string;
+export declare const resolveAlias: (modernConfig: NormalizedConfig, config: IGeneratorConfig, watchFilenames?: string[]) => void;

package/jest.config.js

@@ -1,5 +1,7 @@
 const sharedConfig = require('@scripts/jest-config');
 
+console.info(sharedConfig.coveragePathIgnorePatterns);
+
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
   // eslint-disable-next-line node/no-unsupported-features/es-syntax

package/lib/types.d.ts

@@ -70,11 +70,6 @@ declare module '*.less' {
   export default classes;
 }
 
-declare module '*.styl' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-
 declare module '*.sass' {
   const classes: { readonly [key: string]: string };
   export default classes;
@@ -95,11 +90,6 @@ declare module '*.module.less' {
   export default classes;
 }
 
-declare module '*.module.styl' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-
 declare module '*.module.sass' {
   const classes: { readonly [key: string]: string };
   export default classes;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.1",
+  "version": "1.4.1",
   "bin": {
     "modern": "./bin/modern.js"
   },
@@ -53,17 +53,16 @@
     "@babel/types": "^7.15.0",
     "@modern-js/babel-compiler": "^1.2.1",
     "@modern-js/babel-preset-module": "^1.3.1",
-    "@modern-js/core": "^1.3.2",
-    "@modern-js/css-config": "^1.2.1",
+    "@modern-js/css-config": "^1.2.2",
     "@modern-js/i18n-cli-language-detector": "^1.2.1",
-    "@modern-js/module-tools-hooks": "^1.2.1",
-    "@modern-js/new-action": "^1.3.1",
-    "@modern-js/plugin-analyze": "^1.2.1",
-    "@modern-js/plugin-changeset": "^1.2.1",
+    "@modern-js/module-tools-hooks": "^1.2.2",
+    "@modern-js/new-action": "^1.3.2",
+    "@modern-js/plugin-analyze": "^1.3.3",
+    "@modern-js/plugin-changeset": "^1.2.2",
     "@modern-js/plugin-fast-refresh": "^1.2.1",
     "@modern-js/plugin-i18n": "^1.2.1",
-    "@modern-js/style-compiler": "^1.2.1",
-    "@modern-js/utils": "^1.2.2",
+    "@modern-js/style-compiler": "^1.2.2",
+    "@modern-js/utils": "^1.3.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
     "dotenv": "^10.0.0",
@@ -80,7 +79,11 @@
     "signale": "^1.4.0",
     "tsconfig-paths": "^3.10.1"
   },
+  "peerDependencies": {
+    "@modern-js/core": "^1.4.3"
+  },
   "devDependencies": {
+    "@modern-js/core": "^1.4.3",
     "@babel/preset-typescript": "^7.15.0",
     "@modern-js/babel-chain": "^1.2.1",
     "@types/babel__core": "^7.1.15",
@@ -107,8 +110,7 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",

package/tests/dev-feature.test.ts

@@ -12,7 +12,7 @@ jest.mock('@modern-js/core', () => ({
 
 describe('dev feature with subCmd', () => {
   beforeEach(() => {
-    console.info('asdas');
+    jest.clearAllMocks();
   });
   it('should run task with "storybook" params when storybook plugin exist', async () => {
     mockModuleToolsMenu.mockReturnValue([
@@ -27,4 +27,20 @@ describe('dev feature with subCmd', () => {
     await runSubCmd('storybook', { isTsProject: true, appDirectory: '' });
     expect(exit).toHaveBeenCalled();
   });
+
+  it('should run task with alias name "story" params when storybook plugin exist', async () => {
+    mockModuleToolsMenu.mockReturnValue([
+      { value: 'storybook', aliasValues: ['story'], runTask: mockDevMeta },
+    ]);
+    await runSubCmd('story', { isTsProject: true, appDirectory: '' });
+    expect(mockDevMeta.mock.calls.length).toBe(1);
+  });
+
+  it('should run task with alias name "story1" params when storybook plugin exist', async () => {
+    mockModuleToolsMenu.mockReturnValue([
+      { value: 'storybook', aliasValues: ['story'], runTask: mockDevMeta },
+    ]);
+    await runSubCmd('story1', { isTsProject: true, appDirectory: '' });
+    expect(mockDevMeta.mock.calls.length).toBe(0);
+  });
 });

package/tests/generator-dts-utils.test.ts

@@ -0,0 +1,10 @@
+import * as path from 'path';
+import { generatorTsConfig } from '../src/tasks/generator-dts/utils';
+
+describe('test generator dts utils', () => {
+  it('test generatorTsConfig', () => {
+    const appDir = path.join(__dirname, './fixtures/tsconfig');
+    const ret = generatorTsConfig({}, { appDirectory: appDir, distDir: '' });
+    expect(ret).toContain('tsconfig.temp.json');
+  });
+});

package/tests/generator-dts.test.ts

@@ -0,0 +1,48 @@
+jest.mock('@modern-js/core', () => ({
+  manager: {
+    run: async (fn: any) => {
+      await fn();
+    },
+  },
+  cli: {
+    init: () => ({}),
+  },
+}));
+jest.mock('process.argv', () => () => (o: any) => ({ ...o, tsCheck: false }));
+jest.mock('execa', () => () => {
+  // eslint-disable-next-line prefer-promise-reject-errors
+  const fn = Promise.reject('error');
+  (fn as any).stdout = {
+    on: () => 0,
+  };
+  (fn as any).stderr = {
+    on: () => 0,
+  };
+  return fn;
+});
+jest.mock('../src/tasks/generator-dts/utils');
+jest.mock('@modern-js/utils', () => {
+  const originalModule = jest.requireActual('@modern-js/utils');
+  return {
+    __esModule: true, // Use it when dealing with esModules
+    ...originalModule,
+    fs: {
+      ...originalModule.fs,
+      removeSync: jest.fn(),
+    },
+  };
+});
+process.argv = [];
+
+describe('generator dts test', () => {
+  it('test tsCheck is true', () => {
+    console.info = jest.fn(str => {
+      expect(str).toBe(
+        "There are some type warnings, which can be checked by configuring 'output.disableTsChecker = false'",
+      );
+    });
+    require('../src/tasks/generator-dts');
+  });
+});
+
+export {};

package/dist/js/modern/tasks/generator-dts.js

@@ -1,226 +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 * as os from 'os';
-import { Import, fs } from '@modern-js/utils';
-const tsPathsTransform = Import.lazy('../utils/tspaths-transform', require);
-const babel = Import.lazy('../utils/babel', require);
-const constants = Import.lazy('./constants', require);
-const core = Import.lazy('@modern-js/core', require);
-const execa = Import.lazy('execa', require);
-const JSON5 = Import.lazy('json5', require);
-const argv = Import.lazy('process.argv', require);
-const deepMerge = Import.lazy('lodash.merge', require);
-const glob = Import.lazy('glob', require);
-let removeTsconfigPath = '';
-
-const generatorTsConfig = (projectTsconfig, {
-  appDirectory,
-  distDir,
-  sourceDir: _sourceDir = 'src'
-}) => {
-  var _projectTsconfig$comp, _projectTsconfig$comp2, _projectTsconfig$incl, _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$incl = projectTsconfig.include) === null || _projectTsconfig$incl === void 0 ? void 0 : _projectTsconfig$incl.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
-  };
-  const recommendOption = {
-    // Ensure that Babel can safely transpile files in the TypeScript project
-    compilerOptions: {
-      isolatedModules: true
-    }
-  };
-  const tempTsconfigPath = path.join(tempPath, constants.tempTsconfigName);
-  fs.ensureFileSync(tempTsconfigPath);
-  fs.writeJSONSync(tempTsconfigPath, deepMerge(recommendOption, projectTsconfig, // 此处是必须要覆盖用户默认配置
-  resetConfig));
-  return tempTsconfigPath;
-};
-
-const getProjectTsconfig = tsconfigPath => {
-  if (!tsconfigPath || !fs.existsSync(tsconfigPath)) {
-    return {};
-  }
-
-  return JSON5.parse(fs.readFileSync(tsconfigPath, 'utf-8'));
-};
-
-const resolveLog = (childProgress, {
-  tsCheck: _tsCheck = false,
-  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 (!_tsCheck) {
-      return;
-    }
-
-    if (_watch) {
-      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,
-    sourceDirName = 'src',
-    projectData: {
-      appDirectory
-    },
-    tsCheck = false,
-    watch = false
-  } = config;
-  const userTsconfig = getProjectTsconfig(tsconfigPath);
-  const willDeleteTsconfigPath = generatorTsConfig(userTsconfig, {
-    appDirectory,
-    distDir,
-    sourceDir: sourceDirName
-  });
-  removeTsconfigPath = willDeleteTsconfigPath;
-  const tscBinFile = path.join(appDirectory, './node_modules/.bin/tsc');
-  const watchParams = watch ? ['-w'] : [];
-  const childProgress = execa(tscBinFile, ['-p', willDeleteTsconfigPath, ...watchParams], {
-    stdio: 'pipe',
-    cwd: appDirectory
-  });
-  resolveLog(childProgress, {
-    tsCheck,
-    watch
-  });
-
-  try {
-    await childProgress;
-    console.info('[Tsc Compiler]: Successfully');
-  } catch (e) {
-    if (!tsCheck) {
-      console.warn(`There are some type issues, which can be checked by configuring 'source.enableTsChecker = true' ${os.EOL} in modern.config.js`);
-    } else {
-      const isRecord = input => typeof input === 'object'; // 通过使用 execa，可以将tsc 的 data 类型的报错信息变为异常错误信息
-
-
-      if (isRecord(e)) {
-        console.error(e.stdout);
-      }
-    }
-  }
-
-  fs.removeSync(willDeleteTsconfigPath);
-};
-
-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.projectData.appDirectory,
-    tsconfigPath: config.tsconfigPath || path.join(config.projectData.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'),
-    paths: mergedPaths
-  });
-
-  for (const r of result) {
-    fs.writeFileSync(r.path, r.content);
-  }
-};
-
-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
-    },
-    tsconfigPath: config.tsconfigPath,
-    watch: config.watch,
-    tsCheck: config.tsCheck,
-    sourceDirName: config.sourceDirName
-  };
-  await generatorDts(modernConfig, option); // TODO: watch 模式下无法转换
-
-  resolveAlias(modernConfig, option);
-};
-
-(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);
-  await core.manager.run(async () => {
-    try {
-      await taskMain({
-        modernConfig: resolved
-      });
-    } catch (e) {
-      console.error(e.message);
-      fs.removeSync(removeTsconfigPath);
-    }
-  });
-})();