@nx/angular 17.2.0-beta.11 → 17.2.0-beta.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "17.2.0-beta.11",
+  "version": "17.2.0-beta.12",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -78,15 +78,15 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "17.2.0-beta.11",
-    "@nx/cypress": "17.2.0-beta.11",
-    "@nx/jest": "17.2.0-beta.11",
-    "@nx/js": "17.2.0-beta.11",
-    "@nx/eslint": "17.2.0-beta.11",
-    "@nx/webpack": "17.2.0-beta.11",
-    "@nx/web": "17.2.0-beta.11",
-    "@nx/workspace": "17.2.0-beta.11",
-    "@nrwl/angular": "17.2.0-beta.11"
+    "@nx/devkit": "17.2.0-beta.12",
+    "@nx/cypress": "17.2.0-beta.12",
+    "@nx/jest": "17.2.0-beta.12",
+    "@nx/js": "17.2.0-beta.12",
+    "@nx/eslint": "17.2.0-beta.12",
+    "@nx/webpack": "17.2.0-beta.12",
+    "@nx/web": "17.2.0-beta.12",
+    "@nx/workspace": "17.2.0-beta.12",
+    "@nrwl/angular": "17.2.0-beta.12"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

package/src/builders/dev-server/dev-server.impl.js

@@ -7,6 +7,7 @@ const webpack_nx_build_coordination_plugin_1 = require("@nx/webpack/src/plugins/
 const fs_1 = require("fs");
 const operators_1 = require("nx/src/project-graph/operators");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
+const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const operators_2 = require("rxjs/operators");
 const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
@@ -56,6 +57,7 @@ function executeDevServerBuilder(rawOptions, context) {
             target: parsedBuildTarget.target,
         });
         dependencies = foundDependencies;
+        const relativeTsConfigPath = (0, devkit_1.normalizePath)((0, path_1.relative)(context.workspaceRoot, tsConfigPath));
         // We can't just pass the tsconfig path in memory to the angular builder
         // function because we can't pass the build target options to it, the build
         // targets options will be retrieved by the builder from the project
@@ -65,14 +67,14 @@ function executeDevServerBuilder(rawOptions, context) {
         const originalGetTargetOptions = context.getTargetOptions;
         context.getTargetOptions = async (target) => {
             const options = await originalGetTargetOptions(target);
-            options.tsConfig = tsConfigPath;
+            options.tsConfig = relativeTsConfigPath;
             return options;
         };
         // The buildTargetConfiguration also needs to use the generated tsconfig path
         // otherwise the build will fail if customWebpack function/file is referencing
         // local libs. This synchronize the behavior with webpack-browser and
         // webpack-server implementation.
-        buildTargetOptions.tsConfig = tsConfigPath;
+        buildTargetOptions.tsConfig = relativeTsConfigPath;
     }
     const delegateBuilderOptions = getDelegateBuilderOptions(options);
     const isUsingWebpackBuilder = ![

package/src/builders/webpack-browser/webpack-browser.impl.js

@@ -7,6 +7,7 @@ const fs_1 = require("fs");
 const configuration_1 = require("nx/src/config/configuration");
 const operators_1 = require("nx/src/project-graph/operators");
 const utils_1 = require("nx/src/tasks-runner/utils");
+const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const operators_2 = require("rxjs/operators");
 const buildable_libs_1 = require("../utilities/buildable-libs");
@@ -40,7 +41,7 @@ function executeWebpackBrowserBuilder(options, context) {
         projectGraph = (0, devkit_1.readCachedProjectGraph)();
         const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(delegateBuilderOptions.tsConfig, context, { projectGraph });
         dependencies = foundDependencies;
-        delegateBuilderOptions.tsConfig = tsConfigPath;
+        delegateBuilderOptions.tsConfig = (0, devkit_1.normalizePath)((0, path_1.relative)(context.workspaceRoot, tsConfigPath));
     }
     return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeBrowserBuilder }) => executeBrowserBuilder(delegateBuilderOptions, context, {
         webpackConfiguration: (baseWebpackConfig) => {

package/src/builders/webpack-server/webpack-server.impl.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeWebpackServerBuilder = void 0;
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
+const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const buildable_libs_1 = require("../utilities/buildable-libs");
@@ -50,7 +51,7 @@ function executeWebpackServerBuilder(options, context) {
     options.buildLibsFromSource ??= true;
     if (!options.buildLibsFromSource) {
         const { tsConfigPath } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(options.tsConfig, context);
-        options.tsConfig = tsConfigPath;
+        options.tsConfig = (0, devkit_1.normalizePath)((0, path_1.relative)(context.workspaceRoot, tsConfigPath));
     }
     return buildServerApp(options, context);
 }

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -62,6 +62,9 @@ async function* moduleFederationDevServerExecutor(schema, context) {
             if (remotePort >= portToUse) {
                 return remotePort + 1;
             }
+            else {
+                return portToUse;
+            }
         }, options.staticRemotesPort);
     }
     await (0, lib_1.buildStaticRemotes)(remotes, nxBin, context, options);