@nx/angular 24.0.0-canary.20261016-5ef7804 → 24.0.0-canary.20261020-e7ffd79

package/dist/fesm2022/nx-angular.mjs

@@ -1,4 +0,0 @@
-/**
- * Generated bundle index. Do not edit.
- */
-//# sourceMappingURL=nx-angular.mjs.map

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/executors/application/schema.json

@@ -522,8 +522,7 @@
             },
             "preloadInitial": {
               "type": "boolean",
-              "default": true,
-              "description": "Generates 'preload', 'modulepreload', and 'preconnect' link elements for initial application files and resources."
+              "description": "Generates 'preload', 'modulepreload', and 'preconnect' link elements for initial application files and resources. Defaults to false when a service worker is enabled; otherwise true. _Note: defaulting to false when a service worker is enabled only applies in Angular versions >= 22.2.0. Earlier versions default to true._"
             }
           },
           "required": ["input"]

package/dist/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-bundles.transform.js

@@ -12,8 +12,10 @@ exports.writeBundlesTransform = void 0;
 exports.removeSourceMappingUrl = removeSourceMappingUrl;
 exports.remapDeclarationMapSources = remapDeclarationMapSources;
 exports.normalizeEsm2022Path = normalizeEsm2022Path;
+const tslib_1 = require("tslib");
 const transform_1 = require("ng-packagr/src/lib/graph/transform");
 const nodes_1 = require("ng-packagr/src/lib/ng-package/nodes");
+const ngPackagrNodes = tslib_1.__importStar(require("ng-packagr/src/lib/ng-package/nodes"));
 const package_1 = require("ng-packagr/src/lib/ng-package/package");
 const path_1 = require("ng-packagr/src/lib/utils/path");
 const promises_1 = require("node:fs/promises");
@@ -29,9 +31,15 @@ async function shouldWriteFile(filePath, newContent) {
         return true;
     }
 }
