@nx/angular 20.2.0-canary.20241203-6b87005 → 20.2.0-canary.20241205-15060e3

package/generators.json

@@ -73,7 +73,8 @@
       "factory": "./src/generators/remote/remote",
       "schema": "./src/generators/remote/schema.json",
       "x-type": "application",
-      "description": "Generate a Remote Angular Module Federation Application."
+      "description": "Generate a Remote Angular Module Federation Application.",
+      "aliases": ["producer"]
     },
     "move": {
       "factory": "./src/generators/move/move#angularMoveGenerator",
@@ -91,7 +92,8 @@
       "factory": "./src/generators/host/host",
       "schema": "./src/generators/host/schema.json",
       "x-type": "application",
-      "description": "Generate a Host Angular Module Federation Application."
+      "description": "Generate a Host Angular Module Federation Application.",
+      "aliases": ["consumer"]
     },
     "ng-add": {
       "factory": "./src/generators/ng-add/ng-add",

package/migrations.json

@@ -292,7 +292,7 @@
       "cli": "nx",
       "version": "20.2.0-beta.5",
       "requires": {
-        "@angular/core": ">=19.0.0-rc.1"
+        "@angular/core": ">=19.0.0"
       },
       "description": "Add the '@angular/localize/init' polyfill to the 'polyfills' option of targets using esbuild-based executors.",
       "factory": "./src/migrations/update-20-2-0/add-localize-polyfill-to-targets"
@@ -301,10 +301,19 @@
       "cli": "nx",
       "version": "20.2.0-beta.5",
       "requires": {
-        "@angular/core": ">=19.0.0-rc.1"
+        "@angular/core": ">=19.0.0"
       },
       "description": "Update '@angular/ssr' import paths to use the new '/node' entry point when 'CommonEngine' is detected.",
       "factory": "./src/migrations/update-20-2-0/update-angular-ssr-imports-to-use-node-entry-point"
+    },
+    "disable-angular-eslint-prefer-standalone": {
+      "cli": "nx",
+      "version": "20.2.0-beta.6",
+      "requires": {
+        "@angular/core": ">=19.0.0"
+      },
+      "description": "Disable the Angular ESLint prefer-standalone rule if not set.",
+      "factory": "./src/migrations/update-20-2-0/disable-angular-eslint-prefer-standalone"
     }
   },
   "packageJsonUpdates": {
@@ -1284,19 +1293,6 @@
         }
       }
     },
