@nx/webpack 0.0.0-pr-29156-c171bae → 0.0.0-pr-29314-e664f92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "0.0.0-pr-29156-c171bae",
+  "version": "0.0.0-pr-29314-e664f92",
   "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": "0.0.0-pr-29156-c171bae",
-    "@nx/js": "0.0.0-pr-29156-c171bae"
+    "@nx/devkit": "0.0.0-pr-29314-e664f92",
+    "@nx/js": "0.0.0-pr-29314-e664f92"
   },
   "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

@@ -14,6 +14,7 @@ const get_terser_ecma_version_1 = require("./get-terser-ecma-version");
 const compiler_loaders_1 = require("./compiler-loaders");
 const TerserPlugin = require("terser-webpack-plugin");
 const nodeExternals = require("webpack-node-externals");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const IGNORED_WEBPACK_WARNINGS = [
     /The comment file/i,
     /could not find any license/i,
@@ -176,8 +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 }));
-    if (!options?.skipTypeChecking) {
+    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 && !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/plugins/plugin.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const fs_1 = require("fs");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
@@ -33,8 +34,9 @@ exports.createNodesV2 = [
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `webpack-${optionsHash}.hash`);
         const targetsCache = readTargetsCache(cachePath);
         const normalizedOptions = normalizeOptions(options);
+        const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache), configFilePaths, normalizedOptions, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup), configFilePaths, normalizedOptions, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);
@@ -46,10 +48,10 @@ exports.createNodes = [
     async (configFilePath, options, context) => {
         devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
         const normalizedOptions = normalizeOptions(options);
-        return createNodesInternal(configFilePath, normalizedOptions, context, {});
+        return createNodesInternal(configFilePath, normalizedOptions, context, {}, (0, ts_solution_setup_1.isUsingTsSolutionSetup)());
     },
 ];
-async function createNodesInternal(configFilePath, options, context, targetsCache) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup) {
     const projectRoot = (0, path_1.dirname)(configFilePath);
     // Do not create a project if package.json and project.json isn't there.
     const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
@@ -58,7 +60,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         return {};
     }
     const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-    targetsCache[hash] ??= await createWebpackTargets(configFilePath, projectRoot, options, context);
+    targetsCache[hash] ??= await createWebpackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup);
     const { targets, metadata } = targetsCache[hash];
     return {
         projects: {
@@ -70,7 +72,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         },
     };
 }
-async function createWebpackTargets(configFilePath, projectRoot, options, context) {
+async function createWebpackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const webpackConfig = (0, resolve_user_defined_webpack_config_1.resolveUserDefinedWebpackConfig)((0, path_1.join)(context.workspaceRoot, configFilePath), (0, js_1.getRootTsConfigPath)(), true);
     const webpackOptions = await (0, read_webpack_options_1.readWebpackOptions)(webpackConfig);
@@ -157,6 +159,20 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
             spa: true,
         },
     };
+    if (isTsSolutionSetup) {
+        targets[options.buildTargetName].syncGenerators = [
+            '@nx/js:typescript-sync',
+        ];
+        targets[options.serveTargetName].syncGenerators = [
+            '@nx/js:typescript-sync',
+        ];
+        targets[options.previewTargetName].syncGenerators = [
+            '@nx/js:typescript-sync',
+        ];
+        targets[options.serveStaticTargetName].syncGenerators = [
+            '@nx/js:typescript-sync',
+        ];
+    }
     return { targets, metadata: {} };
 }
 function normalizeOutputPath(outputPath, projectRoot) {

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,