@nx/angular 24.0.0-pr.37405.acdaf31 → 24.0.0-rc.1

package/dist/src/generators/convert-to-rspack/lib/get-custom-webpack-config.js

@@ -1,22 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCustomWebpackConfig = getCustomWebpackConfig;
-exports.convertWebpackConfigToUseNxModuleFederationPlugin = convertWebpackConfigToUseNxModuleFederationPlugin;
-const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const path_1 = require("path");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
 const FILE_EXTENSION_REGEX = /\.[^.]+$/;
 async function getCustomWebpackConfig(tree, projectRoot, pathToCustomWebpackConfig) {
-    const webpackConfigContents = tree.read(pathToCustomWebpackConfig, 'utf-8');
-    if (webpackConfigContents.includes('@nx/module-federation/angular') &&
-        webpackConfigContents.includes('withModuleFederation')) {
-        tree.write(pathToCustomWebpackConfig, convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents));
-        return {
-            isWebpackConfigFunction: false,
-            normalizedPathToCustomWebpackConfig: `./${(0, path_1.relative)(projectRoot, pathToCustomWebpackConfig).replace(FILE_EXTENSION_REGEX, '')}`,
-        };
-    }
     const configFile = await (0, internal_1.loadConfigFile)((0, path_1.join)(tree.root, pathToCustomWebpackConfig));
     const webpackConfig = 'default' in configFile ? configFile.default : configFile;
     return {
@@ -24,54 +12,3 @@ async function getCustomWebpackConfig(tree, projectRoot, pathToCustomWebpackConf
         normalizedPathToCustomWebpackConfig: `./${(0, path_1.relative)(projectRoot, pathToCustomWebpackConfig).replace(FILE_EXTENSION_REGEX, '')}`,
     };
 }
