@nx/angular 18.0.2 → 18.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "18.0.2",
+  "version": "18.0.4",
   "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,16 +78,16 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "18.0.2",
-    "@nx/cypress": "18.0.2",
-    "@nx/jest": "18.0.2",
-    "@nx/js": "18.0.2",
-    "@nx/eslint": "18.0.2",
-    "@nx/webpack": "18.0.2",
-    "@nx/web": "18.0.2",
-    "@nx/workspace": "18.0.2",
+    "@nx/devkit": "18.0.4",
+    "@nx/cypress": "18.0.4",
+    "@nx/jest": "18.0.4",
+    "@nx/js": "18.0.4",
+    "@nx/eslint": "18.0.4",
+    "@nx/webpack": "18.0.4",
+    "@nx/web": "18.0.4",
+    "@nx/workspace": "18.0.4",
     "piscina": "^4.2.1",
-    "@nrwl/angular": "18.0.2"
+    "@nrwl/angular": "18.0.4"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

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

@@ -16,13 +16,7 @@ const buildable_libs_1 = require("../utilities/buildable-libs");
 const webpack_1 = require("../utilities/webpack");
 const lib_1 = require("./lib");
 function executeDevServerBuilder(rawOptions, context) {
-    if (rawOptions.esbuildMiddleware?.length > 0) {
-        const { major: angularMajorVersion, version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
-        if (angularMajorVersion < 17) {
-            throw new Error((0, devkit_1.stripIndents) `The "esbuildMiddleware" option is only supported in Angular >= 17.0.0. You are currently using "${angularVersion}".
-        You can resolve this error by removing the "esbuildMiddleware" option or by migrating to Angular 17.0.0.`);
-        }
-    }
+    (0, lib_1.validateOptions)(rawOptions);
     process.env.NX_TSCONFIG_PATH = (0, js_1.getRootTsConfigPath)();
     const options = (0, lib_1.normalizeOptions)(rawOptions);
     const parsedBuildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, {
@@ -106,7 +100,8 @@ function executeDevServerBuilder(rawOptions, context) {
         (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))),
         (0, rxjs_1.from)((0, esbuild_extensions_1.loadPlugins)(buildTargetOptions.plugins, buildTargetOptions.tsConfig)),
         (0, rxjs_1.from)((0, esbuild_extensions_1.loadMiddleware)(options.esbuildMiddleware, buildTargetOptions.tsConfig)),
-    ]).pipe((0, operators_2.switchMap)(([{ executeDevServerBuilder }, plugins, middleware]) => executeDevServerBuilder(delegateBuilderOptions, context, {
+        (0, rxjs_1.from)(loadIndexHtmlFileTransformer(pathToIndexFileTransformer, buildTargetOptions.tsConfig, context, isUsingWebpackBuilder)),
+    ]).pipe((0, operators_2.switchMap)(([{ executeDevServerBuilder }, plugins, middleware, indexHtmlTransformer,]) => executeDevServerBuilder(delegateBuilderOptions, context, {
         webpackConfiguration: isUsingWebpackBuilder
             ? async (baseWebpackConfig) => {
                 if (!buildLibsFromSource) {
@@ -129,9 +124,9 @@ function executeDevServerBuilder(rawOptions, context) {
                 return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, buildTargetOptions, context.target);
             }
             : undefined,
-        ...(pathToIndexFileTransformer
+        ...(indexHtmlTransformer
             ? {
-                indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, buildTargetOptions.tsConfig, context.target),
+                indexHtml: indexHtmlTransformer,
             }
             : {}),
     }, {
@@ -154,6 +149,14 @@ function getDelegateBuilderOptions(options) {
     delete delegateBuilderOptions.buildLibsFromSource;
     return delegateBuilderOptions;
 }
+async function loadIndexHtmlFileTransformer(pathToIndexFileTransformer, tsConfig, context, isUsingWebpackBuilder) {
+    if (!pathToIndexFileTransformer) {
+        return undefined;
+    }
+    return isUsingWebpackBuilder
+        ? (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, tsConfig, context.target)
+        : await (0, esbuild_extensions_1.loadIndexHtmlTransformer)(pathToIndexFileTransformer, tsConfig);
+}
 const executorToBuilderMap = new Map([
     [
         '@nx/angular:browser-esbuild',

package/src/builders/dev-server/lib/index.d.ts

@@ -1 +1,2 @@
 export * from './normalize-options';
+export * from './validate-options';

package/src/builders/dev-server/lib/index.js

@@ -2,3 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./normalize-options"), exports);
+tslib_1.__exportStar(require("./validate-options"), exports);

package/src/builders/dev-server/lib/validate-options.d.ts

@@ -0,0 +1,2 @@
+import type { Schema } from '../schema';
+export declare function validateOptions(options: Schema): void;

package/src/builders/dev-server/lib/validate-options.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOptions = void 0;
+const devkit_1 = require("@nx/devkit");
+const semver_1 = require("semver");
+const angular_version_utils_1 = require("../../../executors/utilities/angular-version-utils");
+function validateOptions(options) {
+    const { major: angularMajorVersion, version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    if ((0, semver_1.lt)(angularVersion, '16.1.0') && options.forceEsbuild !== undefined) {
+        throw new Error((0, devkit_1.stripIndents) `The "forceEsbuild" option is only supported in Angular >= 16.1.0. You are currently using "${angularVersion}".
+      You can resolve this error by removing the "forceEsbuild" option or by migrating to Angular 16.1.0.`);
+    }
+    if (angularMajorVersion < 17 && options.esbuildMiddleware?.length > 0) {
+        throw new Error((0, devkit_1.stripIndents) `The "esbuildMiddleware" option is only supported in Angular >= 17.0.0. You are currently using "${angularVersion}".
+      You can resolve this error by removing the "esbuildMiddleware" option or by migrating to Angular 17.0.0.`);
+    }
+}
+exports.validateOptions = validateOptions;

package/src/builders/dev-server/schema.d.ts

@@ -16,6 +16,7 @@ interface BaseSchema {
   hmr?: boolean;
   watch?: boolean;
   poll?: number;
+  forceEsbuild?: boolean;
   buildLibsFromSource?: boolean;
   esbuildMiddleware?: string[];
 }

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

@@ -111,6 +111,11 @@
       "type": "number",
       "description": "Enable and define the file watching poll time period in milliseconds."
     },
+    "forceEsbuild": {
+      "type": "boolean",
+      "description": "Force the development server to use the 'browser-esbuild' builder when building. This is a developer preview option for the esbuild-based build system. _Note: this is only supported in Angular versions >= 16.1.0_.",
+      "default": false
+    },
     "buildLibsFromSource": {
       "type": "boolean",
       "description": "Read buildable libraries from source instead of building them separately. If not set, it will take the value specified in the `browserTarget` options, or it will default to `true` if it's also not set in the `browserTarget` options.",

package/src/executors/module-federation-dev-server/lib/build-static-remotes.d.ts

@@ -1,7 +1,4 @@
 import { type Schema } from '../schema';
 import { type ExecutorContext } from '@nx/devkit';
-export declare function buildStaticRemotes(remotes: {
-    remotePorts: any[];
-    staticRemotes: string[];
-    devRemotes: string[];
-}, nxBin: any, context: ExecutorContext, options: Schema): Promise<void>;
+import type { StaticRemotesConfig } from './parse-static-remotes-config';
+export declare function buildStaticRemotes(staticRemotesConfig: StaticRemotesConfig, nxBin: any, context: ExecutorContext, options: Schema): Promise<void>;

package/src/executors/module-federation-dev-server/lib/build-static-remotes.js

@@ -3,22 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildStaticRemotes = void 0;
 const devkit_1 = require("@nx/devkit");
 const child_process_1 = require("child_process");
-async function buildStaticRemotes(remotes, nxBin, context, options) {
-    if (!remotes.staticRemotes ||
-        (Array.isArray(remotes.staticRemotes) && !remotes.staticRemotes.length)) {
+async function buildStaticRemotes(staticRemotesConfig, nxBin, context, options) {
+    if (!staticRemotesConfig.remotes.length) {
         return;
     }
     const mappedLocationOfRemotes = {};
-    for (const app of remotes.staticRemotes) {
-        mappedLocationOfRemotes[app] = `http${options.ssl ? 's' : ''}://${options.host}:${options.staticRemotesPort}/${app}`;
+    for (const app of staticRemotesConfig.remotes) {
+        mappedLocationOfRemotes[app] = `http${options.ssl ? 's' : ''}://${options.host}:${options.staticRemotesPort}/${staticRemotesConfig.config[app].urlSegment}`;
     }
     process.env.NX_MF_DEV_SERVER_STATIC_REMOTES = JSON.stringify(mappedLocationOfRemotes);
     await new Promise((res) => {
-        devkit_1.logger.info(`NX Building ${remotes.staticRemotes.length} static remotes...`);
+        devkit_1.logger.info(`NX Building ${staticRemotesConfig.remotes.length} static remotes...`);
         const staticProcess = (0, child_process_1.fork)(nxBin, [
             'run-many',
             `--target=build`,
-            `--projects=${remotes.staticRemotes.join(',')}`,
+            `--projects=${staticRemotesConfig.remotes.join(',')}`,
             ...(context.configurationName
                 ? [`--configuration=${context.configurationName}`]
                 : []),
@@ -32,7 +31,7 @@ async function buildStaticRemotes(remotes, nxBin, context, options) {
             const stdoutString = data.toString().replace(ANSII_CODE_REGEX, '');
             if (stdoutString.includes('Successfully ran target build')) {
                 staticProcess.stdout.removeAllListeners('data');
-                devkit_1.logger.info(`NX Built ${remotes.staticRemotes.length} static remotes`);
+                devkit_1.logger.info(`NX Built ${staticRemotesConfig.remotes.length} static remotes`);
                 res();
             }
         });

package/src/executors/module-federation-dev-server/lib/index.d.ts

@@ -1,4 +1,5 @@
 export * from './build-static-remotes';
 export * from './normalize-options';
+export * from './parse-static-remotes-config';
 export * from './start-dev-remotes';
 export * from './start-static-remotes-file-server';

package/src/executors/module-federation-dev-server/lib/index.js

@@ -3,5 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./build-static-remotes"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
+tslib_1.__exportStar(require("./parse-static-remotes-config"), exports);
 tslib_1.__exportStar(require("./start-dev-remotes"), exports);
 tslib_1.__exportStar(require("./start-static-remotes-file-server"), exports);

package/src/executors/module-federation-dev-server/lib/parse-static-remotes-config.d.ts

@@ -0,0 +1,11 @@
+import type { ExecutorContext } from '@nx/devkit';
+export type StaticRemoteConfig = {
+    basePath: string;
+    outputPath: string;
+    urlSegment: string;
+};
+export type StaticRemotesConfig = {
+    remotes: string[];
+    config: Record<string, StaticRemoteConfig> | undefined;
+};
+export declare function parseStaticRemotesConfig(staticRemotes: string[] | undefined, context: ExecutorContext): StaticRemotesConfig;

package/src/executors/module-federation-dev-server/lib/parse-static-remotes-config.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseStaticRemotesConfig = void 0;
+const path_1 = require("path");
+function parseStaticRemotesConfig(staticRemotes, context) {
+    if (!staticRemotes?.length) {
+        return { remotes: [], config: undefined };
+    }
+    const config = {};
+    for (const app of staticRemotes) {
+        const outputPath = context.projectGraph.nodes[app].data.targets['build'].options.outputPath;
+        const basePath = (0, path_1.dirname)(outputPath);
+        const urlSegment = (0, path_1.basename)(outputPath);
+        config[app] = { basePath, outputPath, urlSegment };
+    }
+    return { remotes: staticRemotes, config };
+}
+exports.parseStaticRemotesConfig = parseStaticRemotesConfig;

package/src/executors/module-federation-dev-server/lib/start-static-remotes-file-server.d.ts

@@ -1,10 +1,7 @@
 import { type ExecutorContext } from '@nx/devkit';
 import { type Schema } from '../schema';
-export declare function startStaticRemotesFileServer(remotes: {
-    remotePorts: any[];
-    staticRemotes: string[];
-    devRemotes: string[];
-}, context: ExecutorContext, options: Schema): AsyncGenerator<{
+import type { StaticRemotesConfig } from './parse-static-remotes-config';
+export declare function startStaticRemotesFileServer(staticRemotesConfig: StaticRemotesConfig, context: ExecutorContext, options: Schema): AsyncGenerator<{
     success: boolean;
     baseUrl: string;
 }, {

package/src/executors/module-federation-dev-server/lib/start-static-remotes-file-server.js

@@ -5,26 +5,24 @@ const devkit_1 = require("@nx/devkit");
 const file_server_impl_1 = require("@nx/web/src/executors/file-server/file-server.impl");
 const path_1 = require("path");
 const fs_1 = require("fs");
-function startStaticRemotesFileServer(remotes, context, options) {
+function startStaticRemotesFileServer(staticRemotesConfig, context, options) {
     let shouldMoveToCommonLocation = false;
     let commonOutputDirectory;
-    for (const app of remotes.staticRemotes) {
-        const outputPath = context.projectGraph.nodes[app].data.targets['build'].options.outputPath;
-        const directoryOfOutputPath = (0, path_1.dirname)(outputPath);
+    for (const app of staticRemotesConfig.remotes) {
+        const remoteBasePath = staticRemotesConfig.config[app].basePath;
         if (!commonOutputDirectory) {
-            commonOutputDirectory = directoryOfOutputPath;
+            commonOutputDirectory = remoteBasePath;
         }
-        else if (commonOutputDirectory !== directoryOfOutputPath ||
-            !outputPath.endsWith(app)) {
+        else if (commonOutputDirectory !== remoteBasePath) {
             shouldMoveToCommonLocation = true;
+            break;
         }
     }
     if (shouldMoveToCommonLocation) {
         commonOutputDirectory = (0, path_1.join)(devkit_1.workspaceRoot, 'tmp/static-remotes');
-        for (const app of remotes.staticRemotes) {
-            const outputPath = context.projectGraph.nodes[app].data.targets['build'].options
-                .outputPath;
-            (0, fs_1.cpSync)(outputPath, (0, path_1.join)(commonOutputDirectory, app), {
+        for (const app of staticRemotesConfig.remotes) {
+            const remoteConfig = staticRemotesConfig.config[app];
+            (0, fs_1.cpSync)(remoteConfig.outputPath, (0, path_1.join)(commonOutputDirectory, remoteConfig.urlSegment), {
                 force: true,
                 recursive: true,
             });

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

@@ -68,10 +68,11 @@ async function* moduleFederationDevServerExecutor(schema, context) {
             }
         }, options.staticRemotesPort);
     }
-    await (0, lib_1.buildStaticRemotes)(remotes, nxBin, context, options);
+    const staticRemotesConfig = (0, lib_1.parseStaticRemotesConfig)(remotes.staticRemotes, context);
+    await (0, lib_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options);
     const devRemoteIters = await (0, lib_1.startDevRemotes)(remotes, workspaceProjects, options, context);
     const staticRemotesIter = remotes.staticRemotes.length > 0
-        ? (0, lib_1.startStaticRemotesFileServer)(remotes, context, options)
+        ? (0, lib_1.startStaticRemotesFileServer)(staticRemotesConfig, context, options)
         : undefined;
     const removeBaseUrlEmission = (iter) => (0, async_iterable_1.mapAsyncIterable)(iter, (v) => ({
         ...v,

package/src/generators/setup-ssr/files/ngmodule/base/src/__main__

@@ -1 +1 @@
-export { <%= rootModuleClassName %> } from './app/<%= rootModuleFileName.slice(0, -3) %>';
+export { <%= rootModuleClassName %> as default } from './app/<%= rootModuleFileName.slice(0, -3) %>';

package/src/generators/setup-ssr/files/server/application-builder/__serverFileName__

@@ -3,7 +3,7 @@ import { CommonEngine } from '@angular/ssr';
 import express from 'express';
 import { fileURLToPath } from 'node:url';
 import { dirname, join, resolve } from 'node:path';
-import <% if (standalone) { %>bootstrap<% } else { %>{ <%= rootModuleClassName %> }<% } %> from './src/<%= main.slice(0, -3) %>';
+import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './src/<%= main.slice(0, -3) %>';
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {

package/src/generators/setup-ssr/files/server/server-builder/pre-v17/__serverFileName__

@@ -5,7 +5,7 @@ import { ngExpressEngine } from '@nguniversal/express-engine';
 import * as express from 'express';
 import { existsSync } from 'fs';
 import { join } from 'path';
-import <% if (standalone) { %>bootstrap<% } else { %>{ <%= rootModuleClassName %> }<% } %> from './src/<%= main.slice(0, -3) %>';
+import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './src/<%= main.slice(0, -3) %>';
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {

package/src/generators/setup-ssr/files/server/server-builder/v17+/__serverFileName__

@@ -5,7 +5,7 @@ import { CommonEngine } from '@angular/ssr';
 import * as express from 'express';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import <% if (standalone) { %>bootstrap<% } else { %>{ <%= rootModuleClassName %> }<% } %> from './src/<%= main.slice(0, -3) %>';
+import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './src/<%= main.slice(0, -3) %>';
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {