fix(rspack): add useTsconfigPaths to NxAppRspackPluginOptions

nrwl · Dec 11, 2024 · 0f40005 · 0f40005
1 parent b859795
commit 0f40005
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 6 deletions.
diff --git a/packages/next/plugins/component-testing.ts b/packages/next/plugins/component-testing.ts
@@ -127,6 +127,7 @@ Able to find CT project, ${!!ctProjectConfig}.`);
     projectRoot: ctProjectConfig.root,
     sourceRoot: ctProjectConfig.sourceRoot,
     main: '',
+    useTsconfigPaths: undefined,
     fileReplacements: buildFileReplacements,
     assets: buildAssets,
     outputPath: buildOuputPath,

diff --git a/packages/rspack/src/executors/rspack/lib/normalize-options.ts b/packages/rspack/src/executors/rspack/lib/normalize-options.ts
@@ -8,6 +8,7 @@ import type {
   RspackExecutorSchema,
   NormalizedRspackExecutorSchema,
 } from '../schema';
+import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup';
 
 export function normalizeOptions(
   options: RspackExecutorSchema,
@@ -17,6 +18,7 @@ export function normalizeOptions(
 ): NormalizedRspackExecutorSchema {
   const normalizedOptions = {
     ...options,
+    useTsconfigPaths: !isUsingTsSolutionSetup(),
     root,
     projectRoot,
     sourceRoot,

diff --git a/packages/rspack/src/executors/rspack/schema.d.ts b/packages/rspack/src/executors/rspack/schema.d.ts
@@ -69,4 +69,5 @@ export interface NormalizedRspackExecutorSchema extends RspackExecutorSchema {
   root: string;
   projectRoot: string;
   sourceRoot: string;
+  useTsconfigPaths: boolean;
 }
diff --git a/packages/rspack/src/plugins/utils/apply-base-config.ts b/packages/rspack/src/plugins/utils/apply-base-config.ts
@@ -217,6 +217,8 @@ function applyNxDependentConfig(
   const tsConfig = options.tsConfig ?? getRootTsConfigPath();
   const plugins: RspackPluginInstance[] = [];
 
+  const isUsingTsSolution = isUsingTsSolutionSetup();
+
   const executorContext: Partial<ExecutorContext> = {
     projectName: options.projectName,
     targetName: options.targetName,
@@ -225,10 +227,14 @@ function applyNxDependentConfig(
     root: options.root,
   };
 
-  plugins.push(new NxTsconfigPathsRspackPlugin({ ...options, tsConfig }));
+  options.useTsconfigPaths ??= !isUsingTsSolution;
+  // If the project is using ts solutions setup, the paths are not in tsconfig and we should not use the plugin's paths.
+  if (options.useTsconfigPaths) {
+    plugins.push(new NxTsconfigPathsRspackPlugin({ ...options, tsConfig }));
+  }
 
   // New TS Solution already has a typecheck target
-  if (!options?.skipTypeChecking && !isUsingTsSolutionSetup()) {
+  if (!options?.skipTypeChecking && !isUsingTsSolution) {
     const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
     plugins.push(
       new ForkTsCheckerWebpackPlugin({

diff --git a/packages/rspack/src/plugins/utils/models.ts b/packages/rspack/src/plugins/utils/models.ts
@@ -207,6 +207,10 @@ export interface NxAppRspackPluginOptions {
    * List of TypeScript Compiler Transformers Plugins.
    */
   transformers?: TransformerEntry[];
+  /**
+   * Use tsconfig-paths-webpack-plugin to resolve modules using paths in the tsconfig file.
+   */
+  useTsconfigPaths?: boolean;
   /**
    * Generate a separate vendor chunk for 3rd party packages.
    */

diff --git a/packages/rspack/src/utils/config.ts b/packages/rspack/src/utils/config.ts
@@ -99,6 +99,7 @@ function ensureNxRspackExecutionContext(ctx: NxRspackExecutionContext): void {
     outputFileName: undefined,
     outputPath: undefined,
     rspackConfig: undefined,
+    useTsconfigPaths: undefined,
   };
   ctx.context ??= {
     projectName,

diff --git a/packages/rspack/src/utils/read-rspack-options.ts b/packages/rspack/src/utils/read-rspack-options.ts
@@ -31,6 +31,7 @@ export async function readRspackOptions(
           tsConfig: '',
           outputPath: '',
           rspackConfig: '',
+          useTsconfigPaths: undefined,
         },
         context: {
           root: workspaceRoot,

diff --git a/packages/webpack/src/executors/webpack/lib/normalize-options.ts b/packages/webpack/src/executors/webpack/lib/normalize-options.ts
@@ -8,6 +8,7 @@ import type {
   NormalizedWebpackExecutorOptions,
   WebpackExecutorOptions,
 } from '../schema';
+import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup';
 
 export function normalizeOptions(
   options: WebpackExecutorOptions,
@@ -17,6 +18,7 @@ export function normalizeOptions(
 ): NormalizedWebpackExecutorOptions {
   const normalizedOptions = {
     ...options,
+    useTsconfigPaths: !isUsingTsSolutionSetup(),
     root,
     projectRoot,
     sourceRoot,

diff --git a/packages/webpack/src/executors/webpack/schema.d.ts b/packages/webpack/src/executors/webpack/schema.d.ts
@@ -95,4 +95,5 @@ export interface NormalizedWebpackExecutorOptions
   root: string;
   projectRoot: string;
   sourceRoot: string;
+  useTsconfigPaths: boolean;
 }
diff --git a/packages/webpack/src/plugins/nx-webpack-plugin/lib/apply-base-config.ts b/packages/webpack/src/plugins/nx-webpack-plugin/lib/apply-base-config.ts
@@ -231,12 +231,16 @@ function applyNxDependentConfig(
     root: options.root,
   };
 
+  const isUsingTsSolution = isUsingTsSolutionSetup();
+  options.useTsconfigPaths ??= !isUsingTsSolution;
+
+  // If the project is using ts solutions setup, the paths are not in tsconfig and we should not use the plugin's paths.
   if (options.useTsconfigPaths) {
     plugins.push(new NxTsconfigPathsWebpackPlugin({ ...options, tsConfig }));
   }
 
   // New TS Solution already has a typecheck target
-  if (!options?.skipTypeChecking && !isUsingTsSolutionSetup()) {
+  if (!options?.skipTypeChecking && !isUsingTsSolution) {
     const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
     plugins.push(
       new ForkTsCheckerWebpackPlugin({

diff --git a/packages/webpack/src/plugins/nx-webpack-plugin/lib/normalize-options.ts b/packages/webpack/src/plugins/nx-webpack-plugin/lib/normalize-options.ts
@@ -12,7 +12,6 @@ import {
   NormalizedNxAppWebpackPluginOptions,
   NxAppWebpackPluginOptions,
 } from '../nx-app-webpack-plugin-options';
-import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup';
 
 export function normalizeOptions(
   options: NxAppWebpackPluginOptions
@@ -38,8 +37,6 @@ export function normalizeOptions(
 
   const projectNode = projectGraph.nodes[projectName];
   const targetConfig = projectNode.data.targets[targetName];
-  options.useTsconfigPaths =
-    options.useTsconfigPaths ?? !isUsingTsSolutionSetup();
 
   normalizeRelativePaths(projectNode.data.root, options);
 

diff --git a/packages/webpack/src/utils/config.ts b/packages/webpack/src/utils/config.ts
@@ -99,6 +99,7 @@ function ensureNxWebpackExecutionContext(ctx: NxWebpackExecutionContext): void {
     outputPath: undefined,
     tsConfig: undefined,
     outputFileName: undefined,
+    useTsconfigPaths: undefined,
   };
   ctx.context ??= {
     projectName,

diff --git a/packages/webpack/src/utils/webpack/read-webpack-options.ts b/packages/webpack/src/utils/webpack/read-webpack-options.ts
@@ -28,6 +28,7 @@ export async function readWebpackOptions(
           outputFileName: undefined,
           outputPath: undefined,
           assets: undefined,
+          useTsconfigPaths: undefined,
         },
         context: {
           root: workspaceRoot,