-function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents) {
-    let newWebpackConfigContents = webpackConfigContents;
-    let sourceFile = (0, tsquery_1.ast)(webpackConfigContents);
-    const withModuleFederationImportNodes = (0, tsquery_1.query)(sourceFile, 'ImportDeclaration:has(StringLiteral[value=@nx/module-federation/angular])');
-    if (withModuleFederationImportNodes.length > 0) {
-        const withModuleFederationImportNode = withModuleFederationImportNodes[0];
-        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationImportNode.getStart())}import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/angular';${webpackConfigContents.slice(withModuleFederationImportNode.getEnd())}`;
-        sourceFile = (0, tsquery_1.ast)(newWebpackConfigContents);
-        const exportedWithModuleFederationNodes = (0, tsquery_1.query)(sourceFile, 'ExportAssignment:has(CallExpression > Identifier[name=withModuleFederation])');
-        if (exportedWithModuleFederationNodes.length > 0) {
-            const exportedWithModuleFederationNode = exportedWithModuleFederationNodes[0];
-            newWebpackConfigContents = `${newWebpackConfigContents.slice(0, exportedWithModuleFederationNode.getStart())}${newWebpackConfigContents.slice(exportedWithModuleFederationNode.getEnd())}
-    export default {
-      plugins: [
-        new NxModuleFederationPlugin({ config }, {
-          dts: false,
-        }),
-        new NxModuleFederationDevServerPlugin({ config }),
-      ]
-    }
-    `;
-        }
-        else {
-            devkit_1.logger.warn("Could not find 'export default withModuleFederation' in the webpack config file. Skipping conversion.");
-        }
-    }
-    const withModuleFederationRequireNodes = (0, tsquery_1.query)(sourceFile, 'VariableStatement:has(CallExpression > Identifier[name=withModuleFederation], StringLiteral[value=@nx/module-federation/angular])');
-    if (withModuleFederationRequireNodes.length > 0) {
-        const withModuleFederationRequireNode = withModuleFederationRequireNodes[0];
-        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationRequireNode.getStart())}const { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } = require('@nx/module-federation/rspack');${webpackConfigContents.slice(withModuleFederationRequireNode.getEnd())}`;
-        sourceFile = (0, tsquery_1.ast)(newWebpackConfigContents);
-        const exportedWithModuleFederationNodes = (0, tsquery_1.query)(sourceFile, 'ExpressionStatement:has(BinaryExpression > PropertyAccessExpression:has(Identifier[name=module], Identifier[name=exports]), CallExpression:has(Identifier[name=withModuleFederation]))');
-        if (exportedWithModuleFederationNodes.length > 0) {
-            const exportedWithModuleFederationNode = exportedWithModuleFederationNodes[0];
-            newWebpackConfigContents = `${newWebpackConfigContents.slice(0, exportedWithModuleFederationNode.getStart())}${newWebpackConfigContents.slice(exportedWithModuleFederationNode.getEnd())}
-    module.exports = {
-      plugins: [
-        new NxModuleFederationPlugin({ config }, {
-          dts: false,
-        }),
-        new NxModuleFederationDevServerPlugin({ config }),
-      ]
-    }
-    `;
-        }
-        else {
-            devkit_1.logger.warn("Could not find 'module.exports = withModuleFederation' in the webpack config file. Skipping conversion.");
-        }
-    }
-    return newWebpackConfigContents;
-}

package/dist/src/generators/convert-to-rspack/lib/validate-no-module-federation.d.ts

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

package/dist/src/generators/convert-to-rspack/lib/validate-no-module-federation.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateNoModuleFederation = validateNoModuleFederation;
+const MODULE_FEDERATION_EXECUTORS = [
+    '@nx/angular:module-federation-dev-server',
+    '@nx/angular:module-federation-dev-ssr',
+];
+function validateNoModuleFederation(tree, project) {
+    if (usesModuleFederation(tree, project)) {
+        throw new Error(`The project ${project.name} is using Module Federation. At the moment, we don't support migrating projects that use Module Federation. See https://nx.dev/docs/kb/migrate-angular-module-federation.`);
+    }
+}
+function usesModuleFederation(tree, project) {
+    for (const target of Object.values(project.targets ?? {})) {
+        if (MODULE_FEDERATION_EXECUTORS.includes(target.executor)) {
+            return true;
+        }
+        const allOptions = [
+            target.options,
+            ...Object.values(target.configurations ?? {}),
+        ];
+        for (const options of allOptions) {
+            const configPath = options?.customWebpackConfig?.path;
+            if (configPath &&
+                tree.exists(configPath) &&
+                tree.read(configPath, 'utf-8').includes('@nx/module-federation')) {
+                return true;
+            }
+        }
+    }
+    return false;
+}

package/dist/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -64,8 +64,6 @@ async function cypressComponentConfiguration(tree, options) {
     tasks.push(await baseCyCTConfig(tree, {
         project: options.project,
         skipFormat: true,
-        addPlugin: false,
-        addExplicitTargets: true,
         skipPackageJson: options.skipPackageJson,
     }));
     await configureCypressCT(tree, options);
@@ -142,20 +140,10 @@ async function configureCypressCT(tree, options) {
             throw new Error('Unable to find a valid build configuration. Try passing in a target for an Angular app (e.g. --build-target=<project>:<target>[:<configuration>]).');
         }
     }
-    const ctConfigOptions = {};
+    const ctConfigOptions = {
+        buildTarget: found.target,
+    };
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    if (projectConfig.targets?.['component-test']?.executor ===
-        '@nx/cypress:cypress') {
-        projectConfig.targets['component-test'].options = {
-            ...projectConfig.targets['component-test'].options,
-            skipServe: true,
-            devServerTarget: found.target,
-        };
-        (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
-    }
-    else {
-        ctConfigOptions.buildTarget = found.target;
-    }
     const { addDefaultCTConfig, getProjectCypressConfigPath, getInstalledCypressMajorVersion, } = require('@nx/cypress/internal');
     const cypressConfigPath = getProjectCypressConfigPath(tree, projectConfig.root);
     const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions, '@nx/angular/plugins/component-testing', getInstalledCypressMajorVersion(tree));

