@nx/angular 21.0.0-beta.4 → 21.0.0-beta.5

package/src/generators/add-linting/lib/create-eslint-configuration.js

@@ -5,7 +5,7 @@ exports.createEsLintConfiguration = createEsLintConfiguration;
 const devkit_1 = require("@nx/devkit");
 const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
 /**
- * @deprecated Use tools from `@nx/eslint/src/generators/utils/eslint-file` instead
+ * @deprecated Use tools from `@nx/eslint/src/generators/utils/eslint-file` instead. It will be removed in Nx v22.
  */
 const extendAngularEslintJson = (json, options) => {
     const overrides = [
@@ -53,7 +53,7 @@ const extendAngularEslintJson = (json, options) => {
 };
 exports.extendAngularEslintJson = extendAngularEslintJson;
 /**
- * @deprecated Use {@link extendAngularEslintJson} instead
+ * @deprecated Use {@link extendAngularEslintJson} instead. It will be removed in Nx v22.
  */
 function createEsLintConfiguration(tree, options) {
     const rootConfig = `${(0, devkit_1.offsetFromRoot)(options.projectRoot)}.eslintrc.json`;

package/src/generators/application/application.js

@@ -76,6 +76,12 @@ async function applicationGenerator(tree, schema) {
             skipInstall: options.skipPackageJson,
             skipFormat: true,
         });
+        if (options.ssr) {
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/rspack-ssr'), options.appProjectSourceRoot, {
+                pathToDistFolder: (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.appProjectRoot), options.outputPath, 'browser'),
+                tmpl: '',
+            });
+        }
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/application/files/rspack-ssr/server.ts__tmpl__

@@ -0,0 +1,72 @@
+import 'zone.js/node';
+
+import { APP_BASE_HREF } from '@angular/common';
+import { CommonEngine } from '@angular/ssr/node';
+import * as express from 'express';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import bootstrap from './main.server';
+
+// The Express app is exported so that it can be used by serverless Functions.
+export function app(): express.Express {
+  const server = express();
+  const distFolder = join(process.cwd(), "<%= pathToDistFolder %>");
+  const indexHtml = existsSync(join(distFolder, 'index.original.html'))
+    ? join(distFolder, 'index.original.html')
+    : join(distFolder, 'index.html');
+
+  const commonEngine = new CommonEngine();
+
+  server.set('view engine', 'html');
+  server.set('views', distFolder);
+
+  // Example Express Rest API endpoints
+  // server.get('/api/**', (req, res) => { });
+  // Serve static files from /browser
+  server.get(
+    '*.*',
+    express.static(distFolder, {
+      maxAge: '1y',
+    })
+  );
+
+  // All regular routes use the Angular engine
+  server.get('*', (req, res, next) => {
+    const { protocol, originalUrl, baseUrl, headers } = req;
+
+    commonEngine
+      .render({
+        bootstrap,
+        documentFilePath: indexHtml,
+        url: `${protocol}://${headers.host}${originalUrl}`,
+        publicPath: distFolder,
+        providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
+      })
+      .then((html) => res.send(html))
+      .catch((err) => next(err));
+  });
+
+  return server;
+}
+
+function run(): void {
+  const port = process.env['PORT'] || 4000;
+
+  // Start up the Node server
+  const server = app();
+  server.listen(port, () => {
+    console.log(`Node Express server listening on http://localhost:${port}`);
+  });
+}
+
+// Webpack will replace 'require' with '__webpack_require__'
+// '__non_webpack_require__' is a proxy to Node 'require'
+// The below code is to ensure that the server is run only when not requiring the bundle.
+declare const __non_webpack_require__: NodeRequire;
+const mainModule = __non_webpack_require__.main;
+const moduleFilename = (mainModule && mainModule.filename) || '';
+if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
+  run();
+}
+
+export default bootstrap;

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 async function addE2e(tree, options) {
     // since e2e are separate projects, default to adding plugins
     const nxJson = (0, devkit_1.readNxJson)(tree);
@@ -37,9 +36,6 @@ async function addE2e(tree, options) {
             rootProject: options.rootProject,
             addPlugin,
         });