+// ng-packagr 22.2.0 to 22.2.3 build entry points in parallel and export this
+// to find the one a graph is scoped to. 22.2.4 reverted that:
+// https://github.com/ng-packagr/ng-packagr/issues/3451
+const { getActiveEntryPoint } = ngPackagrNodes;
 const writeBundlesTransform = (_options) => {
     return (0, transform_1.transformFromPromise)(async (graph) => {
-        const entryPointNode = graph.find((0, nodes_1.isEntryPointInProgress)());
+        const entryPointNode = getActiveEntryPoint
+            ? getActiveEntryPoint(graph)
+            : graph.find((0, nodes_1.isEntryPointInProgress)());
         if (!entryPointNode) {
             return;
         }

package/dist/src/executors/unit-test/schema.json

@@ -22,7 +22,7 @@
     },
     "runnerConfig": {
       "type": ["string", "boolean"],
-      "description": "Specifies the configuration file for the selected test runner. If a string is provided, it will be used as the path to the configuration file. If `true`, the builder will search for a default configuration file (e.g., `vitest.config.ts` or `karma.conf.js`). If `false`, no external configuration file will be used.\\nFor Vitest, this enables advanced options and the use of custom plugins. Please note that while the file is loaded, the Angular team does not provide direct support for its specific contents or any third-party plugins used within it.",
+      "description": "Specifies the configuration file for the selected test runner. If a string is provided, it will be used as the path to the configuration file. If `true`, the builder will search for a default configuration file (e.g., `vitest-base.config.mts` or `karma.conf.js`). If `false`, no external configuration file will be used.\\nFor Vitest, this enables advanced options and the use of custom plugins. Please note that while the file is loaded, the Angular team does not provide direct support for its specific contents or any third-party plugins used within it.",
       "default": false
     },
     "browsers": {
@@ -46,6 +46,11 @@
       "type": "boolean",
       "description": "Enables isolation for test execution. When true, Vitest runs tests in separate threads or processes. This option is only available for the Vitest runner. Defaults to false to align with the Karma/Jasmine experience. _Note: this is only supported in Angular versions >= 22.0.0_."
     },
+    "splitting": {
+      "type": "boolean",
+      "description": "Enables code splitting for test execution. When enabled, shared code between test files is split into separate chunks. Issues with live ESM bindings in Node.js environments (such as uninitialized exports or mocking failures) can be resolved by disabling splitting. This option is only available for the Vitest runner. Defaults to `true`. _Note: this is only supported in Angular versions >= 22.2.0_.",
+      "x-deprecated": "No longer needed with Vitest 5."
+    },
     "quiet": {
       "type": "boolean",
       "description": "Suppresses the verbose build summary and stats table on each rebuild. Defaults to `true` locally and `false` in CI environments. _Note: this is only supported in Angular versions >= 22.0.0_."

package/dist/src/executors/unit-test/unit-test.impl.js

@@ -47,6 +47,11 @@ function validateOptions(options) {
             throw new Error(`The "quiet" option requires Angular version 22.0.0 or greater. You are currently using version ${angularVersion}.`);
         }
     }
+    if ((0, semver_1.lt)(angularVersion, '22.2.0')) {
+        if (options.splitting !== undefined) {
+            throw new Error(`The "splitting" option requires Angular version 22.2.0 or greater. You are currently using version ${angularVersion}.`);
+        }
+    }
 }
 /**
  * The Angular CLI unit-test builder only accepts the `@angular/build:application`

package/dist/src/executors/utilities/ng-packagr/stylesheet-processor.js

@@ -13,6 +13,7 @@ const devkit_1 = require("@nx/devkit");
 const browserslist_1 = tslib_1.__importDefault(require("browserslist"));
 const component_stylesheets_1 = require("ng-packagr/src/lib/styles/component-stylesheets");
 const postcss_configuration_1 = require("ng-packagr/src/lib/styles/postcss-configuration");
+const semver_1 = require("semver");
 const ng_packagr_version_1 = require("./ng-packagr-version");
 var CssUrl;
 (function (CssUrl) {
@@ -20,7 +21,13 @@ var CssUrl;
     CssUrl["none"] = "none";
 })(CssUrl || (exports.CssUrl = CssUrl = {}));
 function getStylesheetProcessor() {
-    const { major: ngPackagrMajorVersion } = (0, ng_packagr_version_1.getNgPackagrVersionInfo)();
+    const { major: ngPackagrMajorVersion, version: ngPackagrVersion } = (0, ng_packagr_version_1.getNgPackagrVersionInfo)();
+    // ng-packagr >= 22.2 resolves the style config once per package, older
+    // versions resolve it for each entry point
+    const resolvePerPackage = !(0, semver_1.lt)(ngPackagrVersion, '22.2.0');
+    // ng-packagr calls this factory once per build, so a later build in the
+    // same process reads config changes
+    const styleConfigCache = new Map();
     class StylesheetProcessor extends component_stylesheets_1.ComponentStylesheetBundler {
         constructor(projectBasePath, basePath, cssUrl, includePaths, sass, cacheDirectory, watch) {
             if (ngPackagrMajorVersion === 22) {
@@ -34,21 +41,17 @@ function getStylesheetProcessor() {
                     path: require.resolve('ng-packagr/.browserslistrc'),
                 });
             }
-            const browserslistData = (0, browserslist_1.default)(undefined, { path: basePath });
-            let searchDirs = (0, postcss_configuration_1.generateSearchDirectories)([projectBasePath]);
-            const postcssConfiguration = (0, postcss_configuration_1.loadPostcssConfiguration)(searchDirs);
-            // (nx-specific): we support loading the TailwindCSS config from the root of the workspace
-            searchDirs = (0, postcss_configuration_1.generateSearchDirectories)([projectBasePath, devkit_1.workspaceRoot]);
+            const { postcssConfiguration, tailwindConfiguration, target } = resolvePerPackage
+                ? getPackageStyleConfig(styleConfigCache, projectBasePath)
+                : resolveStyleConfig(projectBasePath, basePath);
             super({
                 cacheDirectory: cacheDirectory,
                 postcssConfiguration: postcssConfiguration,
-                tailwindConfiguration: postcssConfiguration
-                    ? undefined
-                    : (0, postcss_configuration_1.getTailwindConfig)(searchDirs, projectBasePath),
+                tailwindConfiguration: tailwindConfiguration,
                 sass: sass,
                 workspaceRoot: projectBasePath,
                 cssUrl: cssUrl,
-                target: transformSupportedBrowsersToTargets(browserslistData),
+                target: target,
                 includePaths: includePaths,
             }, 'css', watch);
             this.projectBasePath = projectBasePath;
@@ -65,6 +68,28 @@ function getStylesheetProcessor() {
     }
     return StylesheetProcessor;
 }
+function getPackageStyleConfig(styleConfigCache, projectBasePath) {
+    let config = styleConfigCache.get(projectBasePath);
+    if (!config) {
+        config = resolveStyleConfig(projectBasePath, projectBasePath);
+        styleConfigCache.set(projectBasePath, config);
+    }
+    return config;
+}
+function resolveStyleConfig(projectBasePath, browserslistPath) {
+    const browserslistData = (0, browserslist_1.default)(undefined, { path: browserslistPath });
+    let searchDirs = (0, postcss_configuration_1.generateSearchDirectories)([projectBasePath]);
+    const postcssConfiguration = (0, postcss_configuration_1.loadPostcssConfiguration)(searchDirs);
+    // (nx-specific): we support loading the TailwindCSS config from the root of the workspace
+    searchDirs = (0, postcss_configuration_1.generateSearchDirectories)([projectBasePath, devkit_1.workspaceRoot]);
+    return {
+        postcssConfiguration,
+        tailwindConfiguration: postcssConfiguration
+            ? undefined
+            : (0, postcss_configuration_1.getTailwindConfig)(searchDirs, projectBasePath),
+        target: transformSupportedBrowsersToTargets(browserslistData),
+    };
+}
 function transformSupportedBrowsersToTargets(supportedBrowsers) {
     const transformed = [];
     // https://esbuild.github.io/api/#target

package/dist/src/generators/add-linting/add-linting.js

@@ -26,8 +26,6 @@ async function addLintingGenerator(tree, options) {
         unitTestRunner: options.unitTestRunner,
         enableTypedLinting: (0, internal_3.isTypedLintingEnabled)(options),
         rootProject: rootProject,
-        addPlugin: options.addPlugin ?? false,
-        addExplicitTargets: true,
         skipPackageJson: options.skipPackageJson,
     }));
     // The angular-eslint presets, selector rules and dependency install below have

package/dist/src/generators/add-linting/schema.d.ts

@@ -13,5 +13,4 @@ export interface AddLintingGeneratorSchema {
   skipFormat?: boolean;
   skipPackageJson?: boolean;
   unitTestRunner?: string;
-  addPlugin?: boolean;
 }

package/dist/src/generators/application/application.js

@@ -21,7 +21,7 @@ async function applicationGenerator(tree, schema) {
     if (isRspack) {
         schema.bundler = 'webpack';
     }
-    const options = await (0, lib_1.normalizeOptions)(tree, schema, isRspack);
+    const options = await (0, lib_1.normalizeOptions)(tree, schema);
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
     await (0, js_1.initGenerator)(tree, {
         ...options,
@@ -32,7 +32,6 @@ async function applicationGenerator(tree, schema) {
     await (0, init_1.angularInitGenerator)(tree, {
         ...options,
         skipFormat: true,
-        addPlugin: options.addPlugin,
     });
     if (!options.skipPackageJson) {
         (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree, options.zoneless);

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

@@ -6,10 +6,6 @@ const internal_1 = require("@nx/devkit/internal");
 const internal_2 = require("@nx/eslint/internal");
 const versions_1 = require("../../../utils/versions");
 async function addE2e(tree, options) {
-    // since e2e are separate projects, default to adding plugins
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const addPlugin = nxJson['useInferencePlugins'] !== false &&
-        process.env.NX_ADD_PLUGINS !== 'false';
     const e2eWebServerInfo = getAngularE2EWebServerInfo(tree, options.name, options.port);
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
@@ -36,7 +32,6 @@ async function addE2e(tree, options) {
             ciWebServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
             ciBaseUrl: e2eWebServerInfo.e2eCiBaseUrl,
             rootProject: options.rootProject,
-            addPlugin,
         });
     }
     else if (options.e2eTestRunner === 'playwright') {
@@ -58,8 +53,9 @@ 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,
-            addPlugin,
         });
     }
     return e2eWebServerInfo.e2ePort;

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

@@ -17,6 +17,5 @@ async function addLinting(host, options) {
         skipPackageJson: options.skipPackageJson,
         unitTestRunner: options.unitTestRunner,
         skipFormat: true,
-        addPlugin: options.addPlugin,
     });
 }

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/add-unit-test-runner.js

@@ -12,7 +12,6 @@ async function addUnitTestRunner(host, options) {
                 projectRoot: options.appProjectRoot,
                 skipPackageJson: options.skipPackageJson,
                 strict: options.strict,
-                addPlugin: options.addPlugin,
                 runtimeTsconfigFileName: 'tsconfig.app.json',
                 zoneless: options.zoneless,
             });
@@ -30,7 +29,6 @@ async function addUnitTestRunner(host, options) {
                 skipFormat: options.skipFormat,
                 skipPackageJson: options.skipPackageJson,
                 strict: options.strict,
-                addPlugin: options.addPlugin,
                 zoneless: options.zoneless,
             });
         default:

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/application/lib/normalize-options.d.ts

@@ -1,4 +1,4 @@
 import { type Tree } from '@nx/devkit';
 import type { Schema } from '../schema';
 import type { NormalizedSchema } from './normalized-schema';
-export declare function normalizeOptions(host: Tree, options: Partial<Schema>, isRspack?: boolean): Promise<NormalizedSchema>;
+export declare function normalizeOptions(host: Tree, options: Partial<Schema>): Promise<NormalizedSchema>;

package/dist/src/generators/application/lib/normalize-options.js

@@ -6,18 +6,13 @@ const internal_1 = require("@nx/devkit/internal");
 const internal_2 = require("@nx/js/internal");
 const test_runners_1 = require("../../../utils/test-runners");
 const version_utils_1 = require("../../utils/version-utils");
-function arePluginsExplicitlyDisabled(host) {
-    const { useInferencePlugins } = (0, devkit_1.readNxJson)(host);
-    const addPluginEnvVar = process.env.NX_ADD_PLUGINS;
-    return useInferencePlugins === false || addPluginEnvVar === 'false';
-}
 function validateBundler(bundler) {
     if (['esbuild', 'webpack', 'rspack'].includes(bundler)) {
         return bundler;
     }
     throw new Error(`Invalid bundler: ${bundler}. Please use one of the following: 'esbuild', 'webpack', 'rspack'.`);
 }
-async function normalizeOptions(host, options, isRspack) {
+async function normalizeOptions(host, options) {
     await (0, internal_1.ensureRootProjectName)(options, 'application');
     const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
@@ -32,7 +27,6 @@ async function normalizeOptions(host, options, isRspack) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const bundler = validateBundler(options.bundler ?? 'esbuild');
-    const addPlugin = options.addPlugin ?? (!arePluginsExplicitlyDisabled(host) && isRspack);
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(host);
     const zonelessDefaultValue = angularMajorVersion >= 21 ? true : false;
     const unitTestRunner = options.unitTestRunner ??
@@ -43,7 +37,6 @@ async function normalizeOptions(host, options, isRspack) {
                 : test_runners_1.UnitTestRunner.Jest);
     // Set defaults and then overwrite with user options
     return {
-        addPlugin,
         style: 'css',
         routing: true,
         inlineStyle: false,

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

@@ -32,7 +32,6 @@ export interface Schema {
   bundler?: 'webpack' | 'esbuild' | 'rspack';
   ssr?: boolean;
   nxCloudToken?: string;
-  addPlugin?: boolean;
   zoneless?: boolean;
   formatter?: 'prettier' | 'oxfmt' | 'none';
 }

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");
@@ -356,7 +357,6 @@ async function convertToRspack(tree, schema) {
     // ensure plugin is registered
     const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
     await rspackInitGenerator(tree, {
-        addPlugin: true,
         framework: 'angular',
     });
     // find the inferred target names
@@ -491,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/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/schema.d.ts

@@ -39,6 +39,5 @@ export interface Schema {
   skipTests?: boolean;
   selector?: string;
   skipSelector?: boolean;
-  addPlugin?: boolean;
   skipTsConfig?: boolean;
 }

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
+      }
+    }
   });
 }