@modern-js/module-tools 2.33.1 → 2.35.0

package/dist/builder/dts/tsc.js

@@ -2,18 +2,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-function _export(target, all) {
-  for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  getProjectTsconfig: function() {
-    return getProjectTsconfig;
-  },
-  runTsc: function() {
+Object.defineProperty(exports, "runTsc", {
+  enumerable: true,
+  get: function() {
     return runTsc;
   }
 });
@@ -23,12 +14,6 @@ const _dts = require("../../utils/dts");
 const _log = require("../../utils/log");
 const _log1 = require("../../constants/log");
 const _dts1 = require("../../constants/dts");
-const getProjectTsconfig = async (tsconfigPath) => {
-  if (!_utils.fs.existsSync(tsconfigPath)) {
-    return {};
-  }
-  return _utils.json5.parse(_utils.fs.readFileSync(tsconfigPath, "utf-8"));
-};
 const resolveLog = async (childProgress, options) => {
   var _childProgress_stdout, _childProgress_stdout1, _childProgress_stderr;
   const { watch = false, watchFn = async () => void 0 } = options;
@@ -49,9 +34,8 @@ const resolveLog = async (childProgress, options) => {
   });
 };
 const generatorDts = async (api, config) => {
-  const { tsconfigPath, appDirectory, watch = false, abortOnError = true } = config;
-  const userTsconfig = await getProjectTsconfig(tsconfigPath);
-  const result = await (0, _dts.generatorTsConfig)(config);
+  const { appDirectory, watch = false, abortOnError = true } = config;
+  const { userTsconfig, generatedTsconfig: result } = await (0, _dts.generatorTsConfig)(config);
   const tscBinFile = await (0, _dts.getTscBinPath)(appDirectory);
   const watchParams = watch ? [
     "-w"

package/dist/builder/dts/tsc.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;;;;;;;;;EAsBaA,oBAAkB;WAAlBA;;EA+FAC,QAAM;WAANA;;;uBApH4B;uBACb;qBAYrB;qBAC2B;sBAI3B;sBACuB;AAEvB,MAAMD,qBAAqB,OAChCE;AAEA,MAAI,CAACC,UAAGC,WAAWF,eAAe;AAChC,WAAO,CAAC;EACV;AAEA,SAAOG,aAAMC,MAAMH,UAAGI,aAAaL,cAAc;AACnD;AAEA,MAAMM,aAAa,OACjBC,eACAC;MAYAD,uBAYAA,wBAGAA;AAtBA,QAAM,EAAEE,QAAQ,OAAOC,UAAU,YAAYC,OAAS,IAAKH;GAO3DD,sCAAcK,YAAM,QAApBL,kEAAsBM,GAAG,QAAQ,OAAMC;AACrC,QAAIL,OAAO;AACTM,oBAAOC,KACL,OAAMC,2BAAkBC,8BAAwBC,yBAAmBC,GAAG;AAExEL,oBAAOC,KAAKF,KAAKO,SAAQ;AACzB,UAAIP,KAAKO,SAAQ,EAAGC,SAASC,mBAAa,GAAG;AAC3C,cAAMb;MACR;IACF;EACF;GAEAH,uCAAcK,YAAM,QAApBL,oEAAsBM,GAAG,SAASW;AAChCT,kBAAOS,MAAMA,MAAMC,OAAO;EAC5B;GACAlB,sCAAcmB,YAAM,QAApBnB,kEAAsBM,GAAG,QAAQc;AAC/BZ,kBAAOS,MAAMG,MAAMN,SAAQ;EAC7B;AACF;AAEA,MAAMO,eAAe,OACnBC,KACAC;AAEA,QAAM,EACJ9B,cACA+B,cACAtB,QAAQ,OACRuB,eAAe,KAAI,IACjBF;AACJ,QAAMG,eAAe,MAAMnC,mBAAmBE;AAC9C,QAAMkC,SAAS,OAAMC,2BAAkBL;AAEvC,QAAMM,aAAa,OAAMC,uBAAcN;AAEvC,QAAMO,cAAc7B,QAAQ;IAAC;MAAQ;AACrC,QAAMF,iBAAgBgC,iBACpBH,YACA;IACE;IACAF,OAAOM;;IAEP;;IAEA;OACGF;KAEL;IACEG,OAAO;IACPC,KAAKX;EACP;AAGF,QAAMY,SAASd,IAAIe,eAAc;AACjCtC,aAAWC,eAAe;IACxBE;IACAC,SAAS;AACP,aAAMmC,sBAAaf,QAAQ;QAAE,GAAGI;QAAQD;MAAa;AACrDU,aAAOG,cAAc;QAAEC,WAAW;MAAa;IACjD;EACF;AAEA,MAAI;AACF,UAAMxC;EACR,SAASyC,GAAP;AACA,WAAMC,+BAAsBD,GAAG;MAAEhB;MAAce,WAAW;IAAa;EACzE;AAEA,SAAO;IAAE,GAAGb;IAAQD;EAAa;AACnC;AAEO,MAAMlC,SAAS,OACpB8B,KACAC;AAEA,QAAMI,SAAS,MAAMN,aAAaC,KAAKC;AACvC,SAAMe,sBAAaf,QAAQI;AAC3B,SAAMgB,uBAAYpB,OAAOqB,aAAarB,OAAOC,YAAY;AAC3D;","names":["getProjectTsconfig","runTsc","tsconfigPath","fs","existsSync","json5","parse","readFileSync","resolveLog","childProgress","options","watch","watchFn","undefined","stdout","on","data","logger","info","watchSectionTitle","BundlelessDtsLogPrefix","SectionTitleStatus","Log","toString","includes","watchDoneText","error","message","stderr","chunk","generatorDts","api","config","appDirectory","abortOnError","userTsconfig","result","generatorTsConfig","tscBinFile","getTscBinPath","watchParams","execa","tempTsconfigPath","stdio","cwd","runner","useHookRunners","resolveAlias","buildWatchDts","buildType","e","printOrThrowDtsErrors","addDtsFiles","distAbsPath"],"sources":["../../../src/builder/dts/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/builder/dts/tsc.ts"],"sourcesContent":["import type { ChildProcess } from 'child_process';\nimport { execa, fs, json5, logger } from '@modern-js/utils';\nimport { addDtsFiles } from '../../utils/print';\nimport type {\n  BundlelessGeneratorDtsConfig,\n  ITsconfig,\n  PluginAPI,\n  ModuleTools,\n} from '../../types';\nimport {\n  generatorTsConfig,\n  getTscBinPath,\n  printOrThrowDtsErrors,\n  resolveAlias,\n} from '../../utils/dts';\nimport { watchSectionTitle } from '../../utils/log';\nimport {\n  BundlelessDtsLogPrefix,\n  SectionTitleStatus,\n} from '../../constants/log';\nimport { watchDoneText } from '../../constants/dts';\n\nexport const getProjectTsconfig = async (\n  tsconfigPath: string,\n): Promise<ITsconfig> => {\n  if (!fs.existsSync(tsconfigPath)) {\n    return {};\n  }\n\n  return json5.parse(fs.readFileSync(tsconfigPath, 'utf-8'));\n};\n\nconst resolveLog = async (\n  childProgress: ChildProcess,\n  options: {\n    watch: boolean;\n    watchFn: () => Promise<void>;\n  },\n) => {\n  const { watch = false, watchFn = async () => undefined } = options;\n\n  /**\n   * tsc 所有的log信息都是从stdout data 事件中获取\n   * 正常模式下，如果有报错信息，交给 resolveLog 后面的逻辑来处理\n   * watch 模式下，则使用这里的信息\n   */\n  childProgress.stdout?.on('data', async data => {\n    if (watch) {\n      logger.info(\n        await watchSectionTitle(BundlelessDtsLogPrefix, SectionTitleStatus.Log),\n      );\n      logger.info(data.toString());\n      if (data.toString().includes(watchDoneText)) {\n        await watchFn();\n      }\n    }\n  });\n  // 正常以下内容都不会触发，因为tsc 不会产生以下类型的log信息，不过防止意外情况\n  childProgress.stdout?.on('error', error => {\n    logger.error(error.message);\n  });\n  childProgress.stderr?.on('data', chunk => {\n    logger.error(chunk.toString());\n  });\n};\n\nconst generatorDts = async (\n  api: PluginAPI<ModuleTools>,\n  config: BundlelessGeneratorDtsConfig,\n) => {\n  const {\n    tsconfigPath,\n    appDirectory,\n    watch = false,\n    abortOnError = true,\n  } = config;\n  const userTsconfig = await getProjectTsconfig(tsconfigPath);\n  const result = await generatorTsConfig(config);\n\n  const tscBinFile = await getTscBinPath(appDirectory);\n\n  const watchParams = watch ? ['-w'] : [];\n  const childProgress = execa(\n    tscBinFile,\n    [\n      '-p',\n      result.tempTsconfigPath,\n      /* Required parameter, use it stdout have color */\n      '--pretty',\n      // https://github.com/microsoft/TypeScript/issues/21824\n      '--preserveWatchOutput',\n      ...watchParams,\n    ],\n    {\n      stdio: 'pipe',\n      cwd: appDirectory,\n    },\n  );\n\n  const runner = api.useHookRunners();\n  resolveLog(childProgress, {\n    watch,\n    watchFn: async () => {\n      await resolveAlias(config, { ...result, userTsconfig });\n      runner.buildWatchDts({ buildType: 'bundleless' });\n    },\n  });\n\n  try {\n    await childProgress;\n  } catch (e) {\n    await printOrThrowDtsErrors(e, { abortOnError, buildType: 'bundleless' });\n  }\n\n  return { ...result, userTsconfig };\n};\n\nexport const runTsc = async (\n  api: PluginAPI<ModuleTools>,\n  config: BundlelessGeneratorDtsConfig,\n) => {\n  const result = await generatorDts(api, config);\n  await resolveAlias(config, result);\n  await addDtsFiles(config.distAbsPath, config.appDirectory);\n};\n"]}
+{"version":3,"file":null,"mappings":";;;;+BAuGaA;;;WAAAA;;;uBAtGiB;uBACF;qBAWrB;qBAC2B;sBAI3B;sBACuB;AAE9B,MAAMC,aAAa,OACjBC,eACAC;MAYAD,uBAYAA,wBAGAA;AAtBA,QAAM,EAAEE,QAAQ,OAAOC,UAAU,YAAYC,OAAS,IAAKH;GAO3DD,sCAAcK,YAAM,QAApBL,kEAAsBM,GAAG,QAAQ,OAAMC;AACrC,QAAIL,OAAO;AACTM,oBAAOC,KACL,OAAMC,2BAAkBC,8BAAwBC,yBAAmBC,GAAG;AAExEL,oBAAOC,KAAKF,KAAKO,SAAQ;AACzB,UAAIP,KAAKO,SAAQ,EAAGC,SAASC,mBAAa,GAAG;AAC3C,cAAMb;MACR;IACF;EACF;GAEAH,uCAAcK,YAAM,QAApBL,oEAAsBM,GAAG,SAASW;AAChCT,kBAAOS,MAAMA,MAAMC,OAAO;EAC5B;GACAlB,sCAAcmB,YAAM,QAApBnB,kEAAsBM,GAAG,QAAQc;AAC/BZ,kBAAOS,MAAMG,MAAMN,SAAQ;EAC7B;AACF;AAEA,MAAMO,eAAe,OACnBC,KACAC;AAEA,QAAM,EAAEC,cAActB,QAAQ,OAAOuB,eAAe,KAAI,IAAKF;AAE7D,QAAM,EAAEG,cAAcC,mBAAmBC,OAAM,IAAK,OAAMC,2BACxDN;AAGF,QAAMO,aAAa,OAAMC,uBAAcP;AAEvC,QAAMQ,cAAc9B,QAAQ;IAAC;MAAQ;AACrC,QAAMF,iBAAgBiC,iBACpBH,YACA;IACE;IACAF,OAAOM;;IAEP;;IAEA;OACGF;KAEL;IACEG,OAAO;IACPC,KAAKZ;EACP;AAGF,QAAMa,SAASf,IAAIgB,eAAc;AACjCvC,aAAWC,eAAe;IACxBE;IACAC,SAAS;AACP,aAAMoC,sBAAahB,QAAQ;QAAE,GAAGK;QAAQF;MAAa;AACrDW,aAAOG,cAAc;QAAEC,WAAW;MAAa;IACjD;EACF;AAEA,MAAI;AACF,UAAMzC;EACR,SAAS0C,GAAP;AACA,WAAMC,+BAAsBD,GAAG;MAAEjB;MAAcgB,WAAW;IAAa;EACzE;AAEA,SAAO;IAAE,GAAGb;IAAQF;EAAa;AACnC;AAEO,MAAM5B,SAAS,OACpBwB,KACAC;AAEA,QAAMK,SAAS,MAAMP,aAAaC,KAAKC;AACvC,SAAMgB,sBAAahB,QAAQK;AAC3B,SAAMgB,uBAAYrB,OAAOsB,aAAatB,OAAOC,YAAY;AAC3D;","names":["runTsc","resolveLog","childProgress","options","watch","watchFn","undefined","stdout","on","data","logger","info","watchSectionTitle","BundlelessDtsLogPrefix","SectionTitleStatus","Log","toString","includes","watchDoneText","error","message","stderr","chunk","generatorDts","api","config","appDirectory","abortOnError","userTsconfig","generatedTsconfig","result","generatorTsConfig","tscBinFile","getTscBinPath","watchParams","execa","tempTsconfigPath","stdio","cwd","runner","useHookRunners","resolveAlias","buildWatchDts","buildType","e","printOrThrowDtsErrors","addDtsFiles","distAbsPath"],"sources":["../../../src/builder/dts/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/builder/dts/tsc.ts"],"sourcesContent":["import type { ChildProcess } from 'child_process';\nimport { execa, logger } from '@modern-js/utils';\nimport { addDtsFiles } from '../../utils/print';\nimport type {\n  BundlelessGeneratorDtsConfig,\n  PluginAPI,\n  ModuleTools,\n} from '../../types';\nimport {\n  generatorTsConfig,\n  getTscBinPath,\n  printOrThrowDtsErrors,\n  resolveAlias,\n} from '../../utils/dts';\nimport { watchSectionTitle } from '../../utils/log';\nimport {\n  BundlelessDtsLogPrefix,\n  SectionTitleStatus,\n} from '../../constants/log';\nimport { watchDoneText } from '../../constants/dts';\n\nconst resolveLog = async (\n  childProgress: ChildProcess,\n  options: {\n    watch: boolean;\n    watchFn: () => Promise<void>;\n  },\n) => {\n  const { watch = false, watchFn = async () => undefined } = options;\n\n  /**\n   * tsc 所有的log信息都是从stdout data 事件中获取\n   * 正常模式下，如果有报错信息，交给 resolveLog 后面的逻辑来处理\n   * watch 模式下，则使用这里的信息\n   */\n  childProgress.stdout?.on('data', async data => {\n    if (watch) {\n      logger.info(\n        await watchSectionTitle(BundlelessDtsLogPrefix, SectionTitleStatus.Log),\n      );\n      logger.info(data.toString());\n      if (data.toString().includes(watchDoneText)) {\n        await watchFn();\n      }\n    }\n  });\n  // 正常以下内容都不会触发，因为tsc 不会产生以下类型的log信息，不过防止意外情况\n  childProgress.stdout?.on('error', error => {\n    logger.error(error.message);\n  });\n  childProgress.stderr?.on('data', chunk => {\n    logger.error(chunk.toString());\n  });\n};\n\nconst generatorDts = async (\n  api: PluginAPI<ModuleTools>,\n  config: BundlelessGeneratorDtsConfig,\n) => {\n  const { appDirectory, watch = false, abortOnError = true } = config;\n\n  const { userTsconfig, generatedTsconfig: result } = await generatorTsConfig(\n    config,\n  );\n\n  const tscBinFile = await getTscBinPath(appDirectory);\n\n  const watchParams = watch ? ['-w'] : [];\n  const childProgress = execa(\n    tscBinFile,\n    [\n      '-p',\n      result.tempTsconfigPath,\n      /* Required parameter, use it stdout have color */\n      '--pretty',\n      // https://github.com/microsoft/TypeScript/issues/21824\n      '--preserveWatchOutput',\n      ...watchParams,\n    ],\n    {\n      stdio: 'pipe',\n      cwd: appDirectory,\n    },\n  );\n\n  const runner = api.useHookRunners();\n  resolveLog(childProgress, {\n    watch,\n    watchFn: async () => {\n      await resolveAlias(config, { ...result, userTsconfig });\n      runner.buildWatchDts({ buildType: 'bundleless' });\n    },\n  });\n\n  try {\n    await childProgress;\n  } catch (e) {\n    await printOrThrowDtsErrors(e, { abortOnError, buildType: 'bundleless' });\n  }\n\n  return { ...result, userTsconfig };\n};\n\nexport const runTsc = async (\n  api: PluginAPI<ModuleTools>,\n  config: BundlelessGeneratorDtsConfig,\n) => {\n  const result = await generatorDts(api, config);\n  await resolveAlias(config, result);\n  await addDtsFiles(config.distAbsPath, config.appDirectory);\n};\n"]}

package/dist/plugins.js

@@ -24,6 +24,8 @@ const getPlugins = (runningCmd) => {
     case "change":
     case "release":
     case "bump":
+    case "pre":
+    case "gen-release-note":
       plugins = [
         (0, _pluginchangeset.changesetPlugin)()
       ];

package/dist/plugins.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;+BAIaA;;;WAAAA;;;iCAHmB;4BACL;AAEpB,MAAMA,aAAa,CAACC;AACzB,MAAIC,UAAuB;AAE3B,UAAQD;IACN,KAAK;AACHC,gBAAU;AACV;IACF,KAAK;AACHA,gBAAU;SAACC,2BAAU;;AACrB;IACF,KAAK;IACL,KAAK;IACL,KAAK;AACHD,gBAAU;SAACE,qCAAe;;AAC1B;IACF;AACEF,gBAAU;EACd;AAEA,SAAOA;AACT;","names":["getPlugins","runningCmd","plugins","lintPlugin","changesetPlugin"],"sources":["../src/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/plugins.ts"],"sourcesContent":["import type { CliPlugin } from '@modern-js/core';\nimport { changesetPlugin } from '@modern-js/plugin-changeset';\nimport { lintPlugin } from '@modern-js/plugin-lint';\n\nexport const getPlugins = (runningCmd: string) => {\n  let plugins: CliPlugin[] = [];\n\n  switch (runningCmd) {\n    case 'build':\n      plugins = [];\n      break;\n    case 'lint':\n      plugins = [lintPlugin()];\n      break;\n    case 'change':\n    case 'release':\n    case 'bump':\n      plugins = [changesetPlugin()];\n      break;\n    default:\n      plugins = [];\n  }\n\n  return plugins;\n};\n"]}
+{"version":3,"file":null,"mappings":";;;;+BAIaA;;;WAAAA;;;iCAHmB;4BACL;AAEpB,MAAMA,aAAa,CAACC;AACzB,MAAIC,UAAuB;AAE3B,UAAQD;IACN,KAAK;AACHC,gBAAU;AACV;IACF,KAAK;AACHA,gBAAU;SAACC,2BAAU;;AACrB;IACF,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;AACHD,gBAAU;SAACE,qCAAe;;AAC1B;IACF;AACEF,gBAAU;EACd;AAEA,SAAOA;AACT;","names":["getPlugins","runningCmd","plugins","lintPlugin","changesetPlugin"],"sources":["../src/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/plugins.ts"],"sourcesContent":["import type { CliPlugin } from '@modern-js/core';\nimport { changesetPlugin } from '@modern-js/plugin-changeset';\nimport { lintPlugin } from '@modern-js/plugin-lint';\n\nexport const getPlugins = (runningCmd: string) => {\n  let plugins: CliPlugin[] = [];\n\n  switch (runningCmd) {\n    case 'build':\n      plugins = [];\n      break;\n    case 'lint':\n      plugins = [lintPlugin()];\n      break;\n    case 'change':\n    case 'release':\n    case 'bump':\n    case 'pre':\n    case 'gen-release-note':\n      plugins = [changesetPlugin()];\n      break;\n    default:\n      plugins = [];\n  }\n\n  return plugins;\n};\n"]}

package/dist/types/dts.d.ts

@@ -27,4 +27,7 @@ export interface ITsconfig {
   include?: string[];
   exclude?: string[];
   extends?: string;
+  references?: {
+    path?: string;
+  }[];
 }

package/dist/utils/dts.d.ts

@@ -1,8 +1,12 @@
 import type { ITsconfig, BundlelessGeneratorDtsConfig, BuildType, TsTarget } from '../types';
+export declare const getProjectTsconfig: (tsconfigPath: string) => Promise<ITsconfig>;
 export declare const generatorTsConfig: (config: BundlelessGeneratorDtsConfig) => Promise<{
-  tempTsconfigPath: string;
-  tempDistAbsRootPath: string;
-  tempDistAbsSrcPath: string;
+  userTsconfig: ITsconfig;
+  generatedTsconfig: {
+    tempTsconfigPath: string;
+    tempDistAbsRootPath: string;
+    tempDistAbsSrcPath: string;
+  };
 }>;
 export declare const getTscBinPath: (appDirectory: string) => Promise<string>;
 export declare const resolveAlias: (config: BundlelessGeneratorDtsConfig, options: {

package/dist/utils/dts.js

@@ -10,6 +10,9 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+  getProjectTsconfig: function() {
+    return getProjectTsconfig;
+  },
   generatorTsConfig: function() {
     return generatorTsConfig;
   },
@@ -26,18 +29,36 @@ _export(exports, {
     return tsTargetAtOrAboveES2022;
   }
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+const _path = require("path");
 const _utils = require("@modern-js/utils");
+const getProjectTsconfig = async (tsconfigPath) => {
+  if (!_utils.fs.existsSync(tsconfigPath)) {
+    return {};
+  }
+  return _utils.json5.parse(_utils.fs.readFileSync(tsconfigPath, "utf-8"));
+};
 const generatorTsConfig = async (config) => {
-  const { dtsTempDirectory } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("../constants/dts")));
+  var _userTsconfig_references, _userTsconfig;
   const { appDirectory, sourceDir: absSourceDir, tsconfigPath } = config;
-  const tempDistAbsRootPath = _path.default.join(appDirectory, `${dtsTempDirectory}/${(0, _utils.nanoid)()}`);
-  const tempDistAbsOurDir = _path.default.join(tempDistAbsRootPath, _path.default.relative(appDirectory, absSourceDir));
-  const tempTsconfigPath = _path.default.join(tempDistAbsRootPath, _path.default.basename(tsconfigPath));
+  const userTsconfig = await getProjectTsconfig(tsconfigPath);
+  const { dtsTempDirectory } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("../constants/dts")));
+  const tempDistAbsRootPath = (0, _path.join)(appDirectory, `${dtsTempDirectory}/${(0, _utils.nanoid)()}`);
+  const tempDistAbsOurDir = (0, _path.join)(tempDistAbsRootPath, (0, _path.relative)(appDirectory, absSourceDir));
+  const tempTsconfigPath = (0, _path.join)(tempDistAbsRootPath, (0, _path.basename)(tsconfigPath));
   _utils.fs.ensureFileSync(tempTsconfigPath);
-  const extendsPath = _path.default.join(_path.default.relative(_path.default.dirname(tempTsconfigPath), _path.default.dirname(tsconfigPath)), _path.default.basename(tempTsconfigPath));
+  const extendsPath = (0, _path.join)((0, _path.relative)((0, _path.dirname)(tempTsconfigPath), (0, _path.dirname)(tsconfigPath)), (0, _path.basename)(tempTsconfigPath));
+  const references = (_userTsconfig = userTsconfig) === null || _userTsconfig === void 0 ? void 0 : (_userTsconfig_references = _userTsconfig.references) === null || _userTsconfig_references === void 0 ? void 0 : _userTsconfig_references.map((reference) => {
+    const { path } = reference;
+    if (path) {
+      const userTsconfigDir = (0, _path.dirname)(tsconfigPath);
+      const generatedTsconfigDir = (0, _path.dirname)(tempTsconfigPath);
+      return {
+        path: (0, _path.isAbsolute)(path) ? path : (0, _path.relative)(generatedTsconfigDir, (0, _path.resolve)(userTsconfigDir, path))
+      };
+    }
+    return reference;
+  });
   const resetConfig = {
     extends: extendsPath,
     compilerOptions: {
@@ -50,19 +71,23 @@ const generatorTsConfig = async (config) => {
       // - ./types/index.d.ts
       // we only want to emit declarations
       declarationDir: tempDistAbsOurDir
-    }
+    },
+    references
   };
   _utils.fs.writeJSONSync(tempTsconfigPath, resetConfig);
   return {
-    tempTsconfigPath,
-    tempDistAbsRootPath,
-    tempDistAbsSrcPath: tempDistAbsOurDir
+    userTsconfig,
+    generatedTsconfig: {
+      tempTsconfigPath,
+      tempDistAbsRootPath,
+      tempDistAbsSrcPath: tempDistAbsOurDir
+    }
   };
 };
 const getTscBinPath = async (appDirectory) => {
   const { default: findUp, exists: pathExists } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("../../compiled/find-up")));
   const tscBinFile = await findUp(async (directory) => {
-    const targetFilePath = _path.default.join(directory, "./node_modules/.bin/tsc");
+    const targetFilePath = (0, _path.join)(directory, "./node_modules/.bin/tsc");
     const hasTscBinFile = await pathExists(targetFilePath);
     if (hasTscBinFile) {
       return targetFilePath;

package/dist/utils/dts.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;;;;;;;;;EASaA,mBAAiB;WAAjBA;;EAkDAC,eAAa;WAAbA;;EAyBAC,cAAY;WAAZA;;EA8EAC,uBAAqB;WAArBA;;EA2BAC,yBAAuB;WAAvBA;;;;;iEA7LI;uBACiC;AAQ3C,MAAMJ,oBAAoB,OAC/BK;AAEA,QAAM,EAAEC,iBAAgB,IAAK,MAAM,iFAAO;AAE1C,QAAM,EAAEC,cAAcC,WAAWC,cAAcC,aAAY,IAAKL;AAChE,QAAMM,sBAAsBC,cAAKC,KAC/BN,cACA,GAAGD,qBAAoBQ,kBAAM,GAAI;AAEnC,QAAMC,oBAAoBH,cAAKC,KAC7BF,qBACAC,cAAKI,SAAST,cAAcE;AAG9B,QAAMQ,mBAAmBL,cAAKC,KAC5BF,qBACAC,cAAKM,SAASR;AAEhBS,YAAGC,eAAeH;AAElB,QAAMI,cAAcT,cAAKC,KACvBD,cAAKI,SAASJ,cAAKU,QAAQL,mBAAmBL,cAAKU,QAAQZ,gBAC3DE,cAAKM,SAASD;AAGhB,QAAMM,cAAyB;IAC7BC,SAASH;IACTI,iBAAiB;;MAEfC,aAAa;MACbC,qBAAqB;;;;;;MAMrBC,gBAAgBb;IAClB;EACF;AAEAI,YAAGU,cAAcZ,kBAAkBM;AAEnC,SAAO;IACLN;IACAN;IACAmB,oBAAoBf;EACtB;AACF;AAEO,MAAMd,gBAAgB,OAAOM;AAClC,QAAM,EAAEwB,SAASC,QAAQC,QAAQC,WAAU,IAAK,MAAM,iFACpD;AAEF,QAAMC,aAAa,MAAMH,OACvB,OAAOI;AACL,UAAMC,iBAAiBzB,cAAKC,KAAKuB,WAAW;AAC5C,UAAME,gBAAgB,MAAMJ,WAAWG;AACvC,QAAIC,eAAe;AACjB,aAAOD;IACT;AACA,WAAOE;EACT,GACA;IAAEC,KAAKjC;EAAa;AAGtB,MAAI,CAAC4B,cAAc,CAAChB,UAAGsB,WAAWN,aAAa;AAC7C,UAAM,IAAIO,MACR;EAEJ;AAEA,SAAOP;AACT;AAEO,MAAMjC,eAAe,OAC1BG,QACAsC,SAMAC,iBAA2B,OAAE;MAapBC;AAXT,QAAM,EAAEA,cAAcf,oBAAoBnB,oBAAmB,IAAKgC;AAClE,QAAM,EAAEG,kBAAiB,IAAK,MAAM,iFAAO;AAC3C,QAAM,EAAEC,YAAW,IAAK1C;AACxB,QAAM2C,cAAc,GAAGlB;AACvB,QAAMmB,eACJL,eAAeM,SAAS,IACpBN,iBACAO,cAAOC,KAAKJ,aAAa;IAAEK,UAAU;EAAK;MAIvCR;AAHT,QAAMS,SAASR,kBAAkB;IAC/BS,WAAWN;IACXO,SAAS7C;IACT8C,QAAOZ,oFAAapB,qBAAe,QAA5BoB,kFAA8BY,WAAK,QAAnCZ,uFAAuC,CAAC;EACjD;AACA,aAAWa,KAAKJ,QAAQ;AACtBnC,cAAGwC,cAAcD,EAAE9C,MAAM8C,EAAEE,OAAO;EACpC;AAGA,QAAMzC,UAAG0C,UAAUd;AACnB,QAAM5B,UAAG2C,KAAKhC,oBAAoBiB;AACpC;AAgDO,MAAM5C,wBAAwB,OACnC4D,OACApB;AAEA,QAAM,EAAEqB,iBAAgB,IAAK,MAAM,iFAAO;AAC1C,QAAMC,QAAQ,MAAM,iFAAO;AAC3B,QAAM,EAAEC,cAAcC,UAAS,IAAKxB,mDAAW,CAAC;AAChD,MAAIoB,iBAAiBrB,OAAO;AAC1B,QAAIwB,cAAc;AAChB,YAAM,IAAIF,iBAAiBD,OAAO;QAChCI;MACF;IACF,OAAO;AACLC,oBAAOC,KACLC,aAAMC,eACJN,MAAMO,KAAKC,EAAER,MAAMS,WAAWC,MAAMC,IAAIV,YAAY;AAGxDE,oBAAOL,MACL,IAAIC,iBAAiBD,OAAO;QAC1BI;MACF;IAEJ;EACF;AACF;AAEO,MAAM/D,0BAA0B,CAACyE,WACtCA,WAAW,YAAYA,WAAW;","names":["generatorTsConfig","getTscBinPath","resolveAlias","printOrThrowDtsErrors","tsTargetAtOrAboveES2022","config","dtsTempDirectory","appDirectory","sourceDir","absSourceDir","tsconfigPath","tempDistAbsRootPath","path","join","nanoid","tempDistAbsOurDir","relative","tempTsconfigPath","basename","fs","ensureFileSync","extendsPath","dirname","resetConfig","extends","compilerOptions","declaration","emitDeclarationOnly","declarationDir","writeJSONSync","tempDistAbsSrcPath","default","findUp","exists","pathExists","tscBinFile","directory","targetFilePath","hasTscBinFile","undefined","cwd","existsSync","Error","options","watchFilenames","userTsconfig","transformDtsAlias","distAbsPath","dtsDistPath","dtsFilenames","length","globby","sync","absolute","result","filenames","baseUrl","paths","r","writeFileSync","content","ensureDir","copy","error","InternalDTSError","local","abortOnError","buildType","logger","warn","chalk","bgYellowBright","i18n","t","localeKeys","warns","dts","target"],"sources":["../../src/utils/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/utils/dts.ts"],"sourcesContent":["import path from 'path';\nimport { chalk, fs, globby, logger, nanoid } from '@modern-js/utils';\nimport type {\n  ITsconfig,\n  BundlelessGeneratorDtsConfig,\n  BuildType,\n  TsTarget,\n} from '../types';\n\nexport const generatorTsConfig = async (\n  config: BundlelessGeneratorDtsConfig,\n) => {\n  const { dtsTempDirectory } = await import('../constants/dts');\n\n  const { appDirectory, sourceDir: absSourceDir, tsconfigPath } = config;\n  const tempDistAbsRootPath = path.join(\n    appDirectory,\n    `${dtsTempDirectory}/${nanoid()}`,\n  );\n  const tempDistAbsOurDir = path.join(\n    tempDistAbsRootPath,\n    path.relative(appDirectory, absSourceDir),\n  );\n\n  const tempTsconfigPath = path.join(\n    tempDistAbsRootPath,\n    path.basename(tsconfigPath),\n  );\n  fs.ensureFileSync(tempTsconfigPath);\n\n  const extendsPath = path.join(\n    path.relative(path.dirname(tempTsconfigPath), path.dirname(tsconfigPath)),\n    path.basename(tempTsconfigPath),\n  );\n\n  const resetConfig: ITsconfig = {\n    extends: extendsPath,\n    compilerOptions: {\n      // Ensure that .d.ts files are created by tsc, but not .js files\n      declaration: true,\n      emitDeclarationOnly: true,\n      // when `outDir` is './dist', `declarationDir` is `./types`\n      // tsc will emit:\n      // - ./dist/index.js\n      // - ./types/index.d.ts\n      // we only want to emit declarations\n      declarationDir: tempDistAbsOurDir,\n    },\n  };\n\n  fs.writeJSONSync(tempTsconfigPath, resetConfig);\n\n  return {\n    tempTsconfigPath,\n    tempDistAbsRootPath,\n    tempDistAbsSrcPath: tempDistAbsOurDir,\n  };\n};\n\nexport const getTscBinPath = async (appDirectory: string) => {\n  const { default: findUp, exists: pathExists } = await import(\n    '../../compiled/find-up'\n  );\n  const tscBinFile = await findUp(\n    async (directory: string) => {\n      const targetFilePath = path.join(directory, './node_modules/.bin/tsc');\n      const hasTscBinFile = await pathExists(targetFilePath);\n      if (hasTscBinFile) {\n        return targetFilePath;\n      }\n      return undefined;\n    },\n    { cwd: appDirectory },\n  );\n\n  if (!tscBinFile || !fs.existsSync(tscBinFile)) {\n    throw new Error(\n      'Failed to excute the `tsc` command, please check if `typescript` is installed correctly in the current directory.',\n    );\n  }\n\n  return tscBinFile;\n};\n\nexport const resolveAlias = async (\n  config: BundlelessGeneratorDtsConfig,\n  options: {\n    userTsconfig: ITsconfig;\n    tempTsconfigPath: string;\n    tempDistAbsRootPath: string;\n    tempDistAbsSrcPath: string;\n  },\n  watchFilenames: string[] = [],\n) => {\n  const { userTsconfig, tempDistAbsSrcPath, tempDistAbsRootPath } = options;\n  const { transformDtsAlias } = await import('./tspathsTransform');\n  const { distAbsPath } = config;\n  const dtsDistPath = `${tempDistAbsSrcPath}/**/*.d.ts`;\n  const dtsFilenames =\n    watchFilenames.length > 0\n      ? watchFilenames\n      : globby.sync(dtsDistPath, { absolute: true });\n  const result = transformDtsAlias({\n    filenames: dtsFilenames,\n    baseUrl: tempDistAbsRootPath,\n    paths: userTsconfig.compilerOptions?.paths ?? {},\n  });\n  for (const r of result) {\n    fs.writeFileSync(r.path, r.content);\n  }\n\n  // why use `ensureDir` before copy? look this: https://github.com/jprichardson/node-fs-extra/issues/957\n  await fs.ensureDir(distAbsPath);\n  await fs.copy(tempDistAbsSrcPath, distAbsPath);\n};\n\n// export const matchesPattern = (calleePath: NodePath, pattern: string) => {\n//   const { node } = calleePath;\n\n//   if (t.isMemberExpression(node)) {\n//     return calleePath.matchesPattern(pattern);\n//   }\n\n//   if (!t.isIdentifier(node) || pattern.includes('.')) {\n//     return false;\n//   }\n\n//   const name = pattern.split('.')[0];\n\n//   return node.name === name;\n// };\n\n// export const isImportCall = (calleePath: NodePath<tt.CallExpression>) => {\n//   return t.isImport(calleePath.node.callee);\n// };\n\n// export const verifyTsConfigPaths = async (\n//   tsconfigAbsPath: string,\n//   userAliases?: AliasOption,\n// ) => {\n//   const { readTsConfigByFile, chalk } = await import('@modern-js/utils');\n//   if (!userAliases) {\n//     return;\n//   }\n\n//   const paths = Object.keys(\n//     readTsConfigByFile(tsconfigAbsPath).compilerOptions?.paths || {},\n//   ).map(key => key.replace(/\\/\\*$/, ''));\n\n//   Object.keys(userAliases).forEach(name => {\n//     if (paths.includes(name)) {\n//       throw new Error(\n//         chalk.red(\n//           `It looks like you have configured the alias ${chalk.bold(\n//             name,\n//           )} in both the modern.config file and tsconfig.json.\\n Please remove the configuration in modern.config file and just keep the configuration in tsconfig.json.`,\n//         ),\n//       );\n//     }\n//   });\n// };\n\nexport const printOrThrowDtsErrors = async (\n  error: unknown,\n  options: { abortOnError?: boolean; buildType: BuildType },\n) => {\n  const { InternalDTSError } = await import('../error');\n  const local = await import('../locale');\n  const { abortOnError, buildType } = options ?? {};\n  if (error instanceof Error) {\n    if (abortOnError) {\n      throw new InternalDTSError(error, {\n        buildType,\n      });\n    } else {\n      logger.warn(\n        chalk.bgYellowBright(\n          local.i18n.t(local.localeKeys.warns.dts.abortOnError),\n        ),\n      );\n      logger.error(\n        new InternalDTSError(error, {\n          buildType,\n        }),\n      );\n    }\n  }\n};\n\nexport const tsTargetAtOrAboveES2022 = (target: TsTarget) =>\n  target === 'es2022' || target === 'esnext';\n"]}
+{"version":3,"file":null,"mappings":"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","names":["getProjectTsconfig","generatorTsConfig","getTscBinPath","resolveAlias","printOrThrowDtsErrors","tsTargetAtOrAboveES2022","tsconfigPath","fs","existsSync","json5","parse","readFileSync","config","userTsconfig","appDirectory","sourceDir","absSourceDir","dtsTempDirectory","tempDistAbsRootPath","join","nanoid","tempDistAbsOurDir","relative","tempTsconfigPath","basename","ensureFileSync","extendsPath","dirname","references","map","reference","path","userTsconfigDir","generatedTsconfigDir","isAbsolute","resolve","resetConfig","extends","compilerOptions","declaration","emitDeclarationOnly","declarationDir","writeJSONSync","generatedTsconfig","tempDistAbsSrcPath","default","findUp","exists","pathExists","tscBinFile","directory","targetFilePath","hasTscBinFile","undefined","cwd","Error","options","watchFilenames","transformDtsAlias","distAbsPath","dtsDistPath","dtsFilenames","length","globby","sync","absolute","result","filenames","baseUrl","paths","r","writeFileSync","content","ensureDir","copy","error","InternalDTSError","local","abortOnError","buildType","logger","warn","chalk","bgYellowBright","i18n","t","localeKeys","warns","dts","target"],"sources":["../../src/utils/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/utils/dts.ts"],"sourcesContent":["import { join, dirname, isAbsolute, relative, resolve, basename } from 'path';\nimport { chalk, fs, globby, json5, logger, nanoid } from '@modern-js/utils';\nimport type {\n  ITsconfig,\n  BundlelessGeneratorDtsConfig,\n  BuildType,\n  TsTarget,\n} from '../types';\n\nexport const getProjectTsconfig = async (\n  tsconfigPath: string,\n): Promise<ITsconfig> => {\n  if (!fs.existsSync(tsconfigPath)) {\n    return {};\n  }\n\n  return json5.parse(fs.readFileSync(tsconfigPath, 'utf-8'));\n};\n\nexport const generatorTsConfig = async (\n  config: BundlelessGeneratorDtsConfig,\n) => {\n  const { appDirectory, sourceDir: absSourceDir, tsconfigPath } = config;\n\n  const userTsconfig = await getProjectTsconfig(tsconfigPath);\n  const { dtsTempDirectory } = await import('../constants/dts');\n\n  const tempDistAbsRootPath = join(\n    appDirectory,\n    `${dtsTempDirectory}/${nanoid()}`,\n  );\n  const tempDistAbsOurDir = join(\n    tempDistAbsRootPath,\n    relative(appDirectory, absSourceDir),\n  );\n\n  const tempTsconfigPath = join(tempDistAbsRootPath, basename(tsconfigPath));\n  fs.ensureFileSync(tempTsconfigPath);\n\n  const extendsPath = join(\n    relative(dirname(tempTsconfigPath), dirname(tsconfigPath)),\n    basename(tempTsconfigPath),\n  );\n  const references = userTsconfig?.references?.map(reference => {\n    const { path } = reference;\n    if (path) {\n      const userTsconfigDir = dirname(tsconfigPath);\n      const generatedTsconfigDir = dirname(tempTsconfigPath);\n      return {\n        path: isAbsolute(path)\n          ? path\n          : relative(generatedTsconfigDir, resolve(userTsconfigDir, path)),\n      };\n    }\n    return reference;\n  });\n\n  const resetConfig: ITsconfig = {\n    extends: extendsPath,\n    compilerOptions: {\n      // Ensure that .d.ts files are created by tsc, but not .js files\n      declaration: true,\n      emitDeclarationOnly: true,\n      // when `outDir` is './dist', `declarationDir` is `./types`\n      // tsc will emit:\n      // - ./dist/index.js\n      // - ./types/index.d.ts\n      // we only want to emit declarations\n      declarationDir: tempDistAbsOurDir,\n    },\n    references,\n  };\n\n  fs.writeJSONSync(tempTsconfigPath, resetConfig);\n\n  return {\n    userTsconfig,\n    generatedTsconfig: {\n      tempTsconfigPath,\n      tempDistAbsRootPath,\n      tempDistAbsSrcPath: tempDistAbsOurDir,\n    },\n  };\n};\n\nexport const getTscBinPath = async (appDirectory: string) => {\n  const { default: findUp, exists: pathExists } = await import(\n    '../../compiled/find-up'\n  );\n  const tscBinFile = await findUp(\n    async (directory: string) => {\n      const targetFilePath = join(directory, './node_modules/.bin/tsc');\n      const hasTscBinFile = await pathExists(targetFilePath);\n      if (hasTscBinFile) {\n        return targetFilePath;\n      }\n      return undefined;\n    },\n    { cwd: appDirectory },\n  );\n\n  if (!tscBinFile || !fs.existsSync(tscBinFile)) {\n    throw new Error(\n      'Failed to excute the `tsc` command, please check if `typescript` is installed correctly in the current directory.',\n    );\n  }\n\n  return tscBinFile;\n};\n\nexport const resolveAlias = async (\n  config: BundlelessGeneratorDtsConfig,\n  options: {\n    userTsconfig: ITsconfig;\n    tempTsconfigPath: string;\n    tempDistAbsRootPath: string;\n    tempDistAbsSrcPath: string;\n  },\n  watchFilenames: string[] = [],\n) => {\n  const { userTsconfig, tempDistAbsSrcPath, tempDistAbsRootPath } = options;\n  const { transformDtsAlias } = await import('./tspathsTransform');\n  const { distAbsPath } = config;\n  const dtsDistPath = `${tempDistAbsSrcPath}/**/*.d.ts`;\n  const dtsFilenames =\n    watchFilenames.length > 0\n      ? watchFilenames\n      : globby.sync(dtsDistPath, { absolute: true });\n  const result = transformDtsAlias({\n    filenames: dtsFilenames,\n    baseUrl: tempDistAbsRootPath,\n    paths: userTsconfig.compilerOptions?.paths ?? {},\n  });\n  for (const r of result) {\n    fs.writeFileSync(r.path, r.content);\n  }\n\n  // why use `ensureDir` before copy? look this: https://github.com/jprichardson/node-fs-extra/issues/957\n  await fs.ensureDir(distAbsPath);\n  await fs.copy(tempDistAbsSrcPath, distAbsPath);\n};\n\n// export const matchesPattern = (calleePath: NodePath, pattern: string) => {\n//   const { node } = calleePath;\n\n//   if (t.isMemberExpression(node)) {\n//     return calleePath.matchesPattern(pattern);\n//   }\n\n//   if (!t.isIdentifier(node) || pattern.includes('.')) {\n//     return false;\n//   }\n\n//   const name = pattern.split('.')[0];\n\n//   return node.name === name;\n// };\n\n// export const isImportCall = (calleePath: NodePath<tt.CallExpression>) => {\n//   return t.isImport(calleePath.node.callee);\n// };\n\n// export const verifyTsConfigPaths = async (\n//   tsconfigAbsPath: string,\n//   userAliases?: AliasOption,\n// ) => {\n//   const { readTsConfigByFile, chalk } = await import('@modern-js/utils');\n//   if (!userAliases) {\n//     return;\n//   }\n\n//   const paths = Object.keys(\n//     readTsConfigByFile(tsconfigAbsPath).compilerOptions?.paths || {},\n//   ).map(key => key.replace(/\\/\\*$/, ''));\n\n//   Object.keys(userAliases).forEach(name => {\n//     if (paths.includes(name)) {\n//       throw new Error(\n//         chalk.red(\n//           `It looks like you have configured the alias ${chalk.bold(\n//             name,\n//           )} in both the modern.config file and tsconfig.json.\\n Please remove the configuration in modern.config file and just keep the configuration in tsconfig.json.`,\n//         ),\n//       );\n//     }\n//   });\n// };\n\nexport const printOrThrowDtsErrors = async (\n  error: unknown,\n  options: { abortOnError?: boolean; buildType: BuildType },\n) => {\n  const { InternalDTSError } = await import('../error');\n  const local = await import('../locale');\n  const { abortOnError, buildType } = options ?? {};\n  if (error instanceof Error) {\n    if (abortOnError) {\n      throw new InternalDTSError(error, {\n        buildType,\n      });\n    } else {\n      logger.warn(\n        chalk.bgYellowBright(\n          local.i18n.t(local.localeKeys.warns.dts.abortOnError),\n        ),\n      );\n      logger.error(\n        new InternalDTSError(error, {\n          buildType,\n        }),\n      );\n    }\n  }\n};\n\nexport const tsTargetAtOrAboveES2022 = (target: TsTarget) =>\n  target === 'es2022' || target === 'esnext';\n"]}

package/dist/utils/tspathsTransform.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;+BAmHaA;;;WAAAA;;;;;kEAnHS;+BACU;uBACb;oEACK;sEACF;mEACH;qEACgB;sBACN;AAU7B,SAASC,cACPC,UACA,EAAEC,UAAUC,SAASC,MAAK,GAAmB;AAE7C,MAAI,CAACC,OAAEC,gBAAgBL,WAAW;AAChC;EACF;AAEA,QAAMM,aAAaN,SAASO,KAAKC;AACjC,QAAMC,cAAcR;AACpB,QAAMS,aAAYC,mCAChBT,SACAC,OACA;IAAC;GAAQ;AAEX,QAAMS,SAASF,UACbJ,YACAO;AACE,QAAI,CAACC,UAAGC,WAAWF,kBAAkB;AACnC,aAAOG;IACT;AACA,WAAOF,UAAGG,aAAaJ;EACzB,GACAK,cAAYJ,UAAGC,WAAWG,WAC1BC,kBAAY;AAEd,MAAIP,QAAQ;AACV,UAAMQ,eAAeC,MAAKC,SACxBD,MAAKE,QAAQd,cACbY,MAAKE,QAAQX;AAEf,UAAMY,WAAWH,MAAKI,SAASb;AAE/B,UAAMM,WAAWG,MAAKK,UACpB,GAAGN,aAAaO,WAAW,IAAI,MAAMP,gBAAgBI,UAAU;AAEjE,UAAMI,gBAAgBV,SAASW,WAAW,OAAOX,WAAW,KAAKA;AACjElB,aAAS8B,YAAY1B,OAAE2B,cAAcH;EACvC;AACF;AAgBA,MAAMI,kBACJ,CAACC,WAA4B,CAACjC;AAC5BD,gBAAcC,SAASkC,IAAI,WAAWD;AACxC;AAEF,MAAME,kBACJ,CAACF,WAA4B,CAACjC;AAC5BD,gBAAcC,SAASkC,IAAI,WAAwCD;AACrE;AAEF,MAAMG,2BAA2B,CAAC,EAChCnC,UACAC,SACAC,MAAK,MACW;AAChB,QAAMkC,aAAavB,UAAGwB,aAAarC,UAAU;AAC7C,QAAMsC,MAAMC,QAAOC,MAAMJ,YAAY;IACnCK,YAAY;IACZC,eAAe;IACfC,SAAS;MAAC;;EACZ;AACAC,yBAASN,KAAK;;;IAGZO,mBAAmBd,gBAAgB;MACjC/B;MACAC;MACAC;IACF;IACA4C,mBAAmBZ,gBAAgB;MACjClC;MACAC;MACAC;IACF;EACF;AACA,UAAO6C,uBAAUT,KAAKU;AACxB;AAOO,MAAMnD,oBAAoB,CAACmC;AAChC,QAAM,EAAEiB,YAAY,IAAIhD,SAASC,MAAK,IAAK8B;AAC3C,QAAMkB,kBAAuD;AAC7D,aAAWlD,YAAYiD,WAAW;AAChCC,oBAAgBC,KAAK;MACnB/B,MAAMpB;MACNoD,SAASjB,yBAAyB;QAAEnC;QAAUC;QAASC;MAAM;IAC/D;EACF;AACA,SAAOgD;AACT;","names":["transformDtsAlias","mapPathString","nodePath","filename","baseUrl","paths","t","isStringLiteral","sourcePath","node","value","currentFile","matchPath","createMatchPath","result","packageJsonPath","fs","existsSync","undefined","readJSONSync","filePath","dtsAliasExts","relativePath","path","relative","dirname","fileName","basename","normalize","length","replaceString","startsWith","replaceWith","stringLiteral","transformImport","option","get","transformExport","transformSingleFileAlias","sourceCode","readFileSync","ast","parser","parse","sourceType","errorRecovery","plugins","traverse","ImportDeclaration","ExportDeclaration","generator","code","filenames","transformResult","push","content"],"sources":["../../src/utils/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/utils/tspathsTransform.ts"],"sourcesContent":["import * as path from 'path';\nimport { createMatchPath } from '@modern-js/utils/tsconfig-paths';\nimport { fs } from '@modern-js/utils';\nimport * as parser from '@babel/parser';\nimport generator from '@babel/generator';\nimport * as t from '@babel/types';\nimport traverse, { NodePath } from '@babel/traverse';\nimport { dtsAliasExts } from '../constants/file';\n// import { defaultTransformedFunctions } from '../constants/dts';\n// import { matchesPattern, isImportCall } from './dts';\n\nexport interface TransformOption {\n  filename: string;\n  baseUrl: string;\n  paths: Record<string, string[] | string>;\n}\n\nfunction mapPathString(\n  nodePath: NodePath<t.StringLiteral>,\n  { filename, baseUrl, paths }: TransformOption,\n) {\n  if (!t.isStringLiteral(nodePath)) {\n    return;\n  }\n\n  const sourcePath = nodePath.node.value;\n  const currentFile = filename;\n  const matchPath = createMatchPath(\n    baseUrl,\n    paths as { [key: string]: Array<string> },\n    ['index'],\n  );\n  const result = matchPath(\n    sourcePath,\n    packageJsonPath => {\n      if (!fs.existsSync(packageJsonPath)) {\n        return undefined;\n      }\n      return fs.readJSONSync(packageJsonPath);\n    },\n    filePath => fs.existsSync(filePath),\n    dtsAliasExts,\n  );\n  if (result) {\n    const relativePath = path.relative(\n      path.dirname(currentFile),\n      path.dirname(result),\n    );\n    const fileName = path.basename(result);\n    // 如果是同级文件，则返回的是 ''\n    const filePath = path.normalize(\n      `${relativePath.length === 0 ? '.' : relativePath}/${fileName}`,\n    );\n    const replaceString = filePath.startsWith('.') ? filePath : `./${filePath}`;\n    nodePath.replaceWith(t.stringLiteral(replaceString));\n  }\n}\n\n// const transformCall =\n//   (option: TransformOption) => (nodePath: NodePath<t.CallExpression>) => {\n//     const calleePath = nodePath.get('callee') as NodePath;\n//     const isNormalCall = defaultTransformedFunctions.some(pattern =>\n//       matchesPattern(calleePath, pattern),\n//     );\n//     if (isNormalCall || isImportCall(nodePath)) {\n//       mapPathString(\n//         nodePath.get('arguments.0') as NodePath<t.StringLiteral>,\n//         option,\n//       );\n//     }\n//   };\n\nconst transformImport =\n  (option: TransformOption) => (nodePath: NodePath<t.ImportDeclaration>) => {\n    mapPathString(nodePath.get('source'), option);\n  };\n\nconst transformExport =\n  (option: TransformOption) => (nodePath: NodePath<t.ExportDeclaration>) => {\n    mapPathString(nodePath.get('source') as NodePath<t.StringLiteral>, option);\n  };\n\nconst transformSingleFileAlias = ({\n  filename,\n  baseUrl,\n  paths,\n}: TransformOption) => {\n  const sourceCode = fs.readFileSync(filename, 'utf-8');\n  const ast = parser.parse(sourceCode, {\n    sourceType: 'module',\n    errorRecovery: true, // 防止typescript不支持的语法出现而报错\n    plugins: ['typescript'],\n  });\n  traverse(ast, {\n    // d.ts file content not have callExpression which can be parsed;\n    // CallExpression: transformCall({ filename, baseUrl, paths }) as any,\n    ImportDeclaration: transformImport({\n      filename,\n      baseUrl,\n      paths,\n    }) as any,\n    ExportDeclaration: transformExport({\n      filename,\n      baseUrl,\n      paths,\n    }) as any,\n  });\n  return generator(ast).code;\n};\n\ninterface TransformDtsAliasOption {\n  filenames?: string[];\n  baseUrl: string;\n  paths: Record<string, string[] | string>;\n}\nexport const transformDtsAlias = (option: TransformDtsAliasOption) => {\n  const { filenames = [], baseUrl, paths } = option;\n  const transformResult: { path: string; content: string }[] = [];\n  for (const filename of filenames) {\n    transformResult.push({\n      path: filename,\n      content: transformSingleFileAlias({ filename, baseUrl, paths }),\n    });\n  }\n  return transformResult;\n};\n"]}
+{"version":3,"file":null,"mappings":";;;;+BAmHaA;;;WAAAA;;;;;kEAnHS;+BACU;uBACb;oEACK;sEACF;mEACH;qEACgB;sBACN;AAU7B,SAASC,cACPC,UACA,EAAEC,UAAUC,SAASC,MAAK,GAAmB;AAE7C,MAAI,CAACC,OAAEC,gBAAgBL,WAAW;AAChC;EACF;AAEA,QAAMM,aAAaN,SAASO,KAAKC;AACjC,QAAMC,cAAcR;AACpB,QAAMS,aAAYC,mCAChBT,SACAC,OACA;IAAC;GAAQ;AAEX,QAAMS,SAASF,UACbJ,YACAO;AACE,QAAI,CAACC,UAAGC,WAAWF,kBAAkB;AACnC,aAAOG;IACT;AACA,WAAOF,UAAGG,aAAaJ;EACzB,GACAK,cAAYJ,UAAGC,WAAWG,WAC1BC,kBAAY;AAEd,MAAIP,QAAQ;AACV,UAAMQ,eAAeC,MAAKC,SACxBD,MAAKE,QAAQd,cACbY,MAAKE,QAAQX;AAEf,UAAMY,WAAWH,MAAKI,SAASb;AAE/B,UAAMM,WAAWG,MAAKK,UACpB,GAAGN,aAAaO,WAAW,IAAI,MAAMP,gBAAgBI,UAAU;AAEjE,UAAMI,gBAAgBV,SAASW,WAAW,OAAOX,WAAW,KAAKA;AACjElB,aAAS8B,YAAY1B,OAAE2B,cAAcH;EACvC;AACF;AAgBA,MAAMI,kBACJ,CAACC,WAA4B,CAACjC;AAC5BD,gBAAcC,SAASkC,IAAI,WAAWD;AACxC;AAEF,MAAME,kBACJ,CAACF,WAA4B,CAACjC;AAC5BD,gBAAcC,SAASkC,IAAI,WAAwCD;AACrE;AAEF,MAAMG,2BAA2B,CAAC,EAChCnC,UACAC,SACAC,MAAK,MACW;AAChB,QAAMkC,aAAavB,UAAGwB,aAAarC,UAAU;AAC7C,QAAMsC,MAAMC,QAAOC,MAAMJ,YAAY;IACnCK,YAAY;IACZC,eAAe;IACfC,SAAS;MAAC;;EACZ;AACAC,yBAASN,KAAK;;;IAGZO,mBAAmBd,gBAAgB;MACjC/B;MACAC;MACAC;IACF;IACA4C,mBAAmBZ,gBAAgB;MACjClC;MACAC;MACAC;IACF;EACF;AACA,UAAO6C,uBAAUT,KAAKU;AACxB;AAOO,MAAMnD,oBAAoB,CAACmC;AAChC,QAAM,EAAEiB,YAAY,IAAIhD,SAASC,MAAK,IAAK8B;AAC3C,QAAMkB,kBAAuD;AAC7D,aAAWlD,YAAYiD,WAAW;AAChCC,oBAAgBC,KAAK;MACnB/B,MAAMpB;MACNoD,SAASjB,yBAAyB;QAAEnC;QAAUC;QAASC;MAAM;IAC/D;EACF;AACA,SAAOgD;AACT;","names":["transformDtsAlias","mapPathString","nodePath","filename","baseUrl","paths","t","isStringLiteral","sourcePath","node","value","currentFile","matchPath","createMatchPath","result","packageJsonPath","fs","existsSync","undefined","readJSONSync","filePath","dtsAliasExts","relativePath","path","relative","dirname","fileName","basename","normalize","length","replaceString","startsWith","replaceWith","stringLiteral","transformImport","option","get","transformExport","transformSingleFileAlias","sourceCode","readFileSync","ast","parser","parse","sourceType","errorRecovery","plugins","traverse","ImportDeclaration","ExportDeclaration","generator","code","filenames","transformResult","push","content"],"sources":["../../src/utils/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/utils/tspathsTransform.ts"],"sourcesContent":["import * as path from 'path';\nimport { createMatchPath } from '@modern-js/utils/tsconfig-paths';\nimport { fs } from '@modern-js/utils';\nimport * as parser from '@babel/parser';\nimport generator from '@babel/generator';\nimport * as t from '@babel/types';\nimport traverse, { NodePath } from '@babel/traverse';\nimport { dtsAliasExts } from '../constants/file';\n// import { defaultTransformedFunctions } from '../constants/dts';\n// import { matchesPattern, isImportCall } from './dts';\n\nexport interface TransformOption {\n  filename: string;\n  baseUrl: string;\n  paths: Record<string, string[] | string>;\n}\n\nfunction mapPathString(\n  nodePath: NodePath<any>,\n  { filename, baseUrl, paths }: TransformOption,\n) {\n  if (!t.isStringLiteral(nodePath)) {\n    return;\n  }\n\n  const sourcePath = nodePath.node.value;\n  const currentFile = filename;\n  const matchPath = createMatchPath(\n    baseUrl,\n    paths as { [key: string]: Array<string> },\n    ['index'],\n  );\n  const result = matchPath(\n    sourcePath,\n    packageJsonPath => {\n      if (!fs.existsSync(packageJsonPath)) {\n        return undefined;\n      }\n      return fs.readJSONSync(packageJsonPath);\n    },\n    filePath => fs.existsSync(filePath),\n    dtsAliasExts,\n  );\n  if (result) {\n    const relativePath = path.relative(\n      path.dirname(currentFile),\n      path.dirname(result),\n    );\n    const fileName = path.basename(result);\n    // 如果是同级文件，则返回的是 ''\n    const filePath = path.normalize(\n      `${relativePath.length === 0 ? '.' : relativePath}/${fileName}`,\n    );\n    const replaceString = filePath.startsWith('.') ? filePath : `./${filePath}`;\n    nodePath.replaceWith(t.stringLiteral(replaceString));\n  }\n}\n\n// const transformCall =\n//   (option: TransformOption) => (nodePath: NodePath<t.CallExpression>) => {\n//     const calleePath = nodePath.get('callee') as NodePath;\n//     const isNormalCall = defaultTransformedFunctions.some(pattern =>\n//       matchesPattern(calleePath, pattern),\n//     );\n//     if (isNormalCall || isImportCall(nodePath)) {\n//       mapPathString(\n//         nodePath.get('arguments.0') as NodePath<t.StringLiteral>,\n//         option,\n//       );\n//     }\n//   };\n\nconst transformImport =\n  (option: TransformOption) => (nodePath: NodePath<t.ImportDeclaration>) => {\n    mapPathString(nodePath.get('source'), option);\n  };\n\nconst transformExport =\n  (option: TransformOption) => (nodePath: NodePath<t.ExportDeclaration>) => {\n    mapPathString(nodePath.get('source') as NodePath<t.StringLiteral>, option);\n  };\n\nconst transformSingleFileAlias = ({\n  filename,\n  baseUrl,\n  paths,\n}: TransformOption) => {\n  const sourceCode = fs.readFileSync(filename, 'utf-8');\n  const ast = parser.parse(sourceCode, {\n    sourceType: 'module',\n    errorRecovery: true, // 防止typescript不支持的语法出现而报错\n    plugins: ['typescript'],\n  });\n  traverse(ast, {\n    // d.ts file content not have callExpression which can be parsed;\n    // CallExpression: transformCall({ filename, baseUrl, paths }) as any,\n    ImportDeclaration: transformImport({\n      filename,\n      baseUrl,\n      paths,\n    }) as any,\n    ExportDeclaration: transformExport({\n      filename,\n      baseUrl,\n      paths,\n    }) as any,\n  });\n  return generator(ast).code;\n};\n\ninterface TransformDtsAliasOption {\n  filenames?: string[];\n  baseUrl: string;\n  paths: Record<string, string[] | string>;\n}\nexport const transformDtsAlias = (option: TransformDtsAliasOption) => {\n  const { filenames = [], baseUrl, paths } = option;\n  const transformResult: { path: string; content: string }[] = [];\n  for (const filename of filenames) {\n    transformResult.push({\n      path: filename,\n      content: transformSingleFileAlias({ filename, baseUrl, paths }),\n    });\n  }\n  return transformResult;\n};\n"]}

package/package.json

@@ -15,7 +15,7 @@
     "module-tools",
     "lib-tools"
   ],
-  "version": "2.33.1",
+  "version": "2.35.0",
   "bin": {
     "modern": "./bin/modern.js",
     "modern-module": "./bin/modern.js"
@@ -49,24 +49,24 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@babel/parser": "^7.21.8",
-    "@babel/generator": "^7.21.5",
-    "@babel/types": "^7.21.5",
-    "@babel/traverse": "^7.21.5",
+    "@babel/parser": "^7.22.15",
+    "@babel/generator": "^7.22.15",
+    "@babel/types": "^7.22.15",
+    "@babel/traverse": "^7.22.15",
     "postcss": "8.4.27",
     "@swc/helpers": "0.5.1",
-    "@modern-js/core": "2.33.1",
-    "@modern-js/libuild": "2.33.1",
-    "@modern-js/libuild-plugin-svgr": "2.33.1",
-    "@modern-js/libuild-plugin-swc": "2.33.1",
-    "@modern-js/new-action": "2.33.1",
-    "@modern-js/plugin": "2.33.1",
-    "@modern-js/plugin-changeset": "2.33.1",
-    "@modern-js/plugin-i18n": "2.33.1",
-    "@modern-js/plugin-lint": "2.33.1",
-    "@modern-js/types": "2.33.1",
-    "@modern-js/upgrade": "2.33.1",
-    "@modern-js/utils": "2.33.1"
+    "@modern-js/core": "2.35.0",
+    "@modern-js/libuild": "2.35.0",
+    "@modern-js/libuild-plugin-svgr": "2.35.0",
+    "@modern-js/libuild-plugin-swc": "2.35.0",
+    "@modern-js/new-action": "2.35.0",
+    "@modern-js/plugin": "2.35.0",
+    "@modern-js/plugin-changeset": "2.35.0",
+    "@modern-js/plugin-i18n": "2.35.0",
+    "@modern-js/plugin-lint": "2.35.0",
+    "@modern-js/types": "2.35.0",
+    "@modern-js/upgrade": "2.35.0",
+    "@modern-js/utils": "2.35.0"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.4",
@@ -79,12 +79,12 @@
     "jest": "^29",
     "path-browserify": "1.0.1",
     "postcss-alias": "2.0.0",
-    "react": "17",
+    "react": "^18",
     "typescript": "^5",
-    "@modern-js/builder-webpack-provider": "2.33.1",
-    "@modern-js/self": "npm:@modern-js/module-tools@2.33.1",
-    "@scripts/build": "2.33.1",
-    "@scripts/jest-config": "2.33.1"
+    "@modern-js/builder-webpack-provider": "2.35.0",
+    "@modern-js/self": "npm:@modern-js/module-tools@2.35.0",
+    "@scripts/build": "2.35.0",
+    "@scripts/jest-config": "2.35.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",