@nx/angular 20.8.0-canary.20250408-32b48a3 → 20.8.0-canary.20250412-07ad2d7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "20.8.0-canary.20250408-32b48a3",
+  "version": "20.8.0-canary.20250412-07ad2d7",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -72,14 +72,14 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "20.8.0-canary.20250408-32b48a3",
-    "@nx/js": "20.8.0-canary.20250408-32b48a3",
-    "@nx/eslint": "20.8.0-canary.20250408-32b48a3",
-    "@nx/webpack": "20.8.0-canary.20250408-32b48a3",
-    "@nx/rspack": "20.8.0-canary.20250408-32b48a3",
-    "@nx/module-federation": "20.8.0-canary.20250408-32b48a3",
-    "@nx/web": "20.8.0-canary.20250408-32b48a3",
-    "@nx/workspace": "20.8.0-canary.20250408-32b48a3",
+    "@nx/devkit": "20.8.0-canary.20250412-07ad2d7",
+    "@nx/js": "20.8.0-canary.20250412-07ad2d7",
+    "@nx/eslint": "20.8.0-canary.20250412-07ad2d7",
+    "@nx/webpack": "20.8.0-canary.20250412-07ad2d7",
+    "@nx/rspack": "20.8.0-canary.20250412-07ad2d7",
+    "@nx/module-federation": "20.8.0-canary.20250412-07ad2d7",
+    "@nx/web": "20.8.0-canary.20250412-07ad2d7",
+    "@nx/workspace": "20.8.0-canary.20250412-07ad2d7",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

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

@@ -22,7 +22,7 @@ async function addLintingGenerator(tree, options) {
         setParserOptionsProject: options.setParserOptionsProject,
         skipFormat: true,
         rootProject: rootProject,
-        addPlugin: false,
+        addPlugin: options.addPlugin ?? false,
         addExplicitTargets: true,
         skipPackageJson: options.skipPackageJson,
     });

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

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

package/src/generators/application/application.js

@@ -6,13 +6,18 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 const js_1 = require("@nx/js");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const init_1 = require("../init/init");
+const convert_to_rspack_1 = require("../convert-to-rspack/convert-to-rspack");
 const setup_ssr_1 = require("../setup-ssr/setup-ssr");
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
 const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
 const lib_1 = require("./lib");
 async function applicationGenerator(tree, schema) {
     (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'application');
-    const options = await (0, lib_1.normalizeOptions)(tree, schema);
+    const isRspack = schema.bundler === 'rspack';
+    if (isRspack) {
+        schema.bundler = 'webpack';
+    }
+    const options = await (0, lib_1.normalizeOptions)(tree, schema, isRspack);
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
     await (0, js_1.initGenerator)(tree, {
         ...options,
@@ -23,6 +28,7 @@ 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);
@@ -64,6 +70,13 @@ async function applicationGenerator(tree, schema) {
             serverRouting: options.serverRouting,
         });
     }
+    if (isRspack) {
+        await (0, convert_to_rspack_1.convertToRspack)(tree, {
+            project: options.name,
+            skipInstall: options.skipPackageJson,
+            skipFormat: true,
+        });
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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

@@ -7,8 +7,8 @@ const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaul
 async function addE2e(tree, options) {
     // since e2e are separate projects, default to adding plugins
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
+    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);

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

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

package/src/generators/application/lib/add-unit-test-runner.js

@@ -12,6 +12,7 @@ async function addUnitTestRunner(host, options) {
                 projectRoot: options.appProjectRoot,
                 skipPackageJson: options.skipPackageJson,
                 strict: options.strict,
+                addPlugin: options.addPlugin,
             });
             break;
         case test_runners_1.UnitTestRunner.Vitest:
@@ -20,6 +21,7 @@ async function addUnitTestRunner(host, options) {
                 projectRoot: options.appProjectRoot,
                 skipPackageJson: options.skipPackageJson,
                 strict: options.strict,
+                addPlugin: options.addPlugin,
             });
             break;
     }

package/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>): Promise<NormalizedSchema>;
+export declare function normalizeOptions(host: Tree, options: Partial<Schema>, isRspack?: boolean): Promise<NormalizedSchema>;

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

@@ -5,7 +5,12 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../../utils/test-runners");
-async function normalizeOptions(host, options) {
+function arePluginsExplicitlyDisabled(host) {
+    const { useInferencePlugins } = (0, devkit_1.readNxJson)(host);
+    const addPluginEnvVar = process.env.NX_ADD_PLUGINS;
+    return useInferencePlugins === false || addPluginEnvVar === 'false';
+}
+async function normalizeOptions(host, options, isRspack) {
     await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
     const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
@@ -20,8 +25,10 @@ async function normalizeOptions(host, options) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const bundler = options.bundler ?? 'esbuild';
+    const addPlugin = options.addPlugin ?? (!arePluginsExplicitlyDisabled(host) && isRspack);
     // Set defaults and then overwrite with user options
     return {
+        addPlugin,
         style: 'css',
         routing: true,
         inlineStyle: false,

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

@@ -27,8 +27,9 @@ export interface Schema {
   standalone?: boolean;
   rootProject?: boolean;
   minimal?: boolean;
-  bundler?: 'webpack' | 'esbuild';
+  bundler?: 'webpack' | 'esbuild' | 'rspack';
   ssr?: boolean;
   serverRouting?: boolean;
   nxCloudToken?: string;
+  addPlugin?: boolean;
 }

package/src/generators/application/schema.json

@@ -171,7 +171,7 @@
     "bundler": {
       "description": "Bundler to use to build the application.",
       "type": "string",
-      "enum": ["esbuild", "webpack"],
+      "enum": ["esbuild", "rspack", "webpack"],
       "default": "esbuild",
       "x-prompt": "Which bundler do you want to use to build the application?",
       "x-priority": "important"

package/src/generators/component-test/component-test.js

@@ -6,7 +6,7 @@ const versions_1 = require("../../utils/versions");
 const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
 async function componentTestGenerator(tree, options) {
     (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-    const { assertMinimumCypressVersion } = require('@nx/cypress/src/utils/cypress-version');
+    const { assertMinimumCypressVersion } = require('@nx/cypress/src/utils/versions');
     assertMinimumCypressVersion(10);
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const componentDirPath = (0, devkit_1.joinPathFragments)(root, options.componentDir);

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

@@ -282,8 +282,8 @@ async function convertToRspack(tree, schema) {
                     handleDevServerTargetOptions(tree, configuration, configurationOptions[configurationName].devServer, project.root);
                 }
             }
+            serveTargetNames.push(targetName);
         }
-        serveTargetNames.push(targetName);
     }
     const customWebpackConfigInfo = customWebpackConfigPath
         ? await (0, get_custom_webpack_config_1.getCustomWebpackConfig)(tree, project.root, customWebpackConfigPath)
@@ -307,6 +307,7 @@ async function convertToRspack(tree, schema) {
     if (!schema.skipInstall) {
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             '@nx/angular-rspack': versions_1.angularRspackVersion,
+            'ts-node': versions_1.tsNodeVersion,
         });
         tasks.push(installTask);
     }

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

@@ -4,6 +4,7 @@ exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 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,
@@ -36,7 +37,8 @@ async function addProject(tree, libraryOptions) {
             defaultConfiguration: 'production',
         };
         if (libraryOptions.publishable) {
-            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)(tree, libraryOptions.name, project);
+            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);

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/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,
     });
 }