@nx/angular 24.0.0-canary.20261019-c4bb923 → 24.0.0-canary.20261020-e7ffd79

package/dist/generators.d.ts

@@ -9,10 +9,6 @@ export * from './src/generators/library/library';
 export * from './src/generators/ngrx-feature-store/ngrx-feature-store';
 export * from './src/generators/ngrx-root-store/ngrx-root-store';
 export * from './src/generators/pipe/pipe';
-export * from './src/generators/scam-directive/scam-directive';
-export * from './src/generators/scam-pipe/scam-pipe';
-export * from './src/generators/scam-to-standalone/scam-to-standalone';
-export * from './src/generators/scam/scam';
 export * from './src/generators/setup-ssr/setup-ssr';
 export * from './src/generators/stories/stories';
 export * from './src/generators/storybook-configuration/storybook-configuration';

package/dist/generators.js

@@ -13,10 +13,6 @@ tslib_1.__exportStar(require("./src/generators/library/library"), exports);
 tslib_1.__exportStar(require("./src/generators/ngrx-feature-store/ngrx-feature-store"), exports);
 tslib_1.__exportStar(require("./src/generators/ngrx-root-store/ngrx-root-store"), exports);
 tslib_1.__exportStar(require("./src/generators/pipe/pipe"), exports);
-tslib_1.__exportStar(require("./src/generators/scam-directive/scam-directive"), exports);
-tslib_1.__exportStar(require("./src/generators/scam-pipe/scam-pipe"), exports);
-tslib_1.__exportStar(require("./src/generators/scam-to-standalone/scam-to-standalone"), exports);
-tslib_1.__exportStar(require("./src/generators/scam/scam"), exports);
 tslib_1.__exportStar(require("./src/generators/setup-ssr/setup-ssr"), exports);
 tslib_1.__exportStar(require("./src/generators/stories/stories"), exports);
 tslib_1.__exportStar(require("./src/generators/storybook-configuration/storybook-configuration"), exports);

package/dist/ready-check.d.ts

@@ -0,0 +1 @@
+export declare function waitForDevServer(workspaceConfigPath: string): Promise<void>;

package/dist/ready-check.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitForDevServer = waitForDevServer;
+const dev_server_ready_check_1 = require("./src/plugins/utils/dev-server-ready-check");
+async function waitForDevServer(workspaceConfigPath) {
+    await (0, dev_server_ready_check_1.waitForAngularDevServer)(workspaceConfigPath);
+    process.exit(0);
+}

package/dist/src/generators/application/lib/add-e2e.js

@@ -53,6 +53,8 @@ async function addE2e(tree, options) {
             enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
             webServerCommand: e2eWebServerInfo.e2eWebServerCommand,
             webServerAddress: e2eWebServerInfo.e2eWebServerAddress,
+            ciWebServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
+            ciWebServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
             rootProject: options.rootProject,
         });
     }

package/dist/src/generators/application/lib/add-serve-static-target.js

