@nx/rspack 20.3.0-beta.0 → 20.3.0-beta.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/rspack",
   "description": "The Nx Plugin for Rspack contains executors and generators that support building applications using Rspack.",
-  "version": "20.3.0-beta.0",
+  "version": "20.3.0-beta.1",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,10 +24,10 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "20.3.0-beta.0",
-    "@nx/devkit": "20.3.0-beta.0",
-    "@nx/web": "20.3.0-beta.0",
-    "@nx/module-federation": "20.3.0-beta.0",
+    "@nx/js": "20.3.0-beta.1",
+    "@nx/devkit": "20.3.0-beta.1",
+    "@nx/web": "20.3.0-beta.1",
+    "@nx/module-federation": "20.3.0-beta.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@rspack/core": "^1.1.5",
     "@rspack/dev-server": "^1.0.9",

package/src/executors/rspack/lib/normalize-options.js

@@ -4,9 +4,11 @@ exports.normalizeOptions = normalizeOptions;
 exports.normalizePluginPath = normalizePluginPath;
 const path_1 = require("path");
 const normalize_options_1 = require("../../../plugins/utils/plugins/normalize-options");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function normalizeOptions(options, root, projectRoot, sourceRoot) {
     const normalizedOptions = {
         ...options,
+        useTsconfigPaths: !(0, ts_solution_setup_1.isUsingTsSolutionSetup)(),
         root,
         projectRoot,
         sourceRoot,

package/src/executors/rspack/schema.d.ts

@@ -69,4 +69,5 @@ export interface NormalizedRspackExecutorSchema extends RspackExecutorSchema {
   root: string;
   projectRoot: string;
   sourceRoot: string;
+  useTsconfigPaths: boolean;
 }

package/src/plugins/utils/apply-base-config.js

@@ -164,6 +164,7 @@ function applyNxIndependentConfig(options, config) {
 function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
     const tsConfig = options.tsConfig ?? (0, js_1.getRootTsConfigPath)();
     const plugins = [];
+    const isUsingTsSolution = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
     const executorContext = {
         projectName: options.projectName,
         targetName: options.targetName,
@@ -171,9 +172,13 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
         configurationName: options.configurationName,
         root: options.root,
     };
-    plugins.push(new nx_tsconfig_paths_rspack_plugin_1.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 nx_tsconfig_paths_rspack_plugin_1.NxTsconfigPathsRspackPlugin({ ...options, tsConfig }));
+    }
     // New TS Solution already has a typecheck target
-    if (!options?.skipTypeChecking && !(0, ts_solution_setup_1.isUsingTsSolutionSetup)()) {
+    if (!options?.skipTypeChecking && !isUsingTsSolution) {
         const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
         plugins.push(new ForkTsCheckerWebpackPlugin({
             typescript: {

package/src/plugins/utils/apply-react-config.js

@@ -16,11 +16,11 @@ function applyReactConfig(options, config = {}) {
         config.module.rules.push({
             test: /\.svg$/i,
             type: 'asset',
-            resourceQuery: /react/, // *.svg?react
+            resourceQuery: /url/, // *.svg?url
         }, {
             test: /\.svg$/i,
             issuer: /\.[jt]sx?$/,
-            resourceQuery: { not: [/react/] }, // exclude react component if *.svg?react
+            resourceQuery: { not: [/url/] }, // exclude react component if not *.svg?url
             use: [{ loader: '@svgr/webpack', options: svgrOptions }],
         });
     }
@@ -31,7 +31,7 @@ function applyReactConfig(options, config = {}) {
     };
 }
 function removeSvgLoaderIfPresent(config) {
-    const svgLoaderIdx = config.module.rules.findIndex((rule) => typeof rule === 'object' && rule.test.toString().includes('svg'));
+    const svgLoaderIdx = config.module.rules.findIndex((rule) => typeof rule === 'object' && rule.test?.toString().includes('svg'));
     if (svgLoaderIdx === -1)
         return;
     config.module.rules.splice(svgLoaderIdx, 1);

package/src/plugins/utils/models.d.ts

@@ -196,6 +196,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.
      */

package/src/utils/config.js

@@ -55,6 +55,7 @@ function ensureNxRspackExecutionContext(ctx) {
         outputFileName: undefined,
         outputPath: undefined,
         rspackConfig: undefined,
+        useTsconfigPaths: undefined,
     };
     ctx.context ??= {
         projectName,

package/src/utils/read-rspack-options.js

@@ -28,6 +28,7 @@ async function readRspackOptions(rspackConfig) {
                 tsConfig: '',
                 outputPath: '',
                 rspackConfig: '',
+                useTsconfigPaths: undefined,
             },
             context: {
                 root: devkit_1.workspaceRoot,