@nx/webpack 20.2.2 → 20.3.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "20.2.2",
+  "version": "20.3.0-beta.1",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -65,8 +65,8 @@
     "webpack-dev-server": "^5.0.4",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "20.2.2",
-    "@nx/js": "20.2.2"
+    "@nx/devkit": "20.3.0-beta.1",
+    "@nx/js": "20.3.0-beta.1"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/webpack/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/nx-webpack-plugin/lib/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/webpack/schema.d.ts

@@ -95,4 +95,5 @@ export interface NormalizedWebpackExecutorOptions
   root: string;
   projectRoot: string;
   sourceRoot: string;
+  useTsconfigPaths: boolean;
 }

package/src/plugins/nx-webpack-plugin/lib/apply-base-config.js

@@ -177,9 +177,14 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
         configurationName: options.configurationName,
         root: options.root,
     };
-    plugins.push(new nx_tsconfig_paths_webpack_plugin_1.NxTsconfigPathsWebpackPlugin({ ...options, tsConfig }));
+    const isUsingTsSolution = (0, ts_solution_setup_1.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 nx_tsconfig_paths_webpack_plugin_1.NxTsconfigPathsWebpackPlugin({ ...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/nx-webpack-plugin/nx-app-webpack-plugin-options.d.ts

@@ -202,6 +202,10 @@ export interface NxAppWebpackPluginOptions {
      * 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 ensureNxWebpackExecutionContext(ctx) {
         outputPath: undefined,
         tsConfig: undefined,
         outputFileName: undefined,
+        useTsconfigPaths: undefined,
     };
     ctx.context ??= {
         projectName,

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

@@ -25,6 +25,7 @@ async function readWebpackOptions(webpackConfig) {
                 outputFileName: undefined,
                 outputPath: undefined,
                 assets: undefined,
+                useTsconfigPaths: undefined,
             },
             context: {
                 root: devkit_1.workspaceRoot,