@@ -14,6 +14,8 @@ function addFileServerTarget(tree, options, targetName, e2ePort) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.name);
     projectConfig.targets[targetName] = {
         continuous: true,
+        readyWhen: { signal: true },
+        dependsOn: ['build'],
         executor: '@nx/web:file-server',
         options: {
             buildTarget: `${options.name}:build`,

package/dist/src/generators/application/lib/create-project.js

@@ -80,6 +80,7 @@ function createProjectForEsbuild(tree, options) {
             },
             serve: {
                 continuous: true,
+                readyWhen: { signal: true },
                 executor: '@angular/build:dev-server',
                 options: options.port ? { port: options.port } : undefined,
                 configurations: {
@@ -173,6 +174,7 @@ function createProjectForWebpack(tree, options) {
             },
             serve: {
                 continuous: true,
+                readyWhen: { signal: true },
                 executor: '@angular-devkit/build-angular:dev-server',
                 options: options.port ? { port: options.port } : undefined,
                 configurations: {

package/dist/src/generators/convert-to-rspack/convert-to-rspack.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToRspack = convertToRspack;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
+const node_util_1 = require("node:util");
 const path_1 = require("path");
 const posix_1 = require("path/posix");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
@@ -490,6 +491,11 @@ async function convertToRspack(tree, schema) {
         if (serveTarget.config.continuous) {
             delete serveTarget.config.continuous;
         }
+        // Nx writes it for the dev server builders, and it would override the
+        // readyWhen inferred for the Rspack serve target
+        if ((0, node_util_1.isDeepStrictEqual)(serveTarget.config.readyWhen, { signal: true })) {
+            delete serveTarget.config.readyWhen;
+        }
         if (serveTarget.config.syncGenerators?.length === 1 &&
             serveTarget.config.syncGenerators[0] === '@nx/js:typescript-sync') {
             delete serveTarget.config.syncGenerators;

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/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/utils/testing.d.ts

@@ -4,3 +4,7 @@ import type { Schema as LibraryOptions } from '../library/schema';
 export declare function generateTestApplication(tree: Tree, options: ApplicationOptions): 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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTestApplication = generateTestApplication;
 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");
@@ -211,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-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;
+}>;

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const internal_1 = require("@nx/devkit/internal");
+async function update(tree) {
+    return (0, internal_1.addReadyWhenSignalToTargets)(tree, [
+        '@angular/build:dev-server',
+        '@angular-devkit/build-angular:dev-server',
+        '@angular-devkit/build-angular:ssr-dev-server',
+        '@nx/angular:dev-server',
+    ]);
+}

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

@@ -0,0 +1,59 @@
+#### Report when Angular dev server targets are ready
+
+Nx now knows when the Angular dev server builders are listening.
+Nx listens for that report only on targets that set `readyWhen: { signal: true }`.
+Tasks that depend on such a target with `waitFor: 'ready'` then start once the server is listening, instead of as soon as the target starts.
+
+This migration sets `readyWhen: { signal: true }` on every target in your projects that uses one of these builders:
+
+- `@angular/build:dev-server`
+- `@angular-devkit/build-angular:dev-server`
+- `@angular-devkit/build-angular:ssr-dev-server`
+- `@nx/angular:dev-server`
+
+A target without its own `executor` is updated too when a `targetDefaults` entry in `nx.json` gives it one of these builders.
+
+The migration leaves a target unchanged in these cases:
+
+- The target already sets `readyWhen`, including `null`.
+- The target sets `continuous: false`, or sets no `continuous` and the `targetDefaults` entry that applies to it sets `continuous: false`. Nx only checks readiness for continuous targets.
+- The `targetDefaults` entry that applies to the target sets `readyWhen`.
+
+#### Sample code changes
+
+##### Before
+
+```json title="apps/app1/project.json"
+{
+  // ...
+  "targets": {
+    "serve": {
+      "continuous": true,
+      "executor": "@angular/build:dev-server",
+      "options": {
+        "buildTarget": "app1:build"
+      }
+    }
+  }
+}
+```
+
+##### After
+
+```json title="apps/app1/project.json" {10-12}
+{
+  // ...
+  "targets": {
+    "serve": {
+      "continuous": true,
+      "executor": "@angular/build:dev-server",
+      "options": {
+        "buildTarget": "app1:build"
+      },
+      "readyWhen": {
+        "signal": true
+      }
+    }
+  }
+}
+```

package/dist/src/migrations/update-24-0-0/remove-scam-generator-defaults.d.ts

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

package/dist/src/migrations/update-24-0-0/remove-scam-generator-defaults.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const COLLECTION = '@nx/angular';
+const REMOVED_GENERATORS = [
+    'scam',
+    'scam-directive',
+    'scam-pipe',
+    'scam-to-standalone',
+];
+async function default_1(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (nxJson && removeGeneratorDefaults(nxJson)) {
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+    const angularJsonProjects = removeAngularJsonGeneratorDefaults(tree);
+    for (const [projectName, project] of (0, devkit_1.getProjects)(tree)) {
+        // updateProjectConfiguration can't write angular.json projects.
+        if (angularJsonProjects.has(projectName)) {
+            continue;
+        }
+        if (removeGeneratorDefaults(project)) {
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+    return { skipAgentic: true };
+}
+function removeAngularJsonGeneratorDefaults(tree) {
+    if (!tree.exists('angular.json')) {
+        return new Set();
+    }
+    const angularJson = (0, devkit_1.readJson)(tree, 'angular.json');
+    const projects = isRecord(angularJson.projects)
+        ? angularJson.projects
+        : {};
+    let changed = false;
+    for (const project of Object.values(projects)) {
+        if (!isRecord(project)) {
+            continue;
+        }
+        // The Angular CLI uses `schematics`, and Nx also reads `generators`.
+        for (const key of ['schematics', 'generators']) {
+            const config = { generators: project[key] };
+            if (removeGeneratorDefaults(config)) {
+                project[key] = config.generators;
+                changed = true;
+            }
+        }
+    }
+    if (changed) {
+        (0, devkit_1.writeJson)(tree, 'angular.json', angularJson);
+    }
+    return new Set(Object.keys(projects));
+}
+function removeGeneratorDefaults(config) {
+    const { generators } = config;
+    if (!isRecord(generators)) {
+        return false;
+    }
+    let changed = removeKeys(generators, REMOVED_GENERATORS.map((generator) => `${COLLECTION}:${generator}`));
+    const collection = generators[COLLECTION];
+    if (isRecord(collection) && removeKeys(collection, REMOVED_GENERATORS)) {
+        changed = true;
+        if (Object.keys(collection).length === 0) {
+            delete generators[COLLECTION];
+        }
+    }
+    if (changed && Object.keys(generators).length === 0) {
+        // `delete` would keep the old value: updateProjectConfiguration merges into package.json `nx`.
+        config.generators = undefined;
+    }
+    return changed;
+}
+function removeKeys(obj, keys) {
+    const presentKeys = keys.filter((key) => key in obj);
+    for (const key of presentKeys) {
+        delete obj[key];
+    }
+    return presentKeys.length > 0;
+}
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}

package/dist/src/migrations/update-24-0-0/remove-scam-generator-defaults.md

@@ -0,0 +1,48 @@
+#### Remove defaults for the removed SCAM generators
+
+Nx v24 removes the generators that created and converted single component Angular modules (SCAMs):
+
+- `@nx/angular:scam`
+- `@nx/angular:scam-directive`
+- `@nx/angular:scam-pipe`
+- `@nx/angular:scam-to-standalone`
+
+Nx no longer reads generator defaults set for them.
+This migration removes those defaults from `nx.json` and from the configuration of every project, including projects defined in `angular.json`.
+It handles both the `"@nx/angular:scam"` key form and the nested `"@nx/angular": { "scam": {} }` form.
+When the removal leaves the `@nx/angular` entry or the whole `generators` object (`schematics` in `angular.json`) empty, the migration removes it too.
+
+The migration doesn't change commands or scripts that run these generators.
+Use the `@nx/angular:component`, `@nx/angular:directive`, or `@nx/angular:pipe` generators instead.
+
+#### Sample code changes
+
+##### Before
+
+```json title="nx.json"
+{
+  "generators": {
+    "@nx/angular:component": {
+      "type": "component"
+    },
+    "@nx/angular:scam": {
+      "type": "component"
+    },
+    "@nx/angular:scam-directive": {
+      "type": "directive"
+    }
+  }
+}
+```
+
+##### After
+
+```json title="nx.json"
+{
+  "generators": {
+    "@nx/angular:component": {
+      "type": "component"
+    }
+  }
+}
+```

package/dist/src/plugins/plugin.js

@@ -138,8 +138,10 @@ async function buildAngularProjects(configFilePath, options, angularWorkspaceRoo
             else if (knownExecutors.build.has(angularTarget.builder)) {
                 await updateBuildTarget(projectName, nxTargetName, targets[nxTargetName], angularTarget, context, angularWorkspaceRoot, project.root, namedInputs);
             }
-            else if (knownExecutors.devServer.has(angularTarget.builder)) {
+            else if (knownExecutors.devServer.has(angularTarget.builder) ||
+                knownExecutors.serveSsr.has(angularTarget.builder)) {
                 targets[nxTargetName].continuous = true;
+                targets[nxTargetName].readyWhen = (0, internal_1.getReadyCheckReadyWhen)('@nx/angular/ready-check', (0, node_path_1.basename)(configFilePath));
                 targets[nxTargetName].metadata.help.example.options = { port: 4201 };
             }
             else if (knownExecutors.extractI18n.has(angularTarget.builder)) {
@@ -153,10 +155,6 @@ async function buildAngularProjects(configFilePath, options, angularWorkspaceRoo
             else if (knownExecutors.server.has(angularTarget.builder)) {
                 updateServerTarget(targets[nxTargetName], angularTarget, context, angularWorkspaceRoot, project.root, namedInputs);
             }
-            else if (knownExecutors.serveSsr.has(angularTarget.builder)) {
-                targets[nxTargetName].continuous = true;
-                targets[nxTargetName].metadata.help.example.options = { port: 4201 };
-            }
             else if (knownExecutors.prerender.has(angularTarget.builder)) {
                 prerenderTargets.push({ target: nxTargetName, project: projectName });
             }

package/dist/src/plugins/utils/dev-server-ready-check.d.ts

@@ -0,0 +1,17 @@
+import { type ServerAddress } from '@nx/devkit/internal';
+import type { AngularProjectConfiguration } from '../plugin';
+export interface AngularWorkspace {
+    projects?: Record<string, AngularProjectConfiguration>;
+}
+/**
+ * Where the dev server of the task's `ng serve` or `ng run` command listens,
+ * resolved the way the Angular CLI and the target's builder resolve it, or
+ * null when nothing can be probed.
+ */
+export declare function getDevServerAddress(options: Record<string, unknown>, workspace: AngularWorkspace, root: string): ServerAddress | null;
+/**
+ * The readyWhen of the inferred dev server targets. Runs in the env and with
+ * the options of the task, resolves the target its `ng` command runs from the
+ * workspace config, and waits for the dev server's port.
+ */
+export declare function waitForAngularDevServer(workspaceConfigPath: string): Promise<void>;