@modern-js/module-tools 2.60.6 → 2.62.0

package/dist/builder/esbuild/index.js

@@ -254,7 +254,7 @@ class EsbuildCompiler {
       root,
       platform: config.platform,
       alias: config.alias,
-      tsconfig: config.tsconfig,
+      tsConfig: config.resolve.tsConfig,
       mainFields: config.resolve.mainFields
     };
     this.css_resolve = (0, import_resolve.createCssResolver)({

package/dist/builder/esbuild/resolve.d.ts

@@ -5,14 +5,16 @@ import type { ImportKind, Platform } from 'esbuild';
 export declare const cssExtensions: string[];
 export declare const createJsResolver: (options: ResolverOptions) => (id: string, dir: string, kind?: ImportKind) => string | false;
 export declare const createCssResolver: (options: ResolverOptions) => (id: string, dir: string, kind?: ImportKind) => string;
-interface ResolverOptions {
+export interface ResolverOptions {
     platform: Platform;
     resolveType: 'js' | 'css';
     extensions: string[];
     root: string;
     alias: Record<string, string>;
-    tsconfig: string;
+    tsConfig: {
+        configFile: string;
+        references?: string[] | undefined;
+    };
     mainFields: string[];
     preferRelative?: boolean;
 }
-export {};

package/dist/builder/esbuild/resolve.js

@@ -45,10 +45,13 @@ const cssExtensions = [
 ];
 function createEnhancedResolve(options) {
   const plugins = [];
-  const { tsconfig } = options;
-  if (import_fs.default.existsSync(tsconfig)) {
+  const { tsConfig } = options;
+  const tsConfigFilePath = tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.configFile;
+  const references = tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.references;
+  if (import_fs.default.existsSync(tsConfigFilePath)) {
     plugins.push(new import_tsconfig_paths_webpack_plugin.default({
-      configFile: tsconfig
+      configFile: tsConfigFilePath,
+      references
     }));
   }
   const resolveOptions = {

package/dist/config/merge.js

@@ -36,7 +36,7 @@ var import_utils = require("@modern-js/utils");
 var import_build = require("../constants/build");
 var import_utils2 = require("../utils");
 const mergeDefaultBaseConfig = async (pConfig, options) => {
-  var _pConfig_resolve, _pConfig_resolve1, _pConfig_resolve2, _pConfig_style, _pConfig_style1, _pConfig_style2, _pConfig_style3;
+  var _pConfig_resolve, _pConfig_resolve1, _pConfig_resolve2, _pConfig_resolve3, _pConfig_style, _pConfig_style1, _pConfig_style2, _pConfig_style3;
   const defaultConfig = (0, import_build.getDefaultBuildConfig)();
   const { context, buildCmdOptions } = options;
   const { applyOptionsChain, ensureAbsolutePath, slash } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
@@ -114,11 +114,14 @@ const mergeDefaultBaseConfig = async (pConfig, options) => {
     "browser",
     "main"
   ];
-  var _pConfig_resolve_mainFields, _pConfig_resolve_jsExtensions;
+  var _pConfig_resolve_mainFields, _pConfig_resolve_jsExtensions, _pConfig_resolve_tsConfig;
   const resolve = {
     mainFields: (_pConfig_resolve_mainFields = (_pConfig_resolve1 = pConfig.resolve) === null || _pConfig_resolve1 === void 0 ? void 0 : _pConfig_resolve1.mainFields) !== null && _pConfig_resolve_mainFields !== void 0 ? _pConfig_resolve_mainFields : defaultMainFields,
     jsExtensions: (_pConfig_resolve_jsExtensions = (_pConfig_resolve2 = pConfig.resolve) === null || _pConfig_resolve2 === void 0 ? void 0 : _pConfig_resolve2.jsExtensions) !== null && _pConfig_resolve_jsExtensions !== void 0 ? _pConfig_resolve_jsExtensions : defaultConfig.resolve.jsExtensions,
-    alias: mergedResolveAlias
+    alias: mergedResolveAlias,
+    tsConfig: (_pConfig_resolve_tsConfig = (_pConfig_resolve3 = pConfig.resolve) === null || _pConfig_resolve3 === void 0 ? void 0 : _pConfig_resolve3.tsConfig) !== null && _pConfig_resolve_tsConfig !== void 0 ? _pConfig_resolve_tsConfig : tsconfig ? {
+      configFile: tsconfig
+    } : defaultConfig.resolve.tsConfig
   };
   var _pConfig_esbuildOptions;
   const esbuildOptions = (_pConfig_esbuildOptions = pConfig.esbuildOptions) !== null && _pConfig_esbuildOptions !== void 0 ? _pConfig_esbuildOptions : defaultConfig.esbuildOptions;

package/dist/config/normalize.js

@@ -103,6 +103,9 @@ const transformToAbsPath = async (baseConfig, options) => {
   newConfig.outDir = import_path.default.resolve(context.appDirectory, newConfig.outDir);
   newConfig.sourceDir = import_path.default.resolve(context.appDirectory, baseConfig.sourceDir);
   newConfig.tsconfig = import_path.default.resolve(context.appDirectory, newConfig.tsconfig);
+  if (newConfig.resolve.tsConfig) {
+    newConfig.resolve.tsConfig.configFile = import_path.default.resolve(context.appDirectory, newConfig.resolve.tsConfig.configFile);
+  }
   if (newConfig.dts) {
     newConfig.dts.distPath = import_path.default.resolve(newConfig.outDir, newConfig.dts.distPath);
     if (newConfig.dts.tsconfigPath) {

package/dist/constants/build.js

@@ -80,7 +80,11 @@ const getDefaultBuildConfig = () => {
         ".ts",
         ".json"
       ],
-      alias: {}
+      alias: {},
+      tsConfig: {
+        configFile: "tsconfig.json",
+        references: void 0
+      }
     },
     shims: false,
     sideEffects: void 0,

package/dist/types/config/index.d.ts

@@ -95,11 +95,17 @@ export type Resolve = {
     mainFields?: string[];
     jsExtensions?: string[];
     alias?: AliasOption;
+    tsConfig?: Tsconfig;
+};
+type Tsconfig = {
+    configFile: string;
+    references?: string[] | undefined;
 };
 export type ResolveOptions = {
     mainFields: string[];
     jsExtensions: string[];
     alias: Record<string, string>;
+    tsConfig: Tsconfig;
 };
 export type BaseBuildConfig = Omit<Required<PartialBaseBuildConfig>, 'dts' | 'style' | 'alias' | 'sideEffects' | 'asset' | 'resolve'> & {
     sideEffects?: SideEffects;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "2.60.6",
+  "version": "2.62.0",
   "description": "Simple, powerful, high-performance modern npm package development solution.",
   "keywords": [
     "modern",
@@ -70,21 +70,21 @@
     "tapable": "2.2.1",
     "terser": "^5.31.1",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "@modern-js/core": "2.60.6",
-    "@modern-js/plugin-changeset": "2.60.6",
-    "@modern-js/plugin": "2.60.6",
-    "@modern-js/types": "2.60.6",
-    "@modern-js/plugin-i18n": "2.60.6",
-    "@modern-js/utils": "2.60.6"
+    "@modern-js/core": "2.62.0",
+    "@modern-js/plugin": "2.62.0",
+    "@modern-js/plugin-changeset": "2.62.0",
+    "@modern-js/plugin-i18n": "2.62.0",
+    "@modern-js/types": "2.62.0",
+    "@modern-js/utils": "2.62.0"
   },
   "devDependencies": {
-    "@rsbuild/core": "~1.0.11",
+    "@rsbuild/core": "~1.1.0",
     "@types/convert-source-map": "1.5.2",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/self": "npm:@modern-js/module-tools@2.60.6",
-    "@scripts/build": "2.60.6",
-    "@scripts/vitest-config": "2.60.6"
+    "@modern-js/self": "npm:@modern-js/module-tools@2.62.0",
+    "@scripts/build": "2.62.0",
+    "@scripts/vitest-config": "2.62.0"
   },
   "peerDependencies": {
     "typescript": "^4 || ^5"