@nx/webpack 0.0.0-pr-31222-862e973 → 0.0.0-pr-31313-387cdca

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2024 Narwhal Technologies Inc.
+Copyright (c) 2017-2025 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -9,7 +9,7 @@
 
 [![CircleCI](https://circleci.com/gh/nrwl/nx.svg?style=svg)](https://circleci.com/gh/nrwl/nx)
 [![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
-[![NPM Version](https://badge.fury.io/js/%40nrwl%2Fworkspace.svg)](https://www.npmjs.com/@nx/workspace)
+[![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
 [![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

package/index.d.ts

@@ -6,7 +6,7 @@ import { useLegacyNxPlugin } from './src/plugins/use-legacy-nx-plugin/use-legacy
 export { configurationGenerator, convertConfigToWebpackPluginGenerator, useLegacyNxPlugin, };
 /** @deprecated Use `configurationGenerator` instead. */
 export declare const webpackProjectGenerator: typeof configurationGenerator;
-/** @deprecated Use NxAppWebpackPlugin from `@nx/webpack/app-plugin` instead. */
+/** @deprecated Use NxAppWebpackPlugin from `@nx/webpack/app-plugin` instead, which can improve graph creation by 150-200ms per file. */
 export declare const NxWebpackPlugin: typeof NxAppWebpackPlugin;
 /** @deprecated Use NxTsconfigPathsWebpackPlugin from `@nx/webpack/tsconfig-paths-plugin` instead. */
 export declare const NxTsconfigPathsWebpackPlugin: typeof _NxTsconfigPathsWebpackPlugin;
@@ -21,5 +21,4 @@ export * from './src/executors/webpack/webpack.impl';
 export * from './src/utils/get-css-module-local-ident';
 export * from './src/utils/with-nx';
 export * from './src/utils/with-web';
-export * from './src/utils/module-federation/public-api';
 export * from './src/utils/e2e-web-server-info-utils';

package/index.js

@@ -13,8 +13,7 @@ Object.defineProperty(exports, "useLegacyNxPlugin", { enumerable: true, get: fun
 // Exported for backwards compatibility in case a plugin is using the old name.
 /** @deprecated Use `configurationGenerator` instead. */
 exports.webpackProjectGenerator = configuration_1.configurationGenerator;
-// TODO(v20): Remove this in favor of deep imports in order to load configs faster (150-200ms faster).
-/** @deprecated Use NxAppWebpackPlugin from `@nx/webpack/app-plugin` instead. */
+/** @deprecated Use NxAppWebpackPlugin from `@nx/webpack/app-plugin` instead, which can improve graph creation by 150-200ms per file. */
 exports.NxWebpackPlugin = nx_app_webpack_plugin_1.NxAppWebpackPlugin;
 /** @deprecated Use NxTsconfigPathsWebpackPlugin from `@nx/webpack/tsconfig-paths-plugin` instead. */
 exports.NxTsconfigPathsWebpackPlugin = nx_tsconfig_paths_webpack_plugin_1.NxTsconfigPathsWebpackPlugin;
@@ -28,5 +27,4 @@ tslib_1.__exportStar(require("./src/executors/webpack/webpack.impl"), exports);
 tslib_1.__exportStar(require("./src/utils/get-css-module-local-ident"), exports);
 tslib_1.__exportStar(require("./src/utils/with-nx"), exports);
 tslib_1.__exportStar(require("./src/utils/with-web"), exports);
-tslib_1.__exportStar(require("./src/utils/module-federation/public-api"), exports);
 tslib_1.__exportStar(require("./src/utils/e2e-web-server-info-utils"), exports);

package/migrations.json

@@ -1,43 +1,19 @@
 {
   "generators": {
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/webpack with @nx/webpack",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
-    "update-17-2-1-webpack-config-setup": {
-      "cli": "nx",
-      "version": "17.2.1-beta.0",
-      "description": "Add webpack.config.js file when webpackConfig is not defined",
-      "implementation": "./src/migrations/update-17-2-1/webpack-config-setup"
-    },
     "update-19-6-3-proxy-config": {
       "cli": "nx",
       "version": "19.6.3-beta.0",
       "description": "Migrate proxy config files to match new format from webpack-dev-server v5.",
       "implementation": "./src/migrations/update-19-6-3/proxy-config"
+    },
+    "update-21-0-0-remove-isolated-config": {
+      "cli": "nx",
+      "version": "21.0.0-beta.11",
+      "description": "Remove isolatedConfig option for @nx/webpack:webpack",
+      "implementation": "./src/migrations/update-21-0-0/remove-isolated-config"
     }
   },
   "packageJsonUpdates": {
-    "16.3.0": {
-      "version": "16.3.0-beta.8",
-      "packages": {
-        "@svgr/webpack": {
-          "version": "^8.0.1",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "16.4.1": {
-      "version": "16.4.1-beta.0",
-      "packages": {
-        "webpack": {
-          "version": "^5.80.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "19.6.0": {
       "version": "19.6.0-beta.1",
       "packages": {
@@ -59,6 +35,28 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.5.0": {
+      "version": "20.5.0-beta.3",
+      "packages": {
+        "sass-loader": {
+          "version": "^16.0.4",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "20.7.1": {
+      "version": "20.7.1-beta.0",
+      "packages": {
+        "webpack": {
+          "version": "5.98.0",
+          "alwaysAddToPackageJson": false
+        },
+        "webpack-dev-server": {
+          "version": "^5.2.1",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "0.0.0-pr-31222-862e973",
+  "version": "0.0.0-pr-31313-387cdca",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -32,19 +32,15 @@
   "dependencies": {
     "@babel/core": "^7.23.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@module-federation/sdk": "^0.6.0",
-    "@module-federation/enhanced": "^0.6.0",
     "ajv": "^8.12.0",
     "autoprefixer": "^10.4.9",
     "babel-loader": "^9.1.2",
     "browserslist": "^4.21.4",
-    "chalk": "^4.1.0",
+    "picocolors": "^1.1.0",
     "copy-webpack-plugin": "^10.2.4",
     "css-loader": "^6.4.0",
     "css-minimizer-webpack-plugin": "^5.0.0",
-    "express": "^4.19.2",
     "fork-ts-checker-webpack-plugin": "7.2.13",
-    "http-proxy-middleware": "^3.0.0",
     "less": "4.1.3",
     "less-loader": "11.1.0",
     "license-webpack-plugin": "^4.0.2",
@@ -55,8 +51,9 @@
     "postcss-import": "~14.1.0",
     "postcss-loader": "^6.1.1",
     "rxjs": "^7.8.0",
-    "sass": "^1.42.1",
-    "sass-loader": "^12.2.0",
+    "sass": "^1.85.0",
+    "sass-embedded": "^1.83.4",
+    "sass-loader": "^16.0.4",
     "source-map-loader": "^5.0.0",
     "style-loader": "^3.3.0",
     "stylus": "^0.64.0",
@@ -65,17 +62,16 @@
     "ts-loader": "^9.3.1",
     "tsconfig-paths-webpack-plugin": "4.0.0",
     "tslib": "^2.3.0",
-    "webpack": "^5.80.0",
-    "webpack-dev-server": "^5.0.4",
+    "webpack": "5.98.0",
+    "webpack-dev-server": "^5.2.1",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "0.0.0-pr-31222-862e973",
-    "@nx/js": "0.0.0-pr-31222-862e973",
-    "@nrwl/webpack": "0.0.0-pr-31222-862e973"
+    "@nx/devkit": "0.0.0-pr-31313-387cdca",
+    "@nx/js": "0.0.0-pr-31313-387cdca"
   },
   "publishConfig": {
     "access": "public"
   },
-  "type": "commonjs",
-  "types": "./index.d.ts"
+  "types": "./index.d.ts",
+  "type": "commonjs"
 }

package/src/executors/dev-server/dev-server.impl.d.ts

@@ -3,5 +3,5 @@ import { WebDevServerOptions } from './schema';
 export declare function devServerExecutor(serveOptions: WebDevServerOptions, context: ExecutorContext): AsyncGenerator<{
     baseUrl: string;
     success: boolean;
-}, any, undefined>;
+}, any, any>;
 export default devServerExecutor;

package/src/executors/dev-server/schema.json

@@ -1,5 +1,6 @@
 {
   "version": 2,
+  "continuous": true,
   "outputCapture": "direct-nodejs",
   "title": "Webpack dev server",
   "description": "Serve an application using webpack.",

package/src/executors/ssr-dev-server/schema.json

@@ -1,5 +1,6 @@
 {
   "version": 2,
+  "continuous": true,
   "outputCapture": "direct-nodejs",
   "title": "Webpack SSR Dev Server",
   "description": "Serve a SSR application using webpack.",

package/src/executors/ssr-dev-server/ssr-dev-server.impl.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ssrDevServerExecutor = ssrDevServerExecutor;
 const devkit_1 = require("@nx/devkit");
-const chalk = require("chalk");
+const pc = require("picocolors");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const wait_until_server_is_listening_1 = require("./lib/wait-until-server-is-listening");
 async function* ssrDevServerExecutor(options, context) {
@@ -26,7 +26,7 @@ async function* ssrDevServerExecutor(options, context) {
         }
         if (nodeStarted && browserBuilt) {
             await (0, wait_until_server_is_listening_1.waitUntilServerIsListening)(options.port);
-            console.log(`[ ${chalk.green('ready')} ] on http://localhost:${options.port}`);
+            console.log(`[ ${pc.green('ready')} ] on http://localhost:${options.port}`);
             yield {
                 ...output,
                 baseUrl: `http://localhost:${options.port}`,

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,
@@ -14,6 +16,7 @@ function normalizeOptions(options, root, projectRoot, sourceRoot) {
         outputFileName: options.outputFileName ?? 'main.js',
         webpackConfig: normalizePluginPath(options.webpackConfig, root),
         fileReplacements: (0, normalize_options_1.normalizeFileReplacements)(root, options.fileReplacements),
+        sassImplementation: options.sassImplementation ?? 'sass',
         optimization: typeof options.optimization !== 'object'
             ? {
                 scripts: options.optimization,

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

@@ -47,9 +47,6 @@ export interface WebpackExecutorOptions {
   extractLicenses?: boolean;
   fileReplacements?: FileReplacement[];
   generatePackageJson?: boolean;
-  // TODO(v20): Remove this option
-  /** @deprecated set webpackConfig and provide an explicit webpack.config.js file (See: https://nx.dev/recipes/webpack/webpack-config-setup) */
-  isolatedConfig?: boolean;
   standardWebpackConfigFunction?: boolean;
   main?: string;
   memoryLimit?: number;
@@ -62,7 +59,7 @@ export interface WebpackExecutorOptions {
   polyfills?: string;
   progress?: boolean;
   runtimeChunk?: boolean;
-  sourceMap?: boolean | 'hidden';
+  sourceMap?: boolean | string;
   statsJson?: boolean;
   target?: string;
   transformers?: TransformerEntry[];
@@ -81,6 +78,7 @@ export interface WebpackExecutorOptions {
   index?: string;
   postcssConfig?: string;
   scripts?: Array<ExtraEntryPointClass | string>;
+  sassImplementation?: 'sass' | 'sass-embedded';
   stylePreprocessorOptions?: any;
   styles?: Array<ExtraEntryPointClass | string>;
   subresourceIntegrity?: boolean;
@@ -95,4 +93,5 @@ export interface NormalizedWebpackExecutorOptions
   root: string;
   projectRoot: string;
   sourceRoot: string;
+  useTsconfigPaths: boolean;
 }

package/src/executors/webpack/schema.json

@@ -70,6 +70,11 @@
       "type": "boolean",
       "description": "Use a separate bundle containing the runtime."
     },
+    "skipTypeChecking": {
+      "alias": "typeCheck",
+      "type": "boolean",
+      "description": "Skip the type checking. Default is `false`."
+    },
     "sourceMap": {
       "description": "Output sourcemaps. Use 'hidden' for use with error reporting tools without generating sourcemap comment.",
       "oneOf": [
@@ -85,6 +90,10 @@
       "type": "boolean",
       "description": "Log progress to the console while building."
     },
+    "poll": {
+      "type": "number",
+      "description": "Enable and define the file watching poll time period."
+    },
     "assets": {
       "type": "array",
       "description": "List of static application assets.",
@@ -135,6 +144,12 @@
       },
       "additionalProperties": false
     },
+    "sassImplementation": {
+      "type": "string",
+      "description": "The implementation of the SASS compiler to use. Can be either `sass` or `sass-embedded`. Defaults to `sass-embedded`.",
+      "enum": ["sass", "sass-embedded"],
+      "default": "sass"
+    },
     "optimization": {
       "description": "Enables optimization of the build output.",
       "oneOf": [
@@ -239,12 +254,6 @@
       "type": "boolean",
       "description": "Generates a 'stats.json' file which can be analyzed using tools such as: 'webpack-bundle-analyzer' or `<https://webpack.github.io/analyse>`."
     },
-    "isolatedConfig": {
-      "type": "boolean",
-      "description": "Do not apply Nx webpack plugins automatically. Plugins need to be applied in the project's webpack.config.js file (e.g. withNx, withReact, etc.).",
-      "default": true,
-      "x-deprecated": "Automatic configuration of Webpack is deprecated in favor of an explicit 'webpack.config.js' file. This option will be removed in Nx 20. See https://nx.dev/recipes/webpack/webpack-config-setup."
-    },
     "standardWebpackConfigFunction": {
       "type": "boolean",
       "description": "Set to true if the webpack config exports a standard webpack function, not an Nx-specific one. See: https://webpack.js.org/configuration/configuration-types/#exporting-a-function",

package/src/executors/webpack/webpack.impl.js

@@ -11,13 +11,8 @@ const fs_1 = require("../../utils/fs");
 const resolve_user_defined_webpack_config_1 = require("../../utils/webpack/resolve-user-defined-webpack-config");
 const normalize_options_1 = require("./lib/normalize-options");
 const config_1 = require("../../utils/config");
-const with_nx_1 = require("../../utils/with-nx");
 const js_1 = require("@nx/js");
-const with_web_1 = require("../../utils/with-web");
 async function getWebpackConfigs(options, context) {
-    if (options.isolatedConfig && !options.webpackConfig) {
-        throw new Error(`Using "isolatedConfig" without a "webpackConfig" is not supported.`);
-    }
     let userDefinedWebpackConfig = null;
     if (options.webpackConfig) {
         userDefinedWebpackConfig = (0, resolve_user_defined_webpack_config_1.resolveUserDefinedWebpackConfig)(options.webpackConfig, (0, js_1.getRootTsConfigPath)());
@@ -25,11 +20,7 @@ async function getWebpackConfigs(options, context) {
             userDefinedWebpackConfig = await userDefinedWebpackConfig;
         }
     }
-    const config = options.isolatedConfig
-        ? {}
-        : (options.target === 'web'
-            ? (0, config_1.composePluginsSync)((0, with_nx_1.withNx)(options), (0, with_web_1.withWeb)(options))
-            : (0, with_nx_1.withNx)(options))({}, { options, context });
+    const config = {};
     if (typeof userDefinedWebpackConfig === 'function' &&
         ((0, config_1.isNxWebpackComposablePlugin)(userDefinedWebpackConfig) ||
             !options.standardWebpackConfigFunction)) {

package/src/generators/convert-to-inferred/utils/build-post-target-transformer.js

@@ -90,14 +90,6 @@ function extractPluginOptions(options, context, configName) {
             }
             delete options.memoryLimit;
         }
-        else if (key === 'isolatedConfig') {
-            context.logger.addLog({
-                executorName: '@nx/webpack:webpack',
-                log: `The 'isolatedConfig' option is deprecated and not supported by the NxAppWebpackPlugin. It was removed from your project configuration.`,
-                project: context.projectName,
-            });
-            delete options.isolatedConfig;
-        }
         else if (key === 'standardWebpackConfigFunction') {
             delete options.standardWebpackConfigFunction;
         }

package/src/generators/convert-to-inferred/utils/serve-post-target-transformer.js

@@ -156,7 +156,10 @@ function extractDevServerOptions(options, context) {
     return devServerOptions;
 }
 function applyDefaults(options, buildOptions) {
-    if (options.port === undefined) {
+    if (!options) {
+        options = {};
+    }
+    if (options?.port === undefined) {
         options.port = 4200;
     }
     options.headers = { 'Access-Control-Allow-Origin': '*' };

package/src/generators/init/init.js

@@ -15,7 +15,7 @@ async function webpackInitGeneratorInternal(tree, schema) {
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        await (0, add_plugin_1.addPluginV1)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/webpack/plugin', plugin_1.createNodes, {
+        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/webpack/plugin', plugin_1.createNodesV2, {
             buildTargetName: [
                 'build',
                 'webpack:build',
@@ -37,6 +37,16 @@ async function webpackInitGeneratorInternal(tree, schema) {
                 'webpack-preview',
                 'preview-webpack',
             ],
+            buildDepsTargetName: [
+                'build-deps',
+                'webpack:build-deps',
+                'webpack-build-deps',
+            ],
+            watchDepsTargetName: [
+                'watch-deps',
+                'webpack:watch-deps',
+                'webpack-watch-deps',
+            ],
         }, schema.updatePackageScripts);
     }
     let installTask = () => { };

package/src/migrations/update-21-0-0/remove-isolated-config.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+async function default_1(tree) {
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/webpack:webpack', (options, projectName, targetName, configurationName) => {
+        // Only handle webpack config for default configuration
+        if (configurationName)
+            return;
+        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        if (!options.webpackConfig) {
+            delete options['isolatedConfig'];
+            options.webpackConfig = `${projectConfiguration.root}/webpack.config.js`;
+            tree.write(options.webpackConfig, options.target === 'web'
+                ? `
+const { composePlugins, withNx, withWeb } = require('@nx/webpack');
+
+// Nx plugins for webpack.
+module.exports = composePlugins(withNx(), withWeb(), (config) => {
+  // Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file.
+  // See: https://nx.dev/recipes/webpack/webpack-config-setup
+  return config;
+});
+`
+                : `
+const { composePlugins, withNx } = require('@nx/webpack');
+
+// Nx plugins for webpack.
+module.exports = composePlugins(withNx(), (config) => {
+  // Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file.
+  // See: https://nx.dev/recipes/webpack/webpack-config-setup
+  return config;
+});
+        `);
+            projectConfiguration.targets[targetName].options = options;
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
+        }
+    });
+    await (0, devkit_1.formatFiles)(tree);
+}

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

@@ -14,10 +14,16 @@ 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 utils_1 = require("./utils");
 const IGNORED_WEBPACK_WARNINGS = [
     /The comment file/i,
     /could not find any license/i,
 ];
+const extensionAlias = {
+    '.js': ['.ts', '.js'],
+    '.mjs': ['.mts', '.mjs'],
+};
 const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
 const mainFields = ['module', 'main'];
 function applyBaseConfig(options, config = {}, { useNormalizedEntry, } = {}) {
@@ -30,7 +36,7 @@ function applyBaseConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     options.transformers ??= [];
     applyNxIndependentConfig(options, config);
     // Some of the options only work during actual tasks, not when reading the webpack config during CreateNodes.
-    if (!process.env['NX_TASK_TARGET_PROJECT'])
+    if (global.NX_GRAPH_CREATION)
         return;
     applyNxDependentConfig(options, config, { useNormalizedEntry });
 }
@@ -60,11 +66,7 @@ function applyNxIndependentConfig(options, config) {
     config.cache =
         options.target === 'node' && options.watch ? { type: 'memory' } : undefined;
     config.devtool =
-        options.sourceMap === 'hidden'
-            ? 'hidden-source-map'
-            : options.sourceMap
-                ? 'source-map'
-                : false;
+        options.sourceMap === true ? 'source-map' : options.sourceMap;
     config.output = {
         ...config.output,
         libraryTarget: config.output?.libraryTarget ??
@@ -100,6 +102,7 @@ function applyNxIndependentConfig(options, config) {
     config.experiments = { ...config.experiments, cacheUnaffected: true };
     config.ignoreWarnings = [
         (x) => IGNORED_WEBPACK_WARNINGS.some((r) => typeof x === 'string' ? r.test(x) : r.test(x.message)),
+        ...(config.ignoreWarnings ?? []),
     ];
     config.optimization = {
         ...config.optimization,
@@ -179,8 +182,17 @@ 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 but allow it to run during serve
+    if ((!options?.skipTypeChecking && !isUsingTsSolution) ||
+        (isUsingTsSolution &&
+            options?.skipTypeChecking === false &&
+            process.env['WEBPACK_SERVE'])) {
         const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
         plugins.push(new ForkTsCheckerWebpackPlugin({
             typescript: {
@@ -267,7 +279,31 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
     const externals = [];
     if (options.target === 'node' && options.externalDependencies === 'all') {
         const modulesDir = `${options.root}/node_modules`;
-        externals.push(nodeExternals({ modulesDir }));
+        const graph = options.projectGraph;
+        const projectName = options.projectName;
+        const deps = graph?.dependencies?.[projectName] ?? [];
+        // Collect non-buildable TS project references so that they are bundled
+        // in the final output. This is needed for projects that are not buildable
+        // but are referenced by buildable projects. This is needed for the new TS
+        // solution setup.
+        const nonBuildableWorkspaceLibs = isUsingTsSolution
+            ? deps
+                .filter((dep) => {
+                const node = graph.nodes?.[dep.target];
+                if (!node || node.type !== 'lib')
+                    return false;
+                const hasBuildTarget = 'build' in (node.data?.targets ?? {});
+                if (hasBuildTarget) {
+                    return false;
+                }
+                // If there is no build target we check the package exports to see if they reference
+                // source files
+                return !(0, utils_1.isBuildableLibrary)(node);
+            })
+                .map((dep) => graph.nodes?.[dep.target]?.data?.metadata?.js?.packageName)
+                .filter((name) => !!name)
+            : [];
+        externals.push(nodeExternals({ modulesDir, allowlist: nonBuildableWorkspaceLibs }));
     }
     else if (Array.isArray(options.externalDependencies)) {
         externals.push(function (ctx, callback) {
@@ -282,6 +318,10 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
     config.resolve = {
         ...config.resolve,
         extensions: [...(config?.resolve?.extensions ?? []), ...extensions],
+        extensionAlias: {
+            ...(config.resolve?.extensionAlias ?? {}),
+            ...extensionAlias,
+        },
         alias: {
             ...(config.resolve?.alias ?? {}),
             ...(options.fileReplacements?.reduce((aliases, replacement) => ({