@nx/webpack 21.2.0 → 21.2.2

package/package.json

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

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

@@ -71,8 +71,28 @@ function applyNxIndependentConfig(options, config) {
         options.sourceMap === true ? 'source-map' : options.sourceMap;
     config.output = {
         ...config.output,
-        libraryTarget: config.output?.libraryTarget ??
-            (options.target === 'node' ? 'commonjs' : undefined),
+        libraryTarget: (() => {
+            const existingOutputConfig = config.output;
+            const existingLibraryTarget = existingOutputConfig?.libraryTarget;
+            const existingLibraryType = typeof existingOutputConfig?.library === 'object' &&
+                'type' in existingOutputConfig?.library
+                ? existingOutputConfig?.library?.type
+                : undefined;
+            // If user is using modern library.type, don't set the deprecated libraryTarget
+            if (existingLibraryType !== undefined) {
+                return undefined;
+            }
+            // If user has set libraryTarget explicitly, use it
+            if (existingLibraryTarget !== undefined) {
+                return existingLibraryTarget;
+            }
+            // Set defaults based on target when user hasn't configured anything
+            if (options.target === 'node')
+                return 'commonjs';
+            if (options.target === 'async-node')
+                return 'commonjs-module';
+            return undefined;
+        })(),
         path: config.output?.path ??
             (options.outputPath
                 ? // If path is relative, it is relative from project root (aka cwd).

package/src/plugins/plugin.js

@@ -168,6 +168,11 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
             spa: true,
         },
     };
+    // for `convert-to-inferred` we need to leave the port undefined or the options will not match
+    if (webpackConfig.devServer?.port && webpackConfig.devServer?.port !== 4200) {
+        targets[options.serveStaticTargetName].options.port =
+            webpackConfig.devServer.port;
+    }
     if (isTsSolutionSetup) {
         targets[options.buildTargetName].syncGenerators = [
             '@nx/js:typescript-sync',

package/src/utils/e2e-web-server-info-utils.js

@@ -19,7 +19,7 @@ async function getWebpackE2EWebServerInfo(tree, projectName, configFilePath, isP
         defaultServeTargetName: 'serve',
         defaultServeStaticTargetName: 'serve-static',
         defaultE2EWebServerAddress: `http://localhost:${e2ePort}`,
-        defaultE2ECiBaseUrl: 'http://localhost:4200',
+        defaultE2ECiBaseUrl: `http://localhost:${e2ePort}`,
         defaultE2EPort: e2ePort,
     }, isPluginBeingAdded);
 }