package/dist/src/generators/init/init.js

@@ -16,8 +16,7 @@ async function angularInitGenerator(tree, options) {
     // generators do not use `angular.json`, and `nx init` should split
     // `angular.json` into multiple `project.json` files -- as this is preferred
     // by most folks we've talked to.
-    options.addPlugin ??= process.env.NX_RUNNING_NX_IMPORT === 'true';
-    if (options.addPlugin) {
+    if (process.env.NX_RUNNING_NX_IMPORT === 'true') {
         await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/angular/plugin', plugin_1.createNodes, {
             targetNamePrefix: ['', 'angular:', 'angular-'],
         }, options.updatePackageScripts);

package/dist/src/generators/init/schema.d.ts

@@ -3,7 +3,5 @@ export interface Schema {
   skipInstall?: boolean;
   skipPackageJson?: boolean;
   keepExistingVersions?: boolean;
-  /* internal */
-  addPlugin?: boolean;
   updatePackageScripts?: boolean;
 }

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

@@ -19,10 +19,6 @@ export interface NormalizedSchema {
         strict?: boolean;
         compilationMode?: 'full' | 'partial';
         enableTypedLinting?: boolean;
-        /**
-         * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
-         */
-        setParserOptionsProject?: boolean;
         skipModule?: boolean;
         skipPackageJson?: boolean;
         skipPostInstall?: boolean;

package/dist/src/generators/library/library.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
 const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
-const internal_2 = require("@nx/eslint/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const internal_3 = require("@nx/js/internal");
+const internal_2 = require("@nx/js/internal");
 const init_1 = tslib_1.__importDefault(require("../../generators/init/init"));
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const test_runners_1 = require("../../utils/test-runners");
@@ -74,7 +73,7 @@ async function libraryGenerator(tree, schema) {
         () => (0, devkit_1.installPackagesTask)(tree),
     ];
     if (libraryOptions.publishable) {
-        tasks.push(await (0, internal_3.releaseTasks)(tree));
+        tasks.push(await (0, internal_2.releaseTasks)(tree));
     }
     tasks.push(() => (0, internal_1.logShowProjectCommand)(libraryOptions.name));
     return (0, devkit_1.runTasksInSerial)(...tasks);
@@ -127,7 +126,7 @@ async function addLinting(host, options) {
         projectRoot: options.projectRoot,
         prefix: options.prefix,
         unitTestRunner: options.unitTestRunner,
-        enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
+        enableTypedLinting: options.enableTypedLinting,
         skipFormat: true,
         skipPackageJson: options.skipPackageJson,
     });

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

@@ -23,10 +23,6 @@ export interface Schema {
   unitTestRunner?: UnitTestRunner;
   compilationMode?: 'full' | 'partial';
   enableTypedLinting?: boolean;
-  /**
-   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
-   */
-  setParserOptionsProject?: boolean;
   skipModule?: boolean;
   skipPackageJson?: boolean;
   standalone?: boolean;
@@ -39,6 +35,5 @@ export interface Schema {
   skipTests?: boolean;
   selector?: string;
   skipSelector?: boolean;
-  addPlugin?: boolean;
   skipTsConfig?: boolean;
 }

package/dist/src/generators/library/schema.json

@@ -111,12 +111,6 @@
       "description": "Whether to enable typed linting. For flat configs, this configures the recommended `parserOptions.projectService` and `tsconfigRootDir`. For legacy `.eslintrc` configs, this configures `parserOptions.project`. We do not enable this by default for lint performance reasons.",
       "default": false
     },
-    "setParserOptionsProject": {
-      "type": "boolean",
-      "description": "Deprecated alias for `enableTypedLinting`.",
-      "default": false,
-      "x-deprecated": "Use `enableTypedLinting` instead. This option will be removed in Nx v24."
-    },
     "skipModule": {
       "type": "boolean",
       "description": "Whether to skip the creation of a default module when generating the library.",

package/dist/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js

@@ -33,7 +33,6 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
         }
     }
     async updateTargetConfiguration(targetName, target) {
-        target.executor = '@nx/eslint:lint';
         if (!target.options) {
             this.logger.warn(`The target "${targetName}" is not specifying any options. Skipping updating the target configuration.`);
             return;
@@ -60,6 +59,18 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
                     this.logger.warn(`The lint file pattern "${pattern}" specified in the "${targetName}" target is not contained in the project root or source root. The pattern will not be updated.`);
                     return pattern;
                 });
+        // `@nx/eslint:lint` is gone in v24, so the migrated target runs the ESLint
+        // CLI directly. Patterns were rebased onto the new project root above.
+        const eslintConfig = target.options.eslintConfig && this.newEsLintConfigPath;
+        const patterns = target.options.lintFilePatterns ?? [];
+        delete target.executor;
+        delete target.options;
+        target.command = [
+            'eslint',
+            ...(eslintConfig ? ['--config', eslintConfig] : []),
+            // Quoted so ESLint, not the shell, expands the globs: sh has no globstar.
+            ...patterns.map((pattern) => `"${pattern}"`),
+        ].join(' ');
         (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, {
             ...this.projectConfig,
         });

package/dist/src/generators/ng-add/migrators/projects/app.migrator.d.ts

@@ -19,6 +19,7 @@ export declare class AppMigrator extends ProjectMigrator<SupportedTargets> {
     private updatePrerenderTargetConfiguration;
     private updateServerTargetConfiguration;
     private updateServeSsrTargetConfiguration;
+    private updateDevServerTargets;
     private updateTsConfigFileUsedByBuildTarget;
     private updateTsConfigFileUsedByServerTarget;
 }

package/dist/src/generators/ng-add/migrators/projects/app.migrator.js

@@ -50,6 +50,11 @@ const supportedTargets = {
         ],
     },
 };