-    "20.2.0-analog": {
-      "version": "20.2.0-beta.5",
-      "packages": {
-        "@analogjs/vitest-angular": {
-          "version": "~1.10.0-beta.6",
-          "alwaysAddToPackageJson": false
-        },
-        "@analogjs/vite-plugin-angular": {
-          "version": "~1.10.0-beta.6",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "20.2.0-jest": {
       "version": "20.2.0-beta.5",
       "requires": {
@@ -1341,6 +1337,19 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.2.0-analog": {
+      "version": "20.2.0-beta.7",
+      "packages": {
+        "@analogjs/vitest-angular": {
+          "version": "~1.10.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@analogjs/vite-plugin-angular": {
+          "version": "~1.10.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "20.2.0-canary.20241203-6b87005",
+  "version": "20.2.0-canary.20241205-15060e3",
   "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, Playwright 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- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -71,20 +71,20 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "20.2.0-canary.20241203-6b87005",
-    "@nx/js": "20.2.0-canary.20241203-6b87005",
-    "@nx/eslint": "20.2.0-canary.20241203-6b87005",
-    "@nx/webpack": "20.2.0-canary.20241203-6b87005",
-    "@nx/module-federation": "20.2.0-canary.20241203-6b87005",
-    "@nx/web": "20.2.0-canary.20241203-6b87005",
-    "@nx/workspace": "20.2.0-canary.20241203-6b87005",
+    "@nx/devkit": "20.2.0-canary.20241205-15060e3",
+    "@nx/js": "20.2.0-canary.20241205-15060e3",
+    "@nx/eslint": "20.2.0-canary.20241205-15060e3",
+    "@nx/webpack": "20.2.0-canary.20241205-15060e3",
+    "@nx/module-federation": "20.2.0-canary.20241205-15060e3",
+    "@nx/web": "20.2.0-canary.20241205-15060e3",
+    "@nx/workspace": "20.2.0-canary.20241205-15060e3",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {
-    "@angular-devkit/build-angular": ">= 16.0.0 < 19.0.0",
-    "@angular-devkit/core": ">= 16.0.0 < 19.0.0",
-    "@angular-devkit/schematics": ">= 16.0.0 < 19.0.0",
-    "@schematics/angular": ">= 16.0.0 < 19.0.0",
+    "@angular-devkit/build-angular": ">= 17.0.0 < 20.0.0",
+    "@angular-devkit/core": ">= 17.0.0 < 20.0.0",
+    "@angular-devkit/schematics": ">= 17.0.0 < 20.0.0",
+    "@schematics/angular": ">= 17.0.0 < 20.0.0",
     "rxjs": "^6.5.3 || ^7.5.0"
   },
   "publishConfig": {

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

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

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

@@ -1,7 +1,5 @@
 "use strict";
 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("./start-dev-remotes"), exports);
-tslib_1.__exportStar(require("./start-static-remotes-file-server"), exports);

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

@@ -21,6 +21,7 @@ function normalizeOptions(schema) {
         liveReload: schema.liveReload ?? true,
         open: schema.open ?? false,
         ssl: schema.ssl ?? false,
+        verbose: schema.verbose ?? false,
         sslCert: schema.sslCert ? (0, path_1.join)(devkit_1.workspaceRoot, schema.sslCert) : undefined,
         sslKey: schema.sslKey ? (0, path_1.join)(devkit_1.workspaceRoot, schema.sslKey) : undefined,
     };

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

@@ -1,5 +1,5 @@
 import { type Schema } from '../schema';
 import { type ExecutorContext, type ProjectConfiguration } from '@nx/devkit';
-export declare function startRemotes(remotes: string[], workspaceProjects: Record<string, ProjectConfiguration>, options: Schema, context: ExecutorContext, target?: 'serve' | 'serve-static'): Promise<AsyncIterable<{
+export declare function startRemotes(remotes: string[], workspaceProjects: Record<string, ProjectConfiguration>, options: Pick<Schema, 'devRemotes' | 'verbose'>, context: ExecutorContext, target?: 'serve' | 'serve-static'): Promise<AsyncIterable<{
     success: boolean;
 }>[]>;

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

@@ -6,7 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const utils_1 = require("@nx/module-federation/src/utils");
+const utils_1 = require("@nx/module-federation/src/executors/utils");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
 const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
@@ -15,8 +15,6 @@ const module_federation_1 = require("../../builders/utilities/module-federation"
 const path_1 = require("path");
 const fs_1 = require("fs");
 async function* moduleFederationDevServerExecutor(schema, context) {
-    // Force Node to resolve to look for the nx binary that is inside node_modules
-    const nxBin = require.resolve('nx/bin/nx');
     const options = (0, lib_1.normalizeOptions)(schema);
     const { projects: workspaceProjects } = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(context.projectGraph);
     const project = workspaceProjects[context.projectName];
@@ -55,29 +53,7 @@ async function* moduleFederationDevServerExecutor(schema, context) {
         pathToManifestFile = userPathToManifestFile;
     }
     (0, module_federation_1.validateDevRemotes)(options, workspaceProjects);
-    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(project.targets.build.options.tsConfig, context.root, project.root, 'angular');
-    const remoteNames = options.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName);
-    const remotes = (0, utils_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
-        projectName: project.name,
-        projectGraph: context.projectGraph,
-        root: context.root,
-    }, pathToManifestFile);
-    options.staticRemotesPort ??= remotes.staticRemotePort;
-    // Set NX_MF_DEV_REMOTES for the Nx Runtime Library Control Plugin
-    process.env.NX_MF_DEV_REMOTES = JSON.stringify([
-        ...(remotes.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []).map((r) => r.replace(/-/g, '_')),
-        project.name.replace(/-/g, '_'),
-    ]);
-    const staticRemotesConfig = (0, utils_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
-    const mappedLocationsOfStaticRemotes = await (0, lib_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options);
-    const devRemoteIters = await (0, lib_1.startRemotes)(remotes.devRemotes, workspaceProjects, options, context, 'serve');
-    const staticRemotesIter = (0, lib_1.startStaticRemotesFileServer)(staticRemotesConfig, context, options);
-    (0, utils_1.startRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
-        ? {
-            pathToCert: options.sslCert,
-            pathToKey: options.sslKey,
-        }
-        : undefined);
+    const { remotes, staticRemotesIter, devRemoteIters } = await (0, utils_1.startRemoteIterators)(options, context, lib_1.startRemotes, pathToManifestFile, 'angular');
     const removeBaseUrlEmission = (iter) => (0, async_iterable_1.mapAsyncIterable)(iter, (v) => ({
         ...v,
         baseUrl: undefined,

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

@@ -43,4 +43,5 @@ export type NormalizedSchema = SchemaWithBuildTarget & {
   liveReload: boolean;
   open: boolean;
   ssl: boolean;
+  verbose: boolean;
 };

package/src/executors/module-federation-ssr-dev-server/lib/normalize-options.d.ts

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

package/src/executors/module-federation-ssr-dev-server/lib/normalize-options.js

@@ -12,6 +12,7 @@ function normalizeOptions(options) {
     return {
         ...options,
         devRemotes: devServeRemotes,
+        verbose: options.verbose ?? false,
         ssl: options.ssl ?? false,
         sslCert: options.sslCert ? (0, path_1.join)(devkit_1.workspaceRoot, options.sslCert) : undefined,
         sslKey: options.sslKey ? (0, path_1.join)(devkit_1.workspaceRoot, options.sslKey) : undefined,

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

@@ -1,5 +1,5 @@
 import { type Schema } from '../schema';
 import { type ExecutorContext, type ProjectConfiguration } from '@nx/devkit';
-export declare function startRemotes(remotes: string[], workspaceProjects: Record<string, ProjectConfiguration>, options: Schema, context: ExecutorContext): Promise<AsyncIterable<{
+export declare function startRemotes(remotes: string[], workspaceProjects: Record<string, ProjectConfiguration>, options: Pick<Schema, 'devRemotes' | 'verbose'>, context: ExecutorContext): Promise<AsyncIterable<{
     success: boolean;
 }>[]>;

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

@@ -3,21 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.moduleFederationSsrDevServerExecutor = moduleFederationSsrDevServerExecutor;
 const build_angular_1 = require("@angular-devkit/build-angular");
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
-const utils_1 = require("@nx/module-federation/src/utils");
-const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const fs_1 = require("fs");
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
 const path_1 = require("path");
 const module_federation_1 = require("../../builders/utilities/module-federation");
-const build_static_remotes_1 = require("./lib/build-static-remotes");
-const normalize_options_1 = require("./lib/normalize-options");
+const utils_1 = require("@nx/module-federation/src/executors/utils");
 const start_dev_remotes_1 = require("./lib/start-dev-remotes");
-const start_static_remotes_1 = require("./lib/start-static-remotes");
+const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
+const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
+const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
+const normalize_options_1 = require("./lib/normalize-options");
+const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 async function* moduleFederationSsrDevServerExecutor(schema, context) {
-    const nxBin = require.resolve('nx/bin/nx');
     const options = (0, normalize_options_1.normalizeOptions)(schema);
     const currIter = (0, rxjs_for_await_1.eachValueFrom)((0, build_angular_1.executeSSRDevServerBuilder)(options, await (0, ngcli_adapter_1.createBuilderContext)({
         builderName: '@nx/angular:webpack-server',
@@ -44,31 +41,12 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
         pathToManifestFile = (0, module_federation_1.getDynamicMfManifestFile)(project, context.root);
     }
     (0, module_federation_1.validateDevRemotes)({ devRemotes: options.devRemotes }, workspaceProjects);
-    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(project.targets.build.options.tsConfig, context.root, project.root, 'angular');
-    const remoteNames = options.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName);
-    const remotes = (0, utils_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
-        projectName: project.name,
-        projectGraph: context.projectGraph,
-        root: context.root,
-    }, pathToManifestFile);
-    options.staticRemotesPort ??= remotes.staticRemotePort;
-    const staticRemotesConfig = (0, utils_1.parseStaticSsrRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
-    const mappedLocationsOfStaticRemotes = await (0, build_static_remotes_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options);
-    // Set NX_MF_DEV_REMOTES for the Nx Runtime Library Control Plugin
-    process.env.NX_MF_DEV_REMOTES = JSON.stringify([
-        ...(options.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []).map((r) => r.replace(/-/g, '_')),
-        project.name.replace(/-/g, '_'),
-    ]);
-    const devRemotes = await (0, start_dev_remotes_1.startRemotes)(remotes.devRemotes, workspaceProjects, options, context);
-    const staticRemotes = (0, start_static_remotes_1.startStaticRemotes)(staticRemotesConfig, context, options);
-    (0, utils_1.startSsrRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
-        ? { pathToCert: options.sslCert, pathToKey: options.sslKey }
-        : undefined);
+    const { remotes, staticRemotesIter, devRemoteIters } = await (0, utils_1.startRemoteIterators)(options, context, start_dev_remotes_1.startRemotes, pathToManifestFile, 'angular', true);
     const removeBaseUrlEmission = (iter) => (0, async_iterable_1.mapAsyncIterable)(iter, (v) => ({
         ...v,
         baseUrl: undefined,
     }));
-    const combined = (0, async_iterable_1.combineAsyncIterables)(removeBaseUrlEmission(staticRemotes), ...(devRemotes ? devRemotes.map(removeBaseUrlEmission) : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    const combined = (0, async_iterable_1.combineAsyncIterables)(removeBaseUrlEmission(staticRemotesIter), ...(devRemoteIters ? devRemoteIters.map(removeBaseUrlEmission) : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
         if (!options.isInitialHost) {
             done();
             return;
@@ -80,7 +58,7 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
             return;
         }
         try {
-            const portsToWaitFor = staticRemotes
+            const portsToWaitFor = staticRemotesIter
                 ? [options.staticRemotesPort, ...remotes.remotePorts]
                 : [...remotes.remotePorts];
             await Promise.all(portsToWaitFor.map((port) => (0, wait_for_port_open_1.waitForPortOpen)(port, {
@@ -99,7 +77,7 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
             done();
         }
     }));
-    let refs = 2 + (devRemotes?.length ?? 0);
+    let refs = 2 + (devRemoteIters?.length ?? 0);
     for await (const result of combined) {
         if (result.success === false)
             throw new Error('Remotes failed to start');

package/src/executors/module-federation-ssr-dev-server/schema.d.ts

@@ -9,3 +9,9 @@ export interface Schema extends SSRDevServerBuilderOptions {
   staticRemotesPort?: number;
   isInitialHost?: boolean;
 }
+
+export interface NormalizedSchema extends Schema {
+  devRemotes: DevRemoteDefinition[];
+  ssl: boolean;
+  verbose: boolean;
+}

package/src/generators/federate-module/schema.json

@@ -3,11 +3,15 @@
   "cli": "nx",
   "$id": "NxReactFederateModule",
   "title": "Federate Module",
-  "description": "Create a federated module, which is exposed by a remote and can be subsequently loaded by a host.",
+  "description": "Create a federated module, which is exposed by a Producer (remote) and can be subsequently loaded by a Consumer (host).",
   "examples": [
     {
-      "command": "nx g federate-module MyModule --path=./src/component/my-cmp.ts --remote=my-remote-app --remoteDirectory=apps/my-remote-app",
+      "command": "nx g federate-module MyModule --path=./src/component/my-cmp.ts --remote=myRemoteApp --remoteDirectory=apps/myRemoteApp",
       "description": "Create a federated module from my-remote-app, that exposes my-cmp from ./src/component/my-cmp.ts as MyModule."
+    },
+    {
+      "command": "nx g federate-module MyModule --path=./src/component/my-cmp.ts --producer=myProducer --producerDirectory=apps/myProducer",
+      "description": "Create a federated module from myProducer, that exposes my-cmp from ./src/component/my-cmp.ts as MyModule."
     }
   ],
   "type": "object",
@@ -30,15 +34,17 @@
     },
     "remote": {
       "type": "string",
-      "description": "The name of the remote.",
-      "x-prompt": "What is/should the remote be named?"
+      "description": "The name of the Producer (remote).",
+      "x-prompt": "What is/should the Producer (remote) be named?",
+      "alias": "producer"
     },
     "remoteDirectory": {
-      "description": "The directory of the new remote application if one needs to be created.",
-      "type": "string"
+      "description": "The directory of the new Producer (remote) application if one needs to be created.",
+      "type": "string",
+      "alias": "producerDirectory"
     },
     "style": {
-      "description": "The file extension to be used for style files for the remote if one needs to be created.",
+      "description": "The file extension to be used for style files for the Producer (remote) if one needs to be created.",
       "type": "string",
       "default": "css",
       "enum": ["css", "scss", "sass", "less"]
@@ -52,24 +58,25 @@
     "unitTestRunner": {
       "type": "string",
       "enum": ["jest", "vitest", "none"],
-      "description": "Test runner to use for unit tests of the remote if it needs to be created.",
+      "description": "Test runner to use for unit tests of the Producer (remote) if it needs to be created.",
       "x-prompt": "Which unit test runner would you like to use?",
       "default": "jest"
     },
     "e2eTestRunner": {
       "type": "string",
       "enum": ["cypress", "none"],
-      "description": "Test runner to use for end to end (e2e) tests of the remote if it needs to be created.",
+      "description": "Test runner to use for end to end (e2e) tests of the Producer (remote) if it needs to be created.",
       "default": "cypress"
     },
     "standalone": {
-      "description": "Whether to generate the remote application with standalone components if it needs to be created.",
+      "description": "Whether to generate the Producer (remote) application with standalone components if it needs to be created.",
       "type": "boolean",
       "default": true
     },
     "host": {
       "type": "string",
-      "description": "The host / shell application for this remote."
+      "description": "The Consumer (host) application for this Producer (remote).",
+      "alias": "consumer"
     }
   },
   "required": ["name", "path", "remote"],

package/src/generators/host/schema.json

@@ -2,13 +2,17 @@
   "$schema": "https://json-schema.org/schema",
   "$id": "NxMFHost",
   "cli": "nx",
-  "title": "Nx Module Federation Host Application",
-  "description": "Create an Angular Host Module Federation Application.",
+  "title": "Nx Module Federation Consumer (Host) Application",
+  "description": "Create an Angular Consumer (Host) Module Federation Application.",
   "type": "object",
   "examples": [
     {
       "command": "nx g @nx/angular:host appName --remotes=remote1",
-      "description": "Create an Angular application with configuration in place for Module Federation. If the `remotes` option is provided, attach the remote application to this application's configuration"
+      "description": "Create an Angular application with configuration in place for Module Federation. If the `remotes` option is provided, attach the Producer (remote) application to this application's configuration"
+    },
+    {
+      "command": "nx g @nx/angular:consumer appName --producers=remote1",
+      "description": "Create an Angular application with configuration in place for Module Federation. If the `producers` option is provided, attach the Producer (remote) application to this application's configuration"
     }
   ],
   "properties": {
@@ -23,14 +27,15 @@
     },
     "name": {
       "type": "string",
-      "description": "The name to give to the host Angular application.",
+      "description": "The name to give to the Consumer (host) Angular application.",
       "pattern": "^[a-zA-Z][^:]*$",
       "x-priority": "important"
     },
     "remotes": {
       "type": "array",
-      "description": "The names of the remote applications to add to the host.",
-      "x-priority": "important"
+      "description": "The names of the Producers (remote) applications to add to the Consumer (host).",
+      "x-priority": "important",
+      "alias": "producers"
     },
     "dynamic": {
       "type": "boolean",
@@ -163,11 +168,11 @@
     },
     "standalone": {
       "type": "boolean",
-      "description": "Whether to generate a host application that uses standalone components.",
+      "description": "Whether to generate a Consumer (host) application that uses standalone components.",
       "default": true
     },
     "ssr": {
-      "description": "Whether to configure SSR for the host application",
+      "description": "Whether to configure SSR for the Consumer (host) application",
       "type": "boolean",
       "default": false,
       "x-priority": "important"

package/src/generators/remote/schema.json

@@ -2,13 +2,17 @@
   "$schema": "https://json-schema.org/schema",
   "$id": "NxMFRemote",
   "cli": "nx",
-  "title": "Nx Module Federation Remote App",
-  "description": "Create an Angular Remote Module Federation Application.",
+  "title": "Nx Module Federation Producer (Remote) App",
+  "description": "Create an Angular Producer (Remote) Module Federation Application.",
   "type": "object",
   "examples": [
     {
       "command": "nx g @nx/angular:remote appName --host=host --port=4201",
-      "description": "Create an Angular app with configuration in place for Module Federation. If host is provided, attach this remote app to host app's configuration."
+      "description": "Create an Angular app with configuration in place for Module Federation. If Consumer (host) is provided, attach this Producer (remote) app to Consumer (host) app's configuration."
+    },
+    {
+      "command": "nx g @nx/angular:producer appName --consumer=host --port=4201",
+      "description": "Create an Angular app with configuration in place for Module Federation. If Consumer (host) is provided, attach this Producer (remote) app to Consumer (host) app's configuration."
     }
   ],
   "properties": {
@@ -23,15 +27,16 @@
     },
     "name": {
       "type": "string",
-      "description": "The name to give to the remote Angular app.",
+      "description": "The name to give to the Producer (remote) Angular app.",
       "pattern": "^[a-zA-Z_$][a-zA-Z_$0-9]*$",
       "x-priority": "important"
     },
     "host": {
       "type": "string",
-      "description": "The name of the host app to attach this remote app to.",
+      "description": "The name of the Consumer (host) app to attach this Producer (remote) app to.",
       "x-dropdown": "projects",
-      "x-priority": "important"
+      "x-priority": "important",
+      "alias": "consumer"
     },
     "port": {
       "type": "number",
@@ -156,12 +161,12 @@
       "x-priority": "internal"
     },
     "standalone": {
-      "description": "Whether to generate a remote application with standalone components.",
+      "description": "Whether to generate a Producer (remote) application with standalone components.",
       "type": "boolean",
       "default": true
     },
     "ssr": {
-      "description": "Whether to configure SSR for the remote application to be consumed by a host application using SSR.",
+      "description": "Whether to configure SSR for the Producer (remote) application to be consumed by a Consumer (host) application using SSR.",
       "type": "boolean",
       "default": false
     },

package/src/generators/setup-mf/schema.json

@@ -34,15 +34,17 @@
     },
     "remotes": {
       "type": "array",
-      "description": "A list of remote application names that the host application should consume."
+      "description": "A list of remote application names that the Consumer (host) application should consume.",
+      "alias": "producers"
     },
     "host": {
       "type": "string",
-      "description": "The name of the host application that the remote application will be consumed by."
+      "description": "The name of the host application that the remote application will be consumed by.",
+      "alias": "consumer"
     },
     "routing": {
       "type": "boolean",
-      "description": "Generate a routing setup to allow a host application to route to the remote application.",
+      "description": "Generate a routing setup to allow a Consumer (host) application to route to the Producer (remote) application.",
       "x-priority": "important"
     },
     "skipFormat": {

package/src/generators/utils/add-jest.js

@@ -22,13 +22,9 @@ async function addJest(tree, options) {
     const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'test-setup.ts');
     if (options.strict && tree.exists(setupFile)) {
         const contents = tree.read(setupFile, 'utf-8');
-        tree.write(setupFile, `// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
-globalThis.ngJest = {
-  testEnvironmentOptions: {
-    errorOnUnknownElements: true,
-    errorOnUnknownProperties: true,
-  },
-};
-${contents}`);
+        tree.write(setupFile, contents.replace('setupZoneTestEnv();', `setupZoneTestEnv({
+  errorOnUnknownElements: true,
+  errorOnUnknownProperties: true
+});`));
     }
 }

package/src/migrations/update-20-2-0/disable-angular-eslint-prefer-standalone.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-20-2-0/disable-angular-eslint-prefer-standalone.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const projects_1 = require("../utils/projects");
+const preferStandaloneRule = '@angular-eslint/prefer-standalone';
+async function default_1(tree) {
+    const projects = await (0, projects_1.getProjectsFilteredByDependencies)(tree, [
+        'npm:@angular/core',
+    ]);
+    for (const { project: { root }, } of projects) {
+        if (!(0, eslint_file_1.isEslintConfigSupported)(tree, root)) {
+            // ESLint config is not supported, skip
+            continue;
+        }
+        if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, (o) => !!o.rules?.[preferStandaloneRule], true)) {
+            // the @angular-eslint/prefer-standalone rule is set in an override, skip
+            continue;
+        }
+        const ngEslintOverrideLookup = (o) => o.files?.includes('*.ts') &&
+            Object.keys(o.rules ?? {}).some((r) => r.startsWith('@angular-eslint/'));
+        const tsFilesOverrideLookup = (o) => o.files?.length === 1 && o.files[0] === '*.ts';
+        if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, ngEslintOverrideLookup, false)) {
+            // there is an override containing an Angular ESLint rule
+            (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, ngEslintOverrideLookup, (o) => {
+                o.rules = {
+                    ...o.rules,
+                    [preferStandaloneRule]: 'off',
+                };
+                return o;
+            });
+        }
+        else if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, tsFilesOverrideLookup, false)) {
+            // there is an override for just *.ts files
+            (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, tsFilesOverrideLookup, (o) => {
+                o.rules = {
+                    ...o.rules,
+                    [preferStandaloneRule]: 'off',
+                };
+                return o;
+            });
+        }
+        else {
+            // there are no overrides for any Angular ESLint rule or just *.ts files, add a new override
+            (0, eslint_file_1.addOverrideToLintConfig)(tree, root, {
+                files: ['*.ts'],
+                rules: {
+                    [preferStandaloneRule]: 'off',
+                },
+            });
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}

package/src/utils/versions.d.ts

@@ -24,5 +24,5 @@ export declare const tsNodeVersion = "10.9.1";
 export declare const jestPresetAngularVersion = "~14.4.0";
 export declare const typesNodeVersion = "18.16.9";
 export declare const jasmineMarblesVersion = "^0.9.2";
-export declare const analogVitestAngular = "~1.10.0-beta.6";
+export declare const analogVitestAngular = "~1.10.0";
 export declare const jsoncEslintParserVersion = "^2.1.0";

package/src/utils/versions.js

@@ -27,5 +27,5 @@ exports.tsNodeVersion = '10.9.1';
 exports.jestPresetAngularVersion = '~14.4.0';
 exports.typesNodeVersion = '18.16.9';
 exports.jasmineMarblesVersion = '^0.9.2';
-exports.analogVitestAngular = '~1.10.0-beta.6';
+exports.analogVitestAngular = '~1.10.0';
 exports.jsoncEslintParserVersion = '^2.1.0';

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

@@ -1,4 +0,0 @@
-import { type Schema } from '../schema';
-import { type ExecutorContext } from '@nx/devkit';
-import type { StaticRemotesConfig } from '@nx/module-federation/src/utils';
-export declare function buildStaticRemotes(staticRemotesConfig: StaticRemotesConfig, nxBin: any, context: ExecutorContext, options: Schema): Promise<Record<string, string>>;

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

@@ -1,65 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildStaticRemotes = buildStaticRemotes;
-const devkit_1 = require("@nx/devkit");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
-const node_child_process_1 = require("node:child_process");
-const node_path_1 = require("node:path");
-const node_fs_1 = require("node:fs");
-async function buildStaticRemotes(staticRemotesConfig, nxBin, context, options) {
-    if (!staticRemotesConfig.remotes.length) {
-        return;
-    }
-    const mappedLocationOfRemotes = {};
-    for (const app of staticRemotesConfig.remotes) {
-        mappedLocationOfRemotes[app] = `http${options.ssl ? 's' : ''}://${options.host}:${options.staticRemotesPort}/${staticRemotesConfig.config[app].urlSegment}`;
-    }
-    await new Promise((res, rej) => {
-        devkit_1.logger.info(`NX Building ${staticRemotesConfig.remotes.length} static remotes...`);
-        const staticProcess = (0, node_child_process_1.fork)(nxBin, [
-            'run-many',
-            `--target=build`,
-            `--projects=${staticRemotesConfig.remotes.join(',')}`,
-            ...(context.configurationName
-                ? [`--configuration=${context.configurationName}`]
-                : []),
-            ...(options.parallel ? [`--parallel=${options.parallel}`] : []),
-        ], {
-            cwd: context.root,
-            stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
-        });
-        // File to debug build failures e.g. 2024-01-01T00_00_0_0Z-build.log'
-        const remoteBuildLogFile = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `${new Date().toISOString().replace(/[:\.]/g, '_')}-build.log`);
-        const stdoutStream = (0, node_fs_1.createWriteStream)(remoteBuildLogFile);
-        staticProcess.stdout.on('data', (data) => {
-            const ANSII_CODE_REGEX = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
-            const stdoutString = data.toString().replace(ANSII_CODE_REGEX, '');
-            stdoutStream.write(stdoutString);
-            // in addition to writing into the stdout stream, also show error directly in console
-            // so the error is easily discoverable. 'ERROR in' is the key word to search in webpack output.
-            if (stdoutString.includes('ERROR in')) {
-                devkit_1.logger.log(stdoutString);
-            }
-            if (stdoutString.includes('Successfully ran target build')) {
-                staticProcess.stdout.removeAllListeners('data');
-                devkit_1.logger.info(`NX Built ${staticRemotesConfig.remotes.length} static remotes`);
-                res();
-            }
-        });
-        staticProcess.stderr.on('data', (data) => devkit_1.logger.info(data.toString()));
-        staticProcess.once('exit', (code) => {
-            stdoutStream.end();
-            staticProcess.stdout.removeAllListeners('data');
-            staticProcess.stderr.removeAllListeners('data');
-            if (code !== 0) {
-                rej(`Remote failed to start. A complete log can be found in: ${remoteBuildLogFile}`);
-            }
-            else {
-                res();
-            }
-        });
-        process.on('SIGTERM', () => staticProcess.kill('SIGTERM'));
-        process.on('exit', () => staticProcess.kill('SIGTERM'));
-    });
-    return mappedLocationOfRemotes;
-}

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

@@ -1,9 +0,0 @@
-import { type ExecutorContext } from '@nx/devkit';
-import { type Schema } from '../schema';
-import type { StaticRemotesConfig } from '@nx/module-federation/src/utils';
-export declare function startStaticRemotesFileServer(staticRemotesConfig: StaticRemotesConfig, context: ExecutorContext, options: Schema): AsyncGenerator<{
-    success: boolean;
-    baseUrl: string;
-}, {
-    success: boolean;
-}, unknown>;

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

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.startStaticRemotesFileServer = startStaticRemotesFileServer;
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
-const path_1 = require("path");
-const fs_1 = require("fs");
-function startStaticRemotesFileServer(staticRemotesConfig, context, options) {
-    if (!staticRemotesConfig.remotes ||
-        staticRemotesConfig.remotes.length === 0) {
-        return;
-    }
-    let shouldMoveToCommonLocation = false;
-    let commonOutputDirectory;
-    for (const app of staticRemotesConfig.remotes) {
-        const remoteBasePath = staticRemotesConfig.config[app].basePath;
-        if (!commonOutputDirectory) {
-            commonOutputDirectory = remoteBasePath;
-        }
-        else if (commonOutputDirectory !== remoteBasePath) {
-            shouldMoveToCommonLocation = true;
-            break;
-        }
-    }
-    if (shouldMoveToCommonLocation) {
-        commonOutputDirectory = (0, path_1.join)(devkit_1.workspaceRoot, 'tmp/static-remotes');
-        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,
-            });
-        }
-    }
-    const staticRemotesIter = (0, file_server_impl_1.default)({
-        cors: true,
-        watch: false,
-        staticFilePath: commonOutputDirectory,
-        parallel: false,
-        spa: false,
-        withDeps: false,
-        host: options.host,
-        port: options.staticRemotesPort,
-        ssl: options.ssl,
-        sslCert: options.sslCert,
-        sslKey: options.sslKey,
-        cacheSeconds: -1,
-    }, context);
-    return staticRemotesIter;
-}

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

@@ -1,4 +0,0 @@
-import type { Schema } from '../schema';
-import { type ExecutorContext } from '@nx/devkit';
-import type { StaticRemotesConfig } from '@nx/module-federation/src/utils';
-export declare function buildStaticRemotes(staticRemotesConfig: StaticRemotesConfig, nxBin: any, context: ExecutorContext, options: Schema): Promise<Record<string, string>>;

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

@@ -1,65 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildStaticRemotes = buildStaticRemotes;
-const devkit_1 = require("@nx/devkit");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
-const node_child_process_1 = require("node:child_process");
-const node_path_1 = require("node:path");
-const node_fs_1 = require("node:fs");
-async function buildStaticRemotes(staticRemotesConfig, nxBin, context, options) {
-    if (!staticRemotesConfig.remotes.length) {
-        return;
-    }
-    const mappedLocationOfRemotes = {};
-    for (const app of staticRemotesConfig.remotes) {
-        mappedLocationOfRemotes[app] = `http${options.ssl ? 's' : ''}://${options.host}:${options.staticRemotesPort}/${staticRemotesConfig.config[app].urlSegment}`;
-    }
-    await new Promise((resolve, reject) => {
-        devkit_1.logger.info(`NX Building ${staticRemotesConfig.remotes.length} static remotes...`);
-        const staticProcess = (0, node_child_process_1.fork)(nxBin, [
-            'run-many',
-            `--target=server`,
-            `--projects=${staticRemotesConfig.remotes.join(',')}`,
-            ...(context.configurationName
-                ? [`--configuration=${context.configurationName}`]
-                : []),
-            ...(options.parallel ? [`--parallel=${options.parallel}`] : []),
-        ], {
-            cwd: context.root,
-            stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
-        });
-        // File to debug build failures e.g. 2024-01-01T00_00_0_0Z-build.log'
-        const remoteBuildLogFile = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `${new Date().toISOString().replace(/[:\.]/g, '_')}-build.log`);
-        const stdoutStream = (0, node_fs_1.createWriteStream)(remoteBuildLogFile);
-        staticProcess.stdout.on('data', (data) => {
-            const ANSII_CODE_REGEX = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
-            const stdoutString = data.toString().replace(ANSII_CODE_REGEX, '');
-            stdoutStream.write(stdoutString);
-            // in addition to writing into the stdout stream, also show error directly in console
-            // so the error is easily discoverable. 'ERROR in' is the key word to search in webpack output.
-            if (stdoutString.includes('ERROR in')) {
-                devkit_1.logger.log(stdoutString);
-            }
-            if (stdoutString.includes('Successfully ran target server')) {
-                staticProcess.stdout.removeAllListeners('data');
-                devkit_1.logger.info(`NX Built ${staticRemotesConfig.remotes.length} static remotes`);
-                resolve();
-            }
-        });
-        staticProcess.stderr.on('data', (data) => devkit_1.logger.info(data.toString()));
-        staticProcess.once('exit', (code) => {
-            stdoutStream.end();
-            staticProcess.stdout.removeAllListeners('data');
-            staticProcess.stderr.removeAllListeners('data');
-            if (code !== 0) {
-                reject(`Remote failed to start. A complete log can be found in: ${remoteBuildLogFile}`);
-            }
-            else {
-                resolve();
-            }
-        });
-        process.on('SIGTERM', () => staticProcess.kill('SIGTERM'));
-        process.on('exit', () => staticProcess.kill('SIGTERM'));
-    });
-    return mappedLocationOfRemotes;
-}

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

@@ -1,4 +0,0 @@
-import { type ExecutorContext } from '@nx/devkit';
-import { type Schema } from '../schema';
-import type { StaticRemotesConfig } from '@nx/module-federation/src/utils';
-export declare function startStaticRemotes(ssrStaticRemotesConfig: StaticRemotesConfig, context: ExecutorContext, options: Schema): AsyncIterable<unknown>;

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

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.startStaticRemotes = startStaticRemotes;
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
-const path_1 = require("path");
-const fs_1 = require("fs");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-function startStaticRemotes(ssrStaticRemotesConfig, context, options) {
-    if (ssrStaticRemotesConfig.remotes.length === 0) {
-        return (0, async_iterable_1.createAsyncIterable)(({ next, done }) => {
-            next({ success: true });
-            done();
-        });
-    }
-    // The directories are usually generated with /browser and /server suffixes so we need to copy them to a common directory
-    const commonOutputDirectory = (0, path_1.join)(devkit_1.workspaceRoot, 'tmp/static-remotes');
-    for (const app of ssrStaticRemotesConfig.remotes) {
-        const remoteConfig = ssrStaticRemotesConfig.config[app];
-        (0, fs_1.cpSync)(remoteConfig.outputPath, (0, path_1.join)(commonOutputDirectory, remoteConfig.urlSegment), {
-            force: true,
-            recursive: true,
-        });
-    }
-    const staticRemotesIter = (0, file_server_impl_1.default)({
-        cors: true,
-        watch: false,
-        staticFilePath: commonOutputDirectory,
-        parallel: false,
-        spa: false,
-        withDeps: false,
-        host: options.host,
-        port: options.staticRemotesPort,
-        ssl: options.ssl,
-        sslCert: options.sslCert,
-        sslKey: options.sslKey,
-        cacheSeconds: -1,
-    }, context);
-    return staticRemotesIter;
-}