@nx/angular 21.0.0-canary.20250206-8bd0bcd → 21.0.0-canary.20250418-8619c1d

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

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCustomWebpackConfig = getCustomWebpackConfig;
+exports.convertWebpackConfigToUseNxModuleFederationPlugin = convertWebpackConfigToUseNxModuleFederationPlugin;
+const devkit_1 = require("@nx/devkit");
+const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
+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, config_utils_1.loadConfigFile)((0, path_1.join)(tree.root, pathToCustomWebpackConfig));
+    const webpackConfig = 'default' in configFile ? configFile.default : configFile;
+    return {
+        isWebpackConfigFunction: typeof webpackConfig === 'function',
+        normalizedPathToCustomWebpackConfig: `./${(0, path_1.relative)(projectRoot, pathToCustomWebpackConfig).replace(FILE_EXTENSION_REGEX, '')}`,
+    };
+}
+function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents) {
+    let newWebpackConfigContents = webpackConfigContents;
+    let ast = tsquery_1.tsquery.ast(webpackConfigContents);
+    const withModuleFederationImportNodes = (0, tsquery_1.tsquery)(ast, 'ImportDeclaration:has(StringLiteral[value=@nx/module-federation/angular])');
+    if (withModuleFederationImportNodes.length > 0) {
+        const withModuleFederationImportNode = withModuleFederationImportNodes[0];
+        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationImportNode.getStart())}import { NxModuleFederationPlugin } from '@nx/module-federation/rspack';${webpackConfigContents.slice(withModuleFederationImportNode.getEnd())}`;
+        ast = tsquery_1.tsquery.ast(newWebpackConfigContents);
+        const exportedWithModuleFederationNodes = (0, tsquery_1.tsquery)(ast, '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,
+        }),
+      ]
+    }
+    `;
+        }
+        else {
+            devkit_1.logger.warn("Could not find 'export default withModuleFederation' in the webpack config file. Skipping conversion.");
+        }
+    }
+    const withModuleFederationRequireNodes = (0, tsquery_1.tsquery)(ast, '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 } = require('@nx/module-federation/rspack');${webpackConfigContents.slice(withModuleFederationRequireNode.getEnd())}`;
+        ast = tsquery_1.tsquery.ast(newWebpackConfigContents);
+        const exportedWithModuleFederationNodes = (0, tsquery_1.tsquery)(ast, '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,
+        }),
+      ]
+    }
+    `;
+        }
+        else {
+            devkit_1.logger.warn("Could not find 'module.exports = withModuleFederation' in the webpack config file. Skipping conversion.");
+        }
+    }
+    return newWebpackConfigContents;
+}

package/src/generators/convert-to-rspack/lib/update-tsconfig.d.ts

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

package/src/generators/convert-to-rspack/lib/update-tsconfig.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateTsconfig = updateTsconfig;
+const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
+function updateTsconfig(tree, projectRoot) {
+    const tsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.json');
+    const tsconfig = (0, devkit_1.readJson)(tree, tsconfigPath);
+    tsconfig['ts-node'] ??= {};
+    tsconfig['ts-node'].compilerOptions ??= {};
+    tsconfig['ts-node'].compilerOptions.module = 'CommonJS';
+    tsconfig['ts-node'].compilerOptions.moduleResolution = 'Node10';
+    if (tsconfig.compilerOptions?.customConditions) {
+        tsconfig['ts-node'].compilerOptions.customConditions = null;
+    }
+    else {
+        const rootTsconfigFile = (0, js_1.getRootTsConfigFileName)(tree);
+        if (rootTsconfigFile) {
+            const rootTsconfigJson = (0, devkit_1.readJson)(tree, rootTsconfigFile);
+            if (rootTsconfigJson.compilerOptions?.customConditions) {
+                tsconfig['ts-node'].compilerOptions.customConditions = null;
+            }
+        }
+    }
+    (0, devkit_1.writeJson)(tree, tsconfigPath, tsconfig);
+}

package/src/generators/convert-to-rspack/lib/validate-supported-executor.d.ts

@@ -0,0 +1,2 @@
+import { TargetConfiguration } from '@nx/devkit';
+export declare function validateSupportedBuildExecutor(targets: TargetConfiguration[]): void;

package/src/generators/convert-to-rspack/lib/validate-supported-executor.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateSupportedBuildExecutor = validateSupportedBuildExecutor;
+const SUPPORTED_BUILD_EXECUTORS = [
+    '@angular-devkit/build-angular:browser',
+    '@nx/angular:webpack-browser',
+];
+function validateSupportedBuildExecutor(targets) {
+    const executorsUsedByProject = targets.map((target) => target.executor);
+    if (!executorsUsedByProject.some((executor) => SUPPORTED_BUILD_EXECUTORS.includes(executor))) {
+        throw new Error('The project does not use a supported build executor. Please use one of the following executors: ' +
+            SUPPORTED_BUILD_EXECUTORS.join(', '));
+    }
+}

package/src/generators/convert-to-rspack/schema.d.ts

@@ -0,0 +1,5 @@
+export interface ConvertToRspackSchema {
+  project: string;
+  skipFormat?: boolean;
+  skipInstall?: boolean;
+}

package/src/generators/convert-to-rspack/schema.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "GeneratorNxApp",
+  "title": "Creates an Angular application.",
+  "description": "Creates an Angular application.",
+  "type": "object",
+  "cli": "nx",
+  "properties": {
+    "project": {
+      "type": "string",
+      "aliases": ["name", "projectName"],
+      "description": "Project for which to convert to rspack.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-priority": "important"
+    },
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false
+    },
+    "skipInstall": {
+      "description": "Skip installing dependencies.",
+      "type": "boolean",
+      "default": false
+    }
+  }
+}

package/src/generators/host/host.js

@@ -39,7 +39,7 @@ async function host(tree, schema) {
             }
         });
     }
-    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
     const { projectName: hostProjectName, projectRoot: appRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',

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

@@ -20,7 +20,6 @@ export interface Schema {
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;
   strict?: boolean;
-  standaloneConfig?: boolean;
   inlineStyle?: boolean;
   inlineTemplate?: boolean;
   viewEncapsulation?: 'Emulated' | 'Native' | 'None';

package/src/generators/host/schema.json

@@ -144,12 +144,6 @@
       "description": "Create an application with stricter type checking and build optimization options.",
       "default": true
     },
-    "standaloneConfig": {
-      "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean",
-      "default": true,
-      "x-deprecated": "Nx only supports standaloneConfig"
-    },
     "setParserOptionsProject": {
       "type": "boolean",
       "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",

package/src/generators/library/lib/add-project.d.ts

@@ -1,4 +1,4 @@
 import type { Tree } from '@nx/devkit';
 import type { AngularProjectConfiguration } from '../../../utils/types';
 import type { NormalizedSchema } from './normalized-schema';
-export declare function addProject(tree: Tree, libraryOptions: NormalizedSchema['libraryOptions']): AngularProjectConfiguration;
+export declare function addProject(tree: Tree, libraryOptions: NormalizedSchema['libraryOptions']): Promise<AngularProjectConfiguration>;

package/src/generators/library/lib/add-project.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
-function addProject(tree, libraryOptions) {
+const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
+const use_legacy_versioning_1 = require("nx/src/command-line/release/config/use-legacy-versioning");
+async function addProject(tree, libraryOptions) {
     const project = {
         name: libraryOptions.name,
         root: libraryOptions.projectRoot,
@@ -34,6 +36,10 @@ function addProject(tree, libraryOptions) {
             },
             defaultConfiguration: 'production',
         };
+        if (libraryOptions.publishable) {
+            const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
+            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)((0, use_legacy_versioning_1.shouldUseLegacyVersioning)(nxJson.release), tree, libraryOptions.name, project);
+        }
     }
     (0, devkit_1.addProjectConfiguration)(tree, libraryOptions.name, project);
     return project;

package/src/generators/library/lib/normalize-options.js

@@ -22,7 +22,7 @@ async function normalizeOptions(host, schema) {
         skipModule: schema.skipModule || schema.standalone,
         ...schema,
     };
-    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',

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

@@ -12,7 +12,6 @@ export interface NormalizedSchema {
         buildable?: boolean;
         publishable?: boolean;
         importPath?: string;
-        standaloneConfig?: boolean;
         spec?: boolean;
         commonModule?: boolean;
         routing?: boolean;

package/src/generators/library/library.js

@@ -25,6 +25,7 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 const test_runners_1 = require("../../utils/test-runners");
 const add_vitest_1 = require("../utils/add-vitest");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
 async function libraryGenerator(tree, schema) {
     (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'library');
     // Do some validation checks
@@ -49,7 +50,7 @@ async function libraryGenerator(tree, schema) {
     if (!libraryOptions.skipPackageJson) {
         (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree);
     }
-    const project = (0, add_project_1.addProject)(tree, libraryOptions);
+    const project = await (0, add_project_1.addProject)(tree, libraryOptions);
     (0, create_files_1.createFiles)(tree, options, project);
     (0, update_tsconfig_1.updateTsConfig)(tree, libraryOptions);
     await addUnitTestRunner(tree, libraryOptions);
@@ -76,6 +77,9 @@ async function libraryGenerator(tree, schema) {
             'ng-packagr': pkgVersions.ngPackagrVersion,
         }, undefined, true);
         (0, dependencies_1.addBuildableLibrariesPostCssDependencies)(tree);
+        if (libraryOptions.publishable) {
+            await (0, add_release_config_1.releaseTasks)(tree);
+        }
     }
     (0, js_1.addTsConfigPath)(tree, libraryOptions.importPath, [
         (0, devkit_1.joinPathFragments)(libraryOptions.projectRoot, './src', 'index.ts'),

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

@@ -12,7 +12,6 @@ export interface Schema {
   buildable?: boolean;
   publishable?: boolean;
   importPath?: string;
-  standaloneConfig?: boolean;
   spec?: boolean;
   flat?: boolean;
   commonModule?: boolean;

package/src/generators/library/schema.json

@@ -108,12 +108,6 @@
       "enum": ["eslint", "none"],
       "default": "eslint"
     },
-    "standaloneConfig": {
-      "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean",
-      "default": true,
-      "x-deprecated": "Nx only supports standaloneConfig"
-    },
     "compilationMode": {
       "description": "Specifies the compilation mode to use. If not specified, it will default to `partial` for publishable libraries and to `full` for buildable libraries. The `full` value can not be used for publishable libraries.",
       "type": "string",

package/src/generators/move/move.d.ts

@@ -1,3 +1,6 @@
 import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
+/**
+ * @deprecated Use the `@nx/workspace:move` generator instead. It will be removed in Nx v22.
+ */
 export declare function angularMoveGenerator(tree: Tree, schema: Schema): Promise<void>;

package/src/generators/move/move.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularMoveGenerator = angularMoveGenerator;
 const move_1 = require("@nx/workspace/src/generators/move/move");
+/**
+ * @deprecated Use the `@nx/workspace:move` generator instead. It will be removed in Nx v22.
+ */
 async function angularMoveGenerator(tree, schema) {
     process.env.NX_ANGULAR_MOVE_INVOKED = 'true';
     await (0, move_1.moveGenerator)(tree, schema);

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

@@ -173,8 +173,8 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         }
         else if (this.isCypressE2eProject()) {
             (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            const { installedCypressVersion, } = require('@nx/cypress/src/utils/cypress-version');
-            this.cypressInstalledVersion = installedCypressVersion();
+            const { getInstalledCypressMajorVersion, } = require('@nx/cypress/src/utils/versions');
+            this.cypressInstalledVersion = getInstalledCypressMajorVersion(this.tree);
             this.project = {
                 ...this.project,
                 name,

package/src/generators/ngrx/ngrx.d.ts

@@ -1,4 +1,7 @@
 import type { GeneratorCallback, Tree } from '@nx/devkit';
 import type { NgRxGeneratorOptions } from './schema';
+/**
+ * @deprecated Use the 'ngrx-root-store' and 'ngrx-feature-store' generators instead. It will be removed in Nx v22.
+ */
 export declare function ngrxGenerator(tree: Tree, schema: NgRxGeneratorOptions): Promise<GeneratorCallback>;
 export default ngrxGenerator;

package/src/generators/ngrx/ngrx.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngrxGenerator = ngrxGenerator;
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
+/**
+ * @deprecated Use the 'ngrx-root-store' and 'ngrx-feature-store' generators instead. It will be removed in Nx v22.
+ */
 async function ngrxGenerator(tree, schema) {
     (0, lib_1.validateOptions)(tree, schema);
     const options = (0, lib_1.normalizeOptions)(tree, schema);

package/src/generators/ngrx/schema.json

@@ -3,7 +3,7 @@
   "$id": "NxNgrxGenerator",
   "title": "Add NgRx support to an application or library.",
   "description": "Adds NgRx support to an application or library.",
-  "x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Use the 'ngrx-root-store' and 'ngrx-feature-store' generators instead.",
+  "x-deprecated": "Use the 'ngrx-root-store' and 'ngrx-feature-store' generators instead. It will be removed in Nx v22.",
   "cli": "nx",
   "type": "object",
   "examples": [

package/src/generators/ngrx-feature-store/schema.d.ts

@@ -2,7 +2,7 @@ export interface Schema {
   name: string;
   minimal: boolean;
   parent: string;
-  directory?: string;
+  directory: string;
   route?: string;
   barrels?: boolean;
   facade?: boolean;

package/src/generators/remote/remote.js

@@ -18,7 +18,7 @@ async function remote(tree, schema) {
     if (options.host && !projects.has(options.host)) {
         throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
     }
-    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
     const { projectName: remoteProjectName } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',

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

@@ -19,7 +19,6 @@ export interface Schema {
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;
   strict?: boolean;
-  standaloneConfig?: boolean;
   inlineStyle?: boolean;
   inlineTemplate?: boolean;
   viewEncapsulation?: 'Emulated' | 'Native' | 'None';

package/src/generators/remote/schema.json

@@ -138,12 +138,6 @@
       "description": "Create an application with stricter type checking and build optimization options.",
       "default": true
     },
-    "standaloneConfig": {
-      "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean",
-      "default": true,
-      "x-deprecated": "Nx only supports standaloneConfig"
-    },
     "setParserOptionsProject": {
       "type": "boolean",
       "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",

package/src/generators/setup-mf/lib/setup-serve-target.js

@@ -17,6 +17,7 @@ function setupServeTarget(host, options) {
     };
     if (options.mfType === 'remote') {
         appConfig.targets['serve-static'] = {
+            continuous: true,
             executor: '@nx/web:file-server',
             defaultConfiguration: 'production',
             options: {

package/src/generators/setup-ssr/files/v19+/application-builder/ngmodule-src/app/__rootModuleFileName__

@@ -1,13 +1,13 @@
 import { NgModule } from '@angular/core';
 import { ServerModule } from '@angular/platform-server';<% if(serverRouting) { %>
-import { provideServerRoutesConfig } from '@angular/ssr';<% } %>
+import { <%= provideServerRoutingFn %> } from '@angular/ssr';<% } %>
 import { AppComponent } from './app.component';
 import { AppModule } from './app.module';<% if(serverRouting) { %>
 import { serverRoutes } from './app.routes.server';<% } %>
 
 @NgModule({
   imports: [AppModule, ServerModule],<% if(serverRouting) { %>
-  providers: [provideServerRoutesConfig(serverRoutes)],<% } %>
+  providers: [<%= provideServerRoutingFn %>(serverRoutes)],<% } %>
   bootstrap: [AppComponent],
 })
 export class <%= rootModuleClassName %> {}

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

@@ -61,6 +61,6 @@ if (isMainModule(import.meta.url)) {
 }
 
 /**
- * The request handler used by the Angular CLI (dev-server and during build).
+ * Request handler used by the Angular CLI (for dev-server and during build) or Firebase Cloud Functions.
  */
 export const reqHandler = createNodeRequestHandler(app);

package/src/generators/setup-ssr/files/v19+/application-builder/standalone-src/app/app.config.server.ts__tpl__

@@ -1,13 +1,13 @@
 import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
 import { provideServerRendering } from '@angular/platform-server';<% if(serverRouting) { %>
-import { provideServerRoutesConfig } from '@angular/ssr';<% } %>
+import { <%= provideServerRoutingFn %> } from '@angular/ssr';<% } %>
 import { appConfig } from './app.config';<% if(serverRouting) { %>
 import { serverRoutes } from './app.routes.server';<% } %>
 
 const serverConfig: ApplicationConfig = {
   providers: [
     provideServerRendering()<% if(serverRouting) { %>,
-    provideServerRoutesConfig(serverRoutes)<% } %>
+    <%= provideServerRoutingFn %>(serverRoutes)<% } %>
   ]
 };
 

package/src/generators/setup-ssr/files/v19+/application-builder-common-engine/server/__serverFileName__

@@ -63,3 +63,5 @@ if (isMainModule(import.meta.url)) {
     console.log(`Node Express server listening on http://localhost:${port}`);
   });
 }