+const readySignalingServeBuilders = new Set([
+    '@angular/build:dev-server',
+    '@angular-devkit/build-angular:dev-server',
+    '@angular-devkit/build-angular:ssr-dev-server',
+]);
 // TODO(leo): this will replace `supportedTargets` once the full refactor is done.
 const supportedBuilderMigrators = [
     builders_1.AngularBuildUnitTestMigrator,
@@ -139,6 +144,7 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         this.updateServerTargetConfiguration();
         this.updatePrerenderTargetConfiguration();
         this.updateServeSsrTargetConfiguration();
+        this.updateDevServerTargets();
         (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, {
             ...this.projectConfig,
         });
@@ -342,6 +348,22 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
             }
         });
     }
+    updateDevServerTargets() {
+        for (const targetType of ['serve', 'serveSsr']) {
+            const targetName = this.targetNames[targetType];
+            if (!targetName || this.shouldSkipTargetTypeMigration(targetType)) {
+                continue;
+            }
+            const target = this.projectConfig.targets[targetName];
+            if (!readySignalingServeBuilders.has(target.executor)) {
+                continue;
+            }
+            target.continuous ??= true;
+            if (target.readyWhen === undefined) {
+                target.readyWhen = { signal: true };
+            }
+        }
+    }
     updateTsConfigFileUsedByBuildTarget(rootTsConfigFile, projectOffsetFromRoot) {
         if (!this.targetNames.build ||
             this.shouldSkipTargetTypeMigration('build')) {

package/dist/src/generators/ng-add/migrators/projects/e2e.migrator.js

@@ -223,9 +223,6 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             tags: [],
             implicitDependencies: [this.appName],
         });
