@nx/angular 19.6.0 → 19.7.0-beta.0

package/README.md

@@ -22,7 +22,7 @@
 
 # Nx: Smart Monorepos · Fast CI
 
-Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
+Nx is a build system, optimized for monorepos, with plugins for popular frameworks and tools and advanced CI capabilities including caching and distribution.
 
 This package is an [Angular plugin for Nx](https://nx.dev/nx-api/angular).
 

package/esm2022/mf/index.mjs

@@ -1,2 +1,2 @@
-export { setRemoteUrlResolver, setRemoteDefinitions, loadRemoteModule, } from './mf';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hbmd1bGFyL21mL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxvQkFBb0IsRUFDcEIsb0JBQW9CLEVBQ3BCLGdCQUFnQixHQUNqQixNQUFNLE1BQU0sQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCB7XG4gIHNldFJlbW90ZVVybFJlc29sdmVyLFxuICBzZXRSZW1vdGVEZWZpbml0aW9ucyxcbiAgbG9hZFJlbW90ZU1vZHVsZSxcbn0gZnJvbSAnLi9tZic7XG4iXX0=
+export { setRemoteUrlResolver, setRemoteDefinitions, setRemoteDefinition, loadRemoteModule, } from './mf';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hbmd1bGFyL21mL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxvQkFBb0IsRUFDcEIsb0JBQW9CLEVBQ3BCLG1CQUFtQixFQUNuQixnQkFBZ0IsR0FDakIsTUFBTSxNQUFNLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQge1xuICBzZXRSZW1vdGVVcmxSZXNvbHZlcixcbiAgc2V0UmVtb3RlRGVmaW5pdGlvbnMsXG4gIHNldFJlbW90ZURlZmluaXRpb24sXG4gIGxvYWRSZW1vdGVNb2R1bGUsXG59IGZyb20gJy4vbWYnO1xuIl19

package/fesm2022/nx-angular-mf.mjs

@@ -53,5 +53,5 @@ async function loadRemoteContainer(remoteName) {
  * Generated bundle index. Do not edit.
  */
 
-export { loadRemoteModule, setRemoteDefinitions, setRemoteUrlResolver };
+export { loadRemoteModule, setRemoteDefinition, setRemoteDefinitions, setRemoteUrlResolver };
 //# sourceMappingURL=nx-angular-mf.mjs.map

package/mf/index.d.ts

@@ -1 +1 @@
-export { setRemoteUrlResolver, setRemoteDefinitions, loadRemoteModule, } from './mf';
+export { setRemoteUrlResolver, setRemoteDefinitions, setRemoteDefinition, loadRemoteModule, } from './mf';

package/migrations.json

@@ -428,6 +428,12 @@
       },
       "description": "Update the @angular/cli package version to ~18.2.0.",
       "factory": "./src/migrations/update-19-6-0/update-angular-cli"
+    },
+    "update-19-6-1-ensure-module-federation-target-defaults": {
+      "cli": "nx",
+      "version": "19.6.1-beta.0",
+      "description": "Ensure Target Defaults are set correctly for Module Federation.",
+      "factory": "./src/migrations/update-19-6-1/ensure-depends-on-for-mf"
     }
   },
   "packageJsonUpdates": {
@@ -2104,6 +2110,18 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "19.6.1-ngrx": {
+      "version": "19.6.1-beta.0",
+      "requires": {
+        "@angular/core": "^18.0.0"
+      },
+      "packages": {
+        "@ngrx/store": {
+          "version": "^18.0.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "19.6.0",
+  "version": "19.7.0-beta.0",
   "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": {
@@ -79,14 +79,14 @@
     "webpack-merge": "^5.8.0",
     "webpack": "^5.88.0",
     "@module-federation/enhanced": "~0.2.3",
-    "@nx/devkit": "19.6.0",
-    "@nx/js": "19.6.0",
-    "@nx/eslint": "19.6.0",
-    "@nx/webpack": "19.6.0",
-    "@nx/web": "19.6.0",
-    "@nx/workspace": "19.6.0",
+    "@nx/devkit": "19.7.0-beta.0",
+    "@nx/js": "19.7.0-beta.0",
+    "@nx/eslint": "19.7.0-beta.0",
+    "@nx/webpack": "19.7.0-beta.0",
+    "@nx/web": "19.7.0-beta.0",
+    "@nx/workspace": "19.7.0-beta.0",
     "piscina": "^4.4.0",
-    "@nrwl/angular": "19.6.0"
+    "@nrwl/angular": "19.7.0-beta.0"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 16.0.0 < 19.0.0",

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

@@ -66,7 +66,10 @@ async function* moduleFederationDevServerExecutor(schema, context) {
     }, 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)));
+    process.env.NX_MF_DEV_REMOTES = JSON.stringify([
+        ...(remotes.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []),
+        project.name,
+    ]);
     const staticRemotesConfig = (0, parse_static_remotes_config_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');

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

@@ -17,11 +17,15 @@ 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");
 const start_ssr_remote_proxies_1 = require("@nx/webpack/src/utils/module-federation/start-ssr-remote-proxies");
-const dev_server_impl_1 = require("../../builders/dev-server/dev-server.impl");
+const angular_version_utils_1 = require("../utilities/angular-version-utils");
 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, dev_server_impl_1.executeDevServerBuilder)(options, await (0, ngcli_adapter_1.createBuilderContext)({
+    const { major: angularMajorVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    const { executeSSRDevServerBuilder } = angularMajorVersion >= 17
+        ? require('@angular-devkit/build-angular')
+        : require('@nguniversal/builders');
+    const currIter = (0, rxjs_for_await_1.eachValueFrom)(executeSSRDevServerBuilder(options, await (0, ngcli_adapter_1.createBuilderContext)({
         builderName: '@nx/angular:webpack-server',
         description: 'Build a ssr application',
         optionSchema: require('../../builders/webpack-server/schema.json'),
@@ -57,7 +61,10 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
     const staticRemotesConfig = (0, parse_static_remotes_config_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);
+    process.env.NX_MF_DEV_REMOTES = JSON.stringify([
+        ...(options.devRemotes ?? []),
+        project.name,
+    ]);
     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, start_ssr_remote_proxies_1.startSsrRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl

package/src/generators/application/lib/normalized-schema.d.ts

@@ -1,8 +1,8 @@
 import { E2eTestRunner, UnitTestRunner } from '../../../utils/test-runners';
 import type { Schema } from '../schema';
-import { Linter } from '@nx/eslint';
+import { Linter, LinterType } from '@nx/eslint';
 export interface NormalizedSchema extends Schema {
-    linter: Linter;
+    linter: Linter | LinterType;
     unitTestRunner: UnitTestRunner;
     e2eTestRunner: E2eTestRunner;
     prefix: string;

package/src/generators/application/schema.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/eslint';
+import type { Linter, LinterType } from '@nx/eslint';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
@@ -17,7 +17,7 @@ export interface Schema {
   directory?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
-  linter?: Linter;
+  linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;

package/src/generators/host/schema.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/eslint';
+import type { Linter, LinterType } from '@nx/eslint';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
@@ -17,7 +17,7 @@ export interface Schema {
   directory?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
-  linter?: Linter;
+  linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;

package/src/generators/library/lib/normalized-schema.d.ts

@@ -1,5 +1,5 @@
 import { UnitTestRunner } from '../../../utils/test-runners';
-import type { Linter } from '@nx/eslint';
+import type { Linter, LinterType } from '@nx/eslint';
 export interface NormalizedSchema {
     libraryOptions: {
         name: string;
@@ -26,7 +26,7 @@ export interface NormalizedSchema {
         skipPackageJson?: boolean;
         skipPostInstall?: boolean;
         standalone?: boolean;
-        linter: Linter;
+        linter: Linter | LinterType;
         unitTestRunner: UnitTestRunner;
         prefix: string;
         fileName: string;

package/src/generators/library/schema.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/eslint';
+import type { Linter, LinterType } from '@nx/eslint';
 import type { UnitTestRunner } from '../../utils/test-runners';
 
 export interface Schema {
@@ -24,7 +24,7 @@ export interface Schema {
   parent?: string;
   tags?: string;
   strict?: boolean;
-  linter?: Linter;
+  linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;
   compilationMode?: 'full' | 'partial';
   setParserOptionsProject?: boolean;

package/src/generators/ng-add/schema.d.ts

@@ -1,4 +1,4 @@
-import { Linter } from '@nx/eslint';
+import { Linter, LinterType } from '@nx/eslint';
 import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
@@ -11,6 +11,6 @@ export interface GeneratorOptions {
   skipInstall?: boolean;
   skipPostInstall?: boolean;
   style?: Styles;
-  linter?: Linter;
+  linter?: Linter | LinterType;
   skipPackageJson?: boolean;
 }

package/src/generators/remote/schema.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/eslint';
+import type { Linter, LinterType } from '@nx/eslint';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
@@ -16,7 +16,7 @@ export interface Schema {
   directory?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
-  linter?: Linter;
+  linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;

package/src/generators/setup-mf/lib/index.d.ts

@@ -5,6 +5,7 @@ export * from './change-build-target';
 export * from './fix-bootstrap';
 export * from './generate-config';
 export * from './get-remotes-with-ports';
+export * from './move-angular-plugin-to-dependencies';
 export * from './normalize-options';
 export * from './update-tsconfig';
 export * from './setup-host-if-dynamic';

package/src/generators/setup-mf/lib/index.js

@@ -8,6 +8,7 @@ tslib_1.__exportStar(require("./change-build-target"), exports);
 tslib_1.__exportStar(require("./fix-bootstrap"), exports);
 tslib_1.__exportStar(require("./generate-config"), exports);
 tslib_1.__exportStar(require("./get-remotes-with-ports"), exports);
+tslib_1.__exportStar(require("./move-angular-plugin-to-dependencies"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./update-tsconfig"), exports);
 tslib_1.__exportStar(require("./setup-host-if-dynamic"), exports);

package/src/generators/setup-mf/lib/move-angular-plugin-to-dependencies.d.ts

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

package/src/generators/setup-mf/lib/move-angular-plugin-to-dependencies.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.moveAngularPluginToDependencies = moveAngularPluginToDependencies;
+const devkit_1 = require("@nx/devkit");
+function moveAngularPluginToDependencies(tree) {
+    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+    if (packageJson.dependencies?.['@nx/angular']) {
+        return;
+    }
+    packageJson.dependencies ??= {};
+    packageJson.dependencies['@nx/angular'] =
+        packageJson.devDependencies['@nx/angular'];
+    delete packageJson.devDependencies['@nx/angular'];
+    (0, devkit_1.writeJson)(tree, 'package.json', packageJson);
+}

package/src/generators/setup-mf/setup-mf.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function setupMf(tree: Tree, rawOptions: Schema): Promise<() => void>;
 export default setupMf;

package/src/generators/setup-mf/setup-mf.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupMf = setupMf;
 const devkit_1 = require("@nx/devkit");
-const lib_1 = require("./lib");
 const versions_1 = require("../../utils/versions");
+const lib_1 = require("./lib");
 async function setupMf(tree, rawOptions) {
     const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
@@ -50,6 +50,14 @@ async function setupMf(tree, rawOptions) {
         }
     }
     (0, lib_1.fixBootstrap)(tree, projectConfig.root, options);
+    if (options.mfType === 'host' || options.federationType === 'dynamic') {
+        /**
+         * Host applications and dynamic federation applications generate runtime
+         * code that depends on the @nx/angular plugin. Ensure that the plugin is
+         * in the production dependencies.
+         */
+        (0, lib_1.moveAngularPluginToDependencies)(tree);
+    }
     if (!options.skipE2E) {
         (0, lib_1.addCypressOnErrorWorkaround)(tree, options);
     }

package/src/generators/storybook-configuration/schema.d.ts

@@ -1,9 +1,9 @@
-import type { Linter } from '@nx/eslint';
+import type { Linter, LinterType } from '@nx/eslint';
 
 export interface StorybookConfigurationOptions {
   configureStaticServe?: boolean;
   generateStories: boolean;
-  linter: Linter;
+  linter: Linter | LinterType;
   project: string;
   tsConfiguration?: boolean;
   skipFormat?: boolean;

package/src/generators/utils/add-mf-env-to-inputs.js

@@ -12,6 +12,7 @@ function addMfEnvToTargetDefaultInputs(tree) {
         'production',
         '^production',
     ];
+    nxJson.targetDefaults[webpackExecutor].dependsOn ??= ['^build'];
     let mfEnvVarExists = false;
     for (const input of nxJson.targetDefaults[webpackExecutor].inputs) {
         if (typeof input === 'object' && input['env'] === mfEnvVar) {

package/src/migrations/update-19-6-1/ensure-depends-on-for-mf.d.ts

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

package/src/migrations/update-19-6-1/ensure-depends-on-for-mf.js

@@ -0,0 +1,46 @@
+"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) {
+    let usesModuleFederation = false;
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options, projectName, targetName) => {
+        const webpackConfig = options.webpackConfig;
+        if (!webpackConfig) {
+            return;
+        }
+        const webpackContents = tree.read(webpackConfig, 'utf-8');
+        if (['withModuleFederation', 'withModuleFederationForSSR'].some((p) => webpackContents.includes(p))) {
+            usesModuleFederation = true;
+        }
+    });
+    if (!usesModuleFederation) {
+        return;
+    }
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const nxMFDevRemotesEnvVar = 'NX_MF_DEV_REMOTES';
+    if (!nxJson.targetDefaults ||
+        !nxJson.targetDefaults?.['@nx/angular:webpack-browser']) {
+        nxJson.targetDefaults ??= {};
+        nxJson.targetDefaults['@nx/angular:webpack-browser'] = {
+            cache: true,
+            inputs: ['production', '^production', { env: nxMFDevRemotesEnvVar }],
+            dependsOn: ['^build'],
+        };
+    }
+    else {
+        nxJson.targetDefaults['@nx/angular:webpack-browser'].dependsOn ??= [];
+        if (!nxJson.targetDefaults['@nx/angular:webpack-browser'].dependsOn.includes('^build')) {
+            nxJson.targetDefaults['@nx/angular:webpack-browser'].dependsOn.push('^build');
+        }
+        nxJson.targetDefaults['@nx/angular:webpack-browser'].inputs ??= [];
+        if (!nxJson.targetDefaults['@nx/angular:webpack-browser'].inputs.find((i) => typeof i === 'string' ? false : i['env'] === nxMFDevRemotesEnvVar)) {
+            nxJson.targetDefaults['@nx/angular:webpack-browser'].inputs.push({
+                env: nxMFDevRemotesEnvVar,
+            });
+        }
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    await (0, devkit_1.formatFiles)(tree);
+}

package/src/utils/versions.d.ts

@@ -2,7 +2,7 @@ export declare const nxVersion: any;
 export declare const angularVersion = "~18.2.0";
 export declare const angularDevkitVersion = "~18.2.0";
 export declare const ngPackagrVersion = "~18.2.0";
-export declare const ngrxVersion = "^18.0.1";
+export declare const ngrxVersion = "^18.0.2";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.14.3";
 export declare const angularJsVersion = "1.7.9";

package/src/utils/versions.js

@@ -5,7 +5,7 @@ exports.nxVersion = require('../../package.json').version;
 exports.angularVersion = '~18.2.0';
 exports.angularDevkitVersion = '~18.2.0';
 exports.ngPackagrVersion = '~18.2.0';
-exports.ngrxVersion = '^18.0.1';
+exports.ngrxVersion = '^18.0.2';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.14.3';
 exports.angularJsVersion = '1.7.9';