-        if (addPlugin) {
-            await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(tree, '@nx/cypress/plugin', '^build', (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'cypress.config.ts'));
-        }
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
@@ -63,9 +59,6 @@ async function addE2e(tree, options) {
             rootProject: options.rootProject,
             addPlugin,
         });
-        if (addPlugin) {
-            await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(tree, '@nx/playwright/plugin', '^build', (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'playwright.config.ts'));
-        }
     }
     return e2eWebServerInfo.e2ePort;
 }

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

@@ -14,7 +14,9 @@ const enquirer_1 = require("enquirer");
 const SUPPORTED_EXECUTORS = [
     '@angular-devkit/build-angular:browser',
     '@angular-devkit/build-angular:dev-server',
+    '@angular-devkit/build-angular:server',
     '@nx/angular:webpack-browser',
+    '@nx/angular:webpack-server',
     '@nx/angular:dev-server',
     '@nx/angular:module-federation-dev-server',
 ];
@@ -22,20 +24,12 @@ const RENAMED_OPTIONS = {
     main: 'browser',
     ngswConfigPath: 'serviceWorker',
 };
+const DEFAULT_PORT = 4200;
 const REMOVED_OPTIONS = [
-    'publicHost',
-    'disableHostCheck',
-    'resourcesOutputPath',
-    'routesFile',
-    'routes',
-    'discoverRoutes',
-    'appModuleBundle',
-    'inputIndexPath',
-    'outputIndexPath',
     'buildOptimizer',
-    'deployUrl',
     'buildTarget',
     'browserTarget',
+    'publicHost',
 ];
 function normalizeFromProjectRoot(tree, path, projectRoot) {
     if (projectRoot === '.') {
@@ -256,6 +250,7 @@ async function convertToRspack(tree, schema) {
     const serveTargetNames = [];
     let customWebpackConfigPath;
     (0, validate_supported_executor_1.validateSupportedBuildExecutor)(Object.values(project.targets));
+    let projectServePort = DEFAULT_PORT;
     for (const [targetName, target] of Object.entries(project.targets)) {
         if (target.executor === '@angular-devkit/build-angular:browser' ||
             target.executor === '@nx/angular:webpack-browser') {
@@ -268,12 +263,22 @@ async function convertToRspack(tree, schema) {
             }
             buildTargetNames.push(targetName);
         }
+        else if (target.executor === '@angular-devkit/build-angular:server' ||
+            target.executor === '@nx/angular:webpack-server') {
+            createConfigOptions.ssr ??= {};
+            createConfigOptions.ssr.entry ??= normalizeFromProjectRoot(tree, target.options.main, project.root);
+            createConfigOptions.server = './src/main.server.ts';
+            buildTargetNames.push(targetName);
+        }
         else if (target.executor === '@angular-devkit/build-angular:dev-server' ||
             target.executor === '@nx/angular:dev-server' ||
             target.executor === '@nx/angular:module-federation-dev-server') {
             createConfigOptions.devServer = {};
             if (target.options) {
                 handleDevServerTargetOptions(tree, target.options, createConfigOptions.devServer, project.root);
+                if (target.options.port !== DEFAULT_PORT) {
+                    projectServePort = target.options.port;
+                }
             }
             if (target.configurations) {
                 for (const [configurationName, configuration] of Object.entries(target.configurations)) {
@@ -293,6 +298,11 @@ async function convertToRspack(tree, schema) {
     for (const targetName of [...buildTargetNames, ...serveTargetNames]) {
         delete project.targets[targetName];
     }
+    if (projectServePort !== DEFAULT_PORT) {
+        project.targets.serve ??= {};
+        project.targets.serve.options ??= {};
+        project.targets.serve.options.port = projectServePort;
+    }
     (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
     const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
     await rspackInitGenerator(tree, {

package/src/generators/convert-to-rspack/lib/create-config.js

@@ -9,7 +9,7 @@ function createConfig(tree, opts, configurationOptions = {}, existingWebpackConf
         ? Object.entries(configurationOptions)
             .map(([configurationName, configurationOptions]) => {
             return `
-      ${configurationName}: {
+      "${configurationName}": {
         options: {
           ${JSON.stringify(configurationOptions, undefined, 2).slice(1, -1)}
         }
@@ -17,6 +17,12 @@ function createConfig(tree, opts, configurationOptions = {}, existingWebpackConf
         })
             .join(',\n')
         : '';
+    const createConfigContents = `createConfig({ 
+    options: {
+      root: __dirname,
+      ${JSON.stringify(createConfigOptions, undefined, 2).slice(1, -1)}
+    }
+  }${hasConfigurations ? `, {${expandedConfigurationOptions}}` : ''});`;
     const configContents = `
   import { createConfig }from '@nx/angular-rspack';
   ${existingWebpackConfigPath
@@ -26,23 +32,14 @@ function createConfig(tree, opts, configurationOptions = {}, existingWebpackConf
             : `import webpackMerge from 'webpack-merge';`}`
         : ''}
   
-  ${existingWebpackConfigPath ? 'const baseConfig = ' : 'export default '}createConfig({ 
-    options: {
-      root: __dirname,
-      ${JSON.stringify(createConfigOptions, undefined, 2).slice(1, -1)}
-    }
-  }${hasConfigurations ? `, {${expandedConfigurationOptions}}` : ''});
   ${existingWebpackConfigPath
-        ? `
-    export default ${isExistingWebpackConfigFunction
-            ? `async function (env, argv) { 
-        const oldConfig = await baseWebpackConfig;
+        ? `export default async () => {
+        const baseConfig = await ${createConfigContents}
+        ${isExistingWebpackConfigFunction
+            ? `const oldConfig = await baseWebpackConfig;
         const browserConfig = baseConfig[0];
-        return oldConfig(browserConfig);
-        }`
-            : 'webpackMerge(baseConfig[0], baseWebpackConfig);'}
-  `
-        : ''}
-  `;
+        return oldConfig(browserConfig);`
+            : 'return webpackMerge(baseConfig[0], baseWebpackConfig);'}};`
+        : `export default ${createConfigContents}`}`;
     tree.write((0, devkit_1.joinPathFragments)(root, 'rspack.config.ts'), configContents);
 }

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

@@ -30,7 +30,7 @@ function convertWebpackConfigToUseNxModuleFederationPlugin(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())}`;
+        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationImportNode.getStart())}import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } 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) {
@@ -38,9 +38,10 @@ function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents
             newWebpackConfigContents = `${newWebpackConfigContents.slice(0, exportedWithModuleFederationNode.getStart())}${newWebpackConfigContents.slice(exportedWithModuleFederationNode.getEnd())}
     export default {
       plugins: [
-        new NxModuleFederationPlugin(config, {
+        new NxModuleFederationPlugin({ config }, {
           dts: false,
         }),
+        new NxModuleFederationDevServerPlugin({ config }),
       ]
     }
     `;
@@ -52,7 +53,7 @@ function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents
     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())}`;
+        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationRequireNode.getStart())}const { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } = 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) {
@@ -63,6 +64,7 @@ function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents
         new NxModuleFederationPlugin({ config }, {
           dts: false,
         }),
+        new NxModuleFederationDevServerPlugin({ config }),
       ]
     }
     `;

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/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/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-16-1-0/remove-ngcc-invocation.d.ts → update-21-0-0/change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence.d.ts}

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

package/src/migrations/update-21-0-0/change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence.js

@@ -0,0 +1,122 @@
+"use strict";
+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 projects_1 = require("../utils/projects");
+let tsquery;
+const angularPluginTargetNames = ['npm:@nx/angular', 'npm:@nrwl/angular'];
+const dataPersistenceOperators = [
+    'fetch',
+    'navigation',
+    'optimisticUpdate',
+    'pessimisticUpdate',
+];
+const newImportPath = '@ngrx/router-store/data-persistence';
+async function default_1(tree) {
+    const projects = await (0, projects_1.getProjectsFilteredByDependencies)(tree, angularPluginTargetNames);
+    if (!projects.length) {
+        return;
+    }
+    (0, ensure_typescript_1.ensureTypescript)();
+    tsquery = require('@phenomnomnominal/tsquery').tsquery;
+    const cachedFileMap = (0, nx_deps_cache_1.readFileMapCache)().fileMap.projectFileMap;
+    const filesWithNxAngularImports = [];
+    for (const { graphNode } of projects) {
+        const files = filterFilesWithNxAngularDep(cachedFileMap[graphNode.name] || []);
+        filesWithNxAngularImports.push(...files);
+    }
+    let isAnyFileUsingDataPersistence = false;
+    for (const { file } of filesWithNxAngularImports) {
+        const updated = replaceDataPersistenceInFile(tree, file);
+        isAnyFileUsingDataPersistence ||= updated;
+    }
+    if (isAnyFileUsingDataPersistence) {
+        addNgrxRouterStoreIfNotInstalled(tree);
+        await (0, devkit_1.formatFiles)(tree);
+    }
+}
+function replaceDataPersistenceInFile(tree, file) {
+    const fileContents = tree.read(file, 'utf-8');
+    const fileAst = tsquery.ast(fileContents);
+    // "\\u002F" is the unicode code for "/", there's an issue with the query parser
+    // that prevents using "/" directly in regex queries
+    // https://github.com/estools/esquery/issues/68#issuecomment-415597670
+    const NX_ANGULAR_IMPORT_SELECTOR = 'ImportDeclaration:has(StringLiteral[value=/@(nx|nrwl)\\u002Fangular$/])';
+    const nxAngularImports = tsquery(fileAst, NX_ANGULAR_IMPORT_SELECTOR, { visitAllChildren: true });
+    if (!nxAngularImports.length) {
+        return false;
+    }
+    const recorder = new file_change_recorder_1.FileChangeRecorder(tree, file);
+    const IMPORT_SPECIFIERS_SELECTOR = 'ImportClause NamedImports ImportSpecifier';
+    for (const importDeclaration of nxAngularImports) {
+        const importSpecifiers = tsquery(importDeclaration, IMPORT_SPECIFIERS_SELECTOR, { visitAllChildren: true });
+        if (!importSpecifiers.length) {
+            continue;
+        }
+        // no imported symbol is a data persistence operator, skip
+        if (importSpecifiers.every((i) => !isOperatorImport(i))) {
+            continue;
+        }
+        // all imported symbols are data persistence operators, change import path
+        if (importSpecifiers.every((i) => isOperatorImport(i))) {
+            const IMPORT_PATH_SELECTOR = `${NX_ANGULAR_IMPORT_SELECTOR} > StringLiteral`;
+            const importPathNode = tsquery(importDeclaration, IMPORT_PATH_SELECTOR, {
+                visitAllChildren: true,
+            });
+            recorder.replace(importPathNode[0], `'${newImportPath}'`);
+            continue;
+        }
+        // mixed imports, split data persistence operators to a separate import
+        const operatorImportSpecifiers = [];
+        for (const importSpecifier of importSpecifiers) {
+            if (isOperatorImport(importSpecifier)) {
+                operatorImportSpecifiers.push(importSpecifier.getText());
+                recorder.remove(importSpecifier.getStart(), importSpecifier.getEnd() +
+                    (hasTrailingComma(recorder.originalContent, importSpecifier)
+                        ? 1
+                        : 0));
+            }
+        }
+        recorder.insertLeft(importDeclaration.getStart(), `import { ${operatorImportSpecifiers.join(', ')} } from '${newImportPath}';`);
+    }
+    if (recorder.hasChanged()) {
+        recorder.applyChanges();
+        return true;
+    }
+    return false;
+}
+function hasTrailingComma(content, node) {
+    return content[node.getEnd()] === ',';
+}
+function isOperatorImport(importSpecifier) {
+    return dataPersistenceOperators.includes(getOriginalIdentifierTextFromImportSpecifier(importSpecifier));
+}
+function getOriginalIdentifierTextFromImportSpecifier(importSpecifier) {
+    const children = importSpecifier.getChildren();
+    if (!children.length) {
+        return importSpecifier.getText();
+    }
+    return children[0].getText();
+}
+function addNgrxRouterStoreIfNotInstalled(tree) {
+    const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
+    if (dependencies?.['@ngrx/router-store'] ||
+        devDependencies?.['@ngrx/router-store']) {
+        return;
+    }
+    (0, devkit_1.addDependenciesToPackageJson)(tree, { '@ngrx/router-store': (0, version_utils_1.versions)(tree).ngrxVersion }, {});
+}
+function filterFilesWithNxAngularDep(files) {
+    const filteredFiles = [];
+    for (const file of files) {
+        if (file.deps?.some((dep) => angularPluginTargetNames.includes((0, project_graph_1.fileDataDepTarget)(dep)))) {
+            filteredFiles.push(file);
+        }
+    }
+    return filteredFiles;
+}

package/src/utils/nx-devkit/ast-utils.d.ts

@@ -1,14 +1,6 @@
 import { Tree } from '@nx/devkit';
 import type * as ts from 'typescript';
 type DecoratorName = 'Component' | 'Directive' | 'NgModule' | 'Pipe';
-/**
- * Check if the Component, Directive or Pipe is standalone
- * @param sourceFile TS Source File containing the token to check
- * @param decoratorName The type of decorator to check (Component, Directive, Pipe)
- *
- * @deprecated Use the function signature with a Tree. This signature will be removed in v21.
- */
-export declare function isStandalone(sourceFile: ts.SourceFile, decoratorName: DecoratorName): boolean;
 /**
  * Check if the Component, Directive or Pipe is standalone
  * @param tree The file system tree

package/src/utils/nx-devkit/ast-utils.js

@@ -77,18 +77,13 @@ function _angularImportsFromNode(node, _sourceFile) {
         return {};
     }
 }
-function isStandalone(treeOrSourceFile, sourceFileOrDecoratorName, decoratorName) {
-    let tree;
-    let sourceFile;
-    if (decoratorName === undefined) {
-        sourceFile = treeOrSourceFile;
-        decoratorName = sourceFileOrDecoratorName;
-    }
-    else {
-        tree = treeOrSourceFile;
-        sourceFile = sourceFileOrDecoratorName;
-        decoratorName = decoratorName;
-    }
+/**
+ * Check if the Component, Directive or Pipe is standalone
+ * @param tree The file system tree
+ * @param sourceFile TS Source File containing the token to check
+ * @param decoratorName The type of decorator to check (Component, Directive, Pipe)
+ */
+function isStandalone(tree, sourceFile, decoratorName) {
     const decoratorMetadata = getDecoratorMetadata(sourceFile, decoratorName, '@angular/core');
     const hasStandaloneTrue = decoratorMetadata.some((node) => node.getText().includes('standalone: true'));
     if (hasStandaloneTrue) {

package/src/utils/versions.d.ts

@@ -2,7 +2,7 @@ export declare const nxVersion: any;
 export declare const angularVersion = "~19.2.0";
 export declare const angularDevkitVersion = "~19.2.0";
 export declare const ngPackagrVersion = "~19.2.0";
-export declare const angularRspackVersion = "~20.6.1";
+export declare const angularRspackVersion = "^20.7.0";
 export declare const ngrxVersion = "^19.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.15.0";

package/src/utils/versions.js

@@ -5,7 +5,7 @@ exports.nxVersion = require('../../package.json').version;
 exports.angularVersion = '~19.2.0';
 exports.angularDevkitVersion = '~19.2.0';
 exports.ngPackagrVersion = '~19.2.0';
-exports.angularRspackVersion = '~20.6.1';
+exports.angularRspackVersion = '^20.7.0';
 exports.ngrxVersion = '^19.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.15.0';

package/fesm2022/nx-angular-testing.mjs

@@ -1,45 +0,0 @@
-import { toArray, first } from 'rxjs/operators';
-
-/**
- * @deprecated This will be removed in Nx v21. If using RxJS 7, use `firstValueFrom(obs$.pipe(toArray()))`
- * or `lastValueFrom(obs$.pipe(toArray()))`. If using RxJS 6, use `obs$.pipe(toArray()).toPromise()`.
- *
- * @whatItDoes reads all the values from an observable and returns a promise
- * with an array of all values. This should be used in combination with async/await.
- *
- * ## Example
- *
- * ```typescript
- * const obs = of(1, 2, 3, 4);
- * const res = await readAll(obs)
- * expect(res).toEqual([1, 2, 3, 4]);
- * ```
- */
-function readAll(o) {
-    return o.pipe(toArray()).toPromise();
-}
-/**
- * @deprecated This will be removed in Nx v21. Since RxJS 7, use `firstValueFrom(obs$)`. If using RxJS 6,
- * use `obs$.pipe(first()).toPromise()`.
- *
- * @whatItDoes reads the first value from an observable and returns a promise
- * with it. This should be used in combination with async/await.
- *
- * ## Example
- *
- * ```typescript
- * const obs = of(1, 2, 3, 4);
- * const res = await readFirst(obs)
- * expect(res).toEqual(1);
- * ```
- */
-function readFirst(o) {
-    return o.pipe(first()).toPromise();
-}
-
-/**
- * Generated bundle index. Do not edit.
- */
-
-export { readAll, readFirst };
-//# sourceMappingURL=nx-angular-testing.mjs.map

package/fesm2022/nx-angular-testing.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"nx-angular-testing.mjs","sources":["../../../../packages/angular/testing/src/testing-utils.ts","../../../../packages/angular/testing/nx-angular-testing.ts"],"sourcesContent":["import type { Observable } from 'rxjs';\nimport { first, toArray } from 'rxjs/operators';\n\n/**\n * @deprecated This will be removed in Nx v21. If using RxJS 7, use `firstValueFrom(obs$.pipe(toArray()))`\n * or `lastValueFrom(obs$.pipe(toArray()))`. If using RxJS 6, use `obs$.pipe(toArray()).toPromise()`.\n *\n * @whatItDoes reads all the values from an observable and returns a promise\n * with an array of all values. This should be used in combination with async/await.\n *\n * ## Example\n *\n * ```typescript\n * const obs = of(1, 2, 3, 4);\n * const res = await readAll(obs)\n * expect(res).toEqual([1, 2, 3, 4]);\n * ```\n */\nexport function readAll<T>(o: Observable<T>): Promise<T[]> {\n  return o.pipe(toArray()).toPromise();\n}\n\n/**\n * @deprecated This will be removed in Nx v21. Since RxJS 7, use `firstValueFrom(obs$)`. If using RxJS 6,\n * use `obs$.pipe(first()).toPromise()`.\n *\n * @whatItDoes reads the first value from an observable and returns a promise\n * with it. This should be used in combination with async/await.\n *\n * ## Example\n *\n * ```typescript\n * const obs = of(1, 2, 3, 4);\n * const res = await readFirst(obs)\n * expect(res).toEqual(1);\n * ```\n */\nexport function readFirst<T>(o: Observable<T>): Promise<T> {\n  return o.pipe(first()).toPromise();\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;AAGA;;;;;;;;;;;;;;AAcG;AACG,SAAU,OAAO,CAAI,CAAgB,EAAA;IACzC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,EAAE;AACtC;AAEA;;;;;;;;;;;;;;AAcG;AACG,SAAU,SAAS,CAAI,CAAgB,EAAA;IAC3C,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE;AACpC;;ACvCA;;AAEG;;;;"}

package/src/migrations/update-16-0-0/remove-karma-defaults.d.ts

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