+
+export default app;

package/src/generators/setup-ssr/lib/generate-files.js

@@ -4,6 +4,7 @@ exports.generateSSRFiles = generateSSRFiles;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const version_utils_1 = require("../../utils/version-utils");
+const semver_1 = require("semver");
 function generateSSRFiles(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (project.targets.server ||
@@ -24,7 +25,17 @@ function generateSSRFiles(tree, options) {
         pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', options.standalone ? 'standalone-src' : 'ngmodule-src');
     }
     const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
-    (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, { ...options, tpl: '' });
+    const ssrVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/ssr');
+    const cleanedSsrVersion = ssrVersion
+        ? (0, semver_1.clean)(ssrVersion) ?? (0, semver_1.coerce)(ssrVersion).version
+        : null;
+    (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, {
+        ...options,
+        provideServerRoutingFn: !cleanedSsrVersion || (0, semver_1.gte)(cleanedSsrVersion, '19.2.0')
+            ? 'provideServerRouting'
+            : 'provideServerRoutesConfig',
+        tpl: '',
+    });
     if (angularMajorVersion >= 19 && !options.serverRouting) {
         tree.delete((0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.routes.server.ts'));
     }

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

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

package/src/generators/stories/stories.js

@@ -7,7 +7,7 @@ const component_story_1 = tslib_1.__importDefault(require("../component-story/co
 const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const module_info_1 = require("../utils/storybook-ast/module-info");
-const minimatch_1 = require("minimatch");
+const picomatch = require("picomatch");
 const versions_1 = require("../../utils/versions");
 async function angularStoriesGenerator(tree, options) {
     const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.name);
@@ -17,7 +17,7 @@ async function angularStoriesGenerator(tree, options) {
         componentsInfo.push(...(0, component_info_1.getComponentsInfo)(tree, entryPoint, moduleFilePaths, options.name), ...(0, component_info_1.getStandaloneComponentsInfo)(tree, entryPoint));
     }
     const componentInfos = componentsInfo.filter((f) => !options.ignorePaths?.some((pattern) => {
-        const shouldIgnorePath = (0, minimatch_1.minimatch)((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
+        const shouldIgnorePath = picomatch(pattern)((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`));
         return shouldIgnorePath;
     }));
     for (const info of componentInfos) {

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

@@ -4,5 +4,6 @@ export type AddJestOptions = {
     projectRoot: string;
     skipPackageJson: boolean;
     strict: boolean;
+    addPlugin?: boolean;
 };
 export declare function addJest(tree: Tree, options: AddJestOptions): Promise<void>;

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

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

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

@@ -4,5 +4,6 @@ export type AddVitestOptions = {
     projectRoot: string;
     skipPackageJson: boolean;
     strict: boolean;
+    addPlugin?: boolean;
 };
 export declare function addVitest(tree: Tree, options: AddVitestOptions): Promise<void>;

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

@@ -10,6 +10,6 @@ async function addVitest(tree, options) {
         uiFramework: 'angular',
         testEnvironment: 'jsdom',
         coverageProvider: 'v8',
-        addPlugin: false,
+        addPlugin: options.addPlugin ?? false,
     });
 }

package/src/generators/utils/ensure-angular-dependencies.js

@@ -19,7 +19,6 @@ function ensureAngularDependencies(tree) {
         const rxjsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'rxjs') ?? pkgVersions.rxjsVersion;
         const tsLibVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'tslib') ?? pkgVersions.tsLibVersion;
         const zoneJsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'zone.js') ?? pkgVersions.zoneJsVersion;
-        dependencies['@angular/animations'] = angularVersion;
         dependencies['@angular/common'] = angularVersion;
         dependencies['@angular/compiler'] = angularVersion;
         dependencies['@angular/core'] = angularVersion;

package/src/migrations/update-16-2-0/switch-data-persistence-operators-imports-to-ngrx-router-store.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const project_graph_1 = require("nx/src/config/project-graph");
+const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
+const version_utils_1 = require("../../generators/utils/version-utils");
 const file_change_recorder_1 = require("../../utils/file-change-recorder");
-const versions_1 = require("../../utils/versions");
 const projects_1 = require("../utils/projects");
-const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
-const project_graph_1 = require("nx/src/config/project-graph");
 let tsquery;
 const angularPluginTargetNames = ['npm:@nx/angular', 'npm:@nrwl/angular'];
 const dataPersistenceOperators = [
@@ -109,7 +109,7 @@ function addNgrxRouterStoreIfNotInstalled(tree) {
         devDependencies?.['@ngrx/router-store']) {
         return;
     }
-    (0, devkit_1.addDependenciesToPackageJson)(tree, { '@ngrx/router-store': versions_1.ngrxVersion }, {});
+    (0, devkit_1.addDependenciesToPackageJson)(tree, { '@ngrx/router-store': (0, version_utils_1.versions)(tree).ngrxVersion }, {});
 }
 function filterFilesWithNxAngularDep(files) {
     const filteredFiles = [];

package/src/migrations/update-19-6-0/turn-off-dts-by-default.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const minimatch_1 = require("minimatch");
+const picomatch = require("picomatch");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 async function default_1(tree) {
     (0, devkit_1.visitNotIgnoredFiles)(tree, '', (path) => {
         const webpackConfigGlob = '**/webpack*.config*.{js,ts,mjs,cjs}';
-        const result = (0, minimatch_1.minimatch)(path, webpackConfigGlob);
+        const result = picomatch(webpackConfigGlob)(path);
         if (!result) {
             return;
         }

package/src/migrations/{update-16-1-0 → update-20-5-0}/update-angular-cli.d.ts

@@ -1,3 +1,3 @@
 import { Tree } from '@nx/devkit';
-export declare const angularCliVersion = "~16.0.0";
+export declare const angularCliVersion = "~19.2.0";
 export default function (tree: Tree): Promise<void>;

package/src/migrations/{update-16-1-0 → update-20-5-0}/update-angular-cli.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularCliVersion = void 0;
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-exports.angularCliVersion = '~16.0.0';
+exports.angularCliVersion = '~19.2.0';
 async function default_1(tree) {
     let shouldFormat = false;
     (0, devkit_1.updateJson)(tree, 'package.json', (json) => {