-        const nxJson = (0, devkit_1.readNxJson)(this.tree) ?? {};
-        const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-            nxJson.useInferencePlugins !== false;
         const { configurationGenerator } = (require('@nx/cypress'));
         await configurationGenerator(this.tree, {
             project: this.project.name,
@@ -234,7 +231,6 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             // any target would do, we replace it later with the target existing in the project being migrated
             devServerTarget: `${this.appName}:serve`,
             baseUrl: 'http://localhost:4200',
-            addPlugin,
         });
         const cypressConfigFilePath = this.updateOrCreateCypressConfigFile(oldCypressConfigFilePath);
         this.updateCypressProjectConfiguration(cypressConfigFilePath);
@@ -284,21 +280,21 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         });
     }
     updateE2eCypressTarget(existingTarget, cypressConfig) {
+        // `@nx/cypress:cypress` is gone in v24, so the migrated target runs the
+        // Cypress CLI directly against the rebased config. `watch` selected the
+        // interactive runner, which is `cypress open`.
+        const isInteractive = existingTarget.options?.watch === true;
+        if (existingTarget.options?.devServerTarget) {
+            this.logger.warn(`The "devServerTarget" option is not supported by the Cypress CLI. Start "${existingTarget.options.devServerTarget}" separately, or set "baseUrl" in "${cypressConfig}".`);
+        }
         const updatedTarget = {
             ...existingTarget,
-            executor: '@nx/cypress:cypress',
-            options: {
-                ...existingTarget.options,
-                cypressConfig,
-            },
+            command: `cypress ${isInteractive ? 'open' : 'run'} --e2e --config-file ${(0, path_1.basename)(cypressConfig)}`,
+            options: { cwd: (0, path_1.dirname)(cypressConfig) },
         };
-        delete updatedTarget.options.configFile;
-        if (updatedTarget.options.tsConfig) {
-            updatedTarget.options.tsConfig = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json');
-        }
-        else {
-            delete updatedTarget.options.tsConfig;
-        }
+        delete updatedTarget.executor;
+        delete updatedTarget.configurations;
+        delete updatedTarget.defaultConfiguration;
         return updatedTarget;
     }
     cypressConfigGlobToNewGlob(globPattern) {

package/dist/src/generators/ng-add/utilities/workspace.js

@@ -156,9 +156,7 @@ function updatePackageJson(tree) {
     });
 }
 async function updateRootEsLintConfig(tree, existingEsLintConfig, unitTestRunner) {
-    await (0, eslint_1.lintInitGenerator)(tree, {
-        addPlugin: false,
-    });
+    await (0, eslint_1.lintInitGenerator)(tree, {});
     if (!existingEsLintConfig) {
         // There was no eslint config in the root, so we set it up and use it as-is
         (0, internal_1.setupRootEsLint)(tree, { unitTestRunner });

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

@@ -55,8 +55,22 @@ app.use('/**', (req, res, next) => {
  */
 if (isMainModule(import.meta.url) || process.env['pm_id']) {
   const port = process.env['PORT'] || <%= serverPort %>;
-  app.listen(port, () => {
+  const server = app.listen(port, async (error?: Error) => {
+    if (error) {
+      throw error;
+    }
+
     console.log(`Node Express server listening on http://localhost:${port}`);
+    // Set when Nx waits for this server to be ready
+    if (process.env['NX_READY_SIGNAL_SOCKET']) {
+      try {
+        // Function keeps TypeScript and bundlers from rewriting or bundling the import
+        const load = new Function('s', 'return import(s)') as (s: string) => Promise<{ emitReadySignal(server: unknown): boolean }>;
+        (await load('@nx/js/ready-signal')).emitReadySignal(server);
+      } catch {
+        // @nx/js isn't installed
+      }
+    }
   });
 }
 

package/dist/src/generators/setup-ssr/lib/add-dependencies.js

@@ -20,6 +20,10 @@ function addDependencies(tree, options) {
     // so ask for one that does rather than for whichever the range resolves to
     dependencies['@angular/ssr'] =
         (0, version_utils_1.withSsrAllowedHostsSupport)(angularDevkitVersion);
+    if (options.isUsingApplicationBuilder || options.isRspack) {
+        // The server template imports @nx/js/ready-signal, which must resolve from the workspace root
+        devDependencies['@nx/js'] = versions_1.nxVersion;
+    }
     if (options.isUsingApplicationBuilder) {
         dependencies['@angular-devkit/build-angular'] = angularDevkitVersion;
     }

package/dist/src/generators/setup-ssr/lib/update-project-config.js

@@ -75,6 +75,7 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
     };
     projectConfig.targets['serve-ssr'] = {
         continuous: true,
+        readyWhen: { signal: true },
         executor: '@angular-devkit/build-angular:ssr-dev-server',
         configurations: {
             development: {

package/dist/src/generators/storybook-configuration/lib/generate-storybook-configuration.js

@@ -13,7 +13,5 @@ async function generateStorybookConfiguration(tree, options) {
         interactionTests: options.interactionTests,
         configureStaticServe: options.configureStaticServe,
         skipFormat: true,
-        addPlugin: false,
-        addExplicitTargets: true,
     });
 }

package/dist/src/generators/utils/add-jest.d.ts

@@ -6,6 +6,5 @@ export type AddJestOptions = {
     strict: boolean;
     runtimeTsconfigFileName: 'tsconfig.app.json' | 'tsconfig.lib.json';
     zoneless: boolean;
-    addPlugin?: boolean;
 };
 export declare function addJest(tree: Tree, options: AddJestOptions): Promise<void>;

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

@@ -28,8 +28,6 @@ async function addJest(tree, options) {
         skipSerializers: false,
         skipPackageJson: options.skipPackageJson,
         skipFormat: true,
-        addPlugin: options.addPlugin ?? false,
-        addExplicitTargets: !options.addPlugin,
     });
     const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'test-setup.ts');
     if (options.zoneless) {

package/dist/src/generators/utils/add-vitest.d.ts

@@ -12,7 +12,6 @@ export type AddVitestAnalogOptions = {
     skipPackageJson: boolean;
     strict: boolean;
     zoneless: boolean;
-    addPlugin?: boolean;
 };
 export declare function addVitestAngular(tree: Tree, options: AddVitestAngularOptions): Promise<GeneratorCallback>;
 export declare function addVitestAnalog(tree: Tree, options: AddVitestAnalogOptions): Promise<GeneratorCallback>;

package/dist/src/generators/utils/add-vitest.js

@@ -81,7 +81,6 @@ async function addVitestAnalog(tree, options) {
         uiFramework: 'angular',
         testEnvironment: 'jsdom',
         coverageProvider: 'v8',
-        addPlugin: options.addPlugin ?? false,
         skipFormat: options.skipFormat,
         skipPackageJson: options.skipPackageJson,
         zoneless: options.zoneless,

package/dist/src/generators/utils/testing.d.ts

@@ -1,10 +1,10 @@
 import type { Tree } from '@nx/devkit';
 import type { Schema as ApplicationOptions } from '../application/schema';
-import type { Schema as HostOptions } from '../host/schema';
 import type { Schema as LibraryOptions } from '../library/schema';
-import type { Schema as RemoteOptions } from '../remote/schema';
 export declare function generateTestApplication(tree: Tree, options: ApplicationOptions): Promise<void>;
-export declare function generateTestHostApplication(tree: Tree, options: HostOptions): Promise<void>;
-export declare function generateTestRemoteApplication(tree: Tree, options: RemoteOptions): Promise<void>;
 export declare function generateTestLibrary(tree: Tree, options: LibraryOptions): Promise<void>;
 export declare function createStorybookTestWorkspaceForLib(libName: string): Promise<Tree>;
+export declare function generateTestInlineScam(tree: Tree, options: {
+    name: string;
+    path: string;
+}): Promise<void>;

package/dist/src/generators/utils/testing.js

@@ -1,33 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTestApplication = generateTestApplication;
-exports.generateTestHostApplication = generateTestHostApplication;
-exports.generateTestRemoteApplication = generateTestRemoteApplication;
 exports.generateTestLibrary = generateTestLibrary;
 exports.createStorybookTestWorkspaceForLib = createStorybookTestWorkspaceForLib;
+exports.generateTestInlineScam = generateTestInlineScam;
 const devkit_1 = require("@nx/devkit");
 const testing_1 = require("@nx/devkit/testing");
 const internal_1 = require("@nx/js/internal");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = require("../application/application");
 const component_1 = require("../component/component");
-const host_1 = require("../host/host");
 const library_1 = require("../library/library");
-const remote_1 = require("../remote/remote");
 async function generateTestApplication(tree, options) {
     tree.write('.gitignore', '');
     await (0, application_1.applicationGenerator)(tree, {
         ...options,
     });
 }
-async function generateTestHostApplication(tree, options) {
-    tree.write('.gitignore', '');
-    await (0, host_1.host)(tree, { ...options });
-}
-async function generateTestRemoteApplication(tree, options) {
-    tree.write('.gitignore', '');
-    await (0, remote_1.remote)(tree, { ...options });
-}
 async function generateTestLibrary(tree, options) {
     tree.write('.gitignore', '');
     await (0, library_1.libraryGenerator)(tree, {
@@ -223,6 +212,24 @@ export class StaticMemberDeclarationsModule {
     });
     return tree;
 }
+async function generateTestInlineScam(tree, options) {
+    await (0, component_1.componentGenerator)(tree, {
+        ...options,
+        standalone: false,
+        skipImport: true,
+        skipFormat: true,
+    });
+    const { className } = (0, devkit_1.names)(options.name);
+    const componentFilePath = `${options.path}.ts`;
+    tree.write(componentFilePath, `import { NgModule } from '@angular/core';
+${tree.read(componentFilePath, 'utf-8')}
+@NgModule({
+  declarations: [${className}],
+  exports: [${className}],
+})
+export class ${className}Module {}
+`);
+}
 function generateModule(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (options.path === undefined) {

package/dist/src/migrations/update-23-1-0/add-angular-build.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const acknowledge_build_scripts_1 = require("../../generators/utils/acknowledge-build-scripts");
-const versions_1 = require("../../utils/versions");
+const version_utils_1 = require("../../generators/utils/version-utils");
 // The `@nx/angular:application` and `@nx/angular:unit-test` executors import
 // `@angular/build` directly to run the Angular builders, and any
 // `@angular/build:*` executor is provided by that package; it is a required
@@ -12,7 +13,8 @@ const versions_1 = require("../../utils/versions");
 // `@angular-devkit/build-angular`, which isn't reliable (it can be absent from
 // node_modules, e.g. under Yarn Berry), so `require.resolve('@angular/build')`
 // fails and the build breaks. Add it as a direct dependency when an executor
-// needs it, at the version the application generator installs.
+// needs it. Match the version `@angular-devkit/build-angular` pins it to,
+// because a newer `@angular/build` breaks peers such as `@angular/ssr`.
 const angularBuildExecutors = [
     '@nx/angular:application',
     '@nx/angular:unit-test',
@@ -51,5 +53,7 @@ async function default_1(tree) {
         return;
     }
     (0, acknowledge_build_scripts_1.acknowledgeAngularBuildScripts)(tree);
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/build': versions_1.angularDevkitVersion }, undefined, true);
+    const version = (0, internal_1.getInstalledPackageVersionFromTree)(tree, '@angular-devkit/build-angular') ??
+        (0, version_utils_1.getInstalledAngularVersion)(tree);
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/build': `~${version}` }, undefined, true);
 }

package/dist/src/migrations/update-23-1-0/add-angular-build.md

@@ -1,6 +1,6 @@
 #### Add `@angular/build` When Used by an Executor
 
-The `@nx/angular:application` and `@nx/angular:unit-test` executors load the Angular builders by importing `@angular/build` directly, and any `@angular/build:*` executor is provided by that package, so `@angular/build` is a required runtime dependency for workspaces using those targets. Nothing declares it as a direct dependency, though: it has only ever been available transitively as a dependency of `@angular-devkit/build-angular`. That is not reliable (for example, under Yarn Berry it can be missing from `node_modules` even when `@angular-devkit/build-angular` is installed), and when `@angular/build` cannot be resolved the build fails with an error like `The "@angular/build" package is required by "@nx/angular:application" but is not installed`. This migration adds `@angular/build` to `devDependencies` when a project uses one of those executors and it is not already installed, at the version the application generator installs. An existing version is preserved.
+The `@nx/angular:application` and `@nx/angular:unit-test` executors load the Angular builders by importing `@angular/build` directly, and any `@angular/build:*` executor is provided by that package, so `@angular/build` is a required runtime dependency for workspaces using those targets. Nothing declares it as a direct dependency, though: it has only ever been available transitively as a dependency of `@angular-devkit/build-angular`. That is not reliable (for example, under Yarn Berry it can be missing from `node_modules` even when `@angular-devkit/build-angular` is installed), and when `@angular/build` cannot be resolved the build fails with an error like `The "@angular/build" package is required by "@nx/angular:application" but is not installed`. This migration adds `@angular/build` to `devDependencies` when a project uses one of those executors and it is not already installed. It uses the installed `@angular-devkit/build-angular` version, which pins `@angular/build` to the same version. When `@angular-devkit/build-angular` isn't installed, it uses the `@angular/core` version declared in `package.json`, limited to that minor (`^22.1.0` becomes `~22.1.0`). An existing version is preserved.
 
 Executor usage is detected on any target using `@nx/angular:application`, `@nx/angular:unit-test`, or an `@angular/build:*` executor. Targets that inherit their executor from an `nx.json` `targetDefaults` entry are detected too.
 

package/dist/src/migrations/update-23-1-0/add-trust-proxy-headers.js

@@ -32,14 +32,21 @@ async function default_1(tree) {
                     ts.isIdentifier(node.expression) &&
                     (node.expression.text === 'AngularNodeAppEngine' ||
                         node.expression.text === 'AngularAppEngine')) {
-                    if (!node.arguments || node.arguments.length === 0) {
+                    if (!node.arguments) {
+                        // `new AngularAppEngine` without parentheses has no argument list.
+                        recorder ??= new file_change_recorder_1.FileChangeRecorder(tree, path);
+                        recorder.insertRight(node.end, `({\n  ${TODO_COMMENT}\n  ${TRUST_PROXY_HEADERS}\n})`);
+                    }
+                    else if (node.arguments.length === 0) {
                         // No options object: insert one before the closing parenthesis.
                         recorder ??= new file_change_recorder_1.FileChangeRecorder(tree, path);
                         recorder.insertRight(node.end - 1, `{\n  ${TODO_COMMENT}\n  ${TRUST_PROXY_HEADERS}\n}`);
                     }
                     else if (ts.isObjectLiteralExpression(node.arguments[0])) {
                         const optionsArg = node.arguments[0];
-                        const hasTrustProxyHeaders = optionsArg.properties.some((prop) => ts.isPropertyAssignment(prop) &&
+                        // Any member kind counts (shorthand, method, accessor): adding the
+                        // property next to one would duplicate the key.
+                        const hasTrustProxyHeaders = optionsArg.properties.some((prop) => prop.name &&
                             (ts.isIdentifier(prop.name) || ts.isStringLiteral(prop.name)) &&
                             prop.name.text === 'trustProxyHeaders');
                         if (!hasTrustProxyHeaders) {

package/dist/src/migrations/update-24-0-0/add-ready-when-signal.d.ts

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