@nx/angular 21.0.0-beta.0 → 21.0.0-beta.2

package/generators.json

@@ -38,6 +38,11 @@
       "schema": "./src/generators/convert-to-application-executor/schema.json",
       "description": "Converts projects to use the `@nx/angular:application` executor or the `@angular-devkit/build-angular:application` builder."
     },
+    "convert-to-rspack": {
+      "factory": "./src/generators/convert-to-rspack/convert-to-rspack",
+      "schema": "./src/generators/convert-to-rspack/schema.json",
+      "description": "Converts Angular Webpack projects to use Rspack."
+    },
     "directive": {
       "factory": "./src/generators/directive/directive",
       "schema": "./src/generators/directive/schema.json",

package/migrations.json

@@ -347,6 +347,15 @@
       },
       "description": "Update the @angular/cli package version to ~19.1.0.",
       "factory": "./src/migrations/update-20-4-0/update-angular-cli"
+    },
+    "update-angular-cli-version-19-2-0": {
+      "cli": "nx",
+      "version": "20.5.0-beta.5",
+      "requires": {
+        "@angular/core": ">=19.2.0"
+      },
+      "description": "Update the @angular/cli package version to ~19.2.0.",
+      "factory": "./src/migrations/update-20-5-0/update-angular-cli"
     }
   },
   "packageJsonUpdates": {
@@ -1049,6 +1058,22 @@
         "@angular-eslint/utils": {
           "version": "^18.0.1",
           "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/schematics": {
+          "version": "^18.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/test-utils": {
+          "version": "^18.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/builder": {
+          "version": "^18.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/bundled-angular-compiler": {
+          "version": "^18.0.1",
+          "alwaysAddToPackageJson": false
         }
       }
     },
@@ -1316,6 +1341,10 @@
           "version": "~19.0.0",
           "alwaysAddToPackageJson": false
         },
+        "@angular/google-maps": {
+          "version": "~19.0.0",
+          "alwaysAddToPackageJson": false
+        },
         "ng-packagr": {
           "version": "~19.0.0",
           "alwaysAddToPackageJson": false
@@ -1368,6 +1397,22 @@
         "@angular-eslint/utils": {
           "version": "^19.0.0",
           "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/schematics": {
+          "version": "^19.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/test-utils": {
+          "version": "^19.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/builder": {
+          "version": "^19.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/bundled-angular-compiler": {
+          "version": "^19.0.0",
+          "alwaysAddToPackageJson": false
         }
       }
     },
@@ -1410,6 +1455,22 @@
         "@angular-eslint/utils": {
           "version": "^19.0.2",
           "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/schematics": {
+          "version": "^19.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/test-utils": {
+          "version": "^19.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/builder": {
+          "version": "^19.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/bundled-angular-compiler": {
+          "version": "^19.0.2",
+          "alwaysAddToPackageJson": false
         }
       }
     },
@@ -1480,11 +1541,125 @@
           "version": "~19.1.0",
           "alwaysAddToPackageJson": false
         },
+        "@angular/google-maps": {
+          "version": "~19.1.0",
+          "alwaysAddToPackageJson": false
+        },
         "ng-packagr": {
           "version": "~19.1.0",
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.5.0": {
+      "version": "20.5.0-beta.5",
+      "x-prompt": "Do you want to update the Angular version to v19.2?",
+      "requires": {
+        "@angular/core": ">=19.1.0 <19.2.0"
+      },
+      "packages": {
+        "@angular-devkit/build-angular": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/core": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/schematics": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/build": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/pwa": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/ssr": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@schematics/angular": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/architect": {
+          "version": "~0.1902.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-webpack": {
+          "version": "~0.1902.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/core": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@angular/material": {
+          "version": "~19.2.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/cdk": {
+          "version": "~19.2.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/google-maps": {
+          "version": "~19.2.1",
+          "alwaysAddToPackageJson": false
+        },
+        "ng-packagr": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "20.5.0-angular-eslint": {
+      "version": "20.5.0-rc.1",
+      "requires": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "@angular/core": ">= 19.0.0 < 20.0.0"
+      },
+      "packages": {
+        "angular-eslint": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/eslint-plugin": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/eslint-plugin-template": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/template-parser": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/utils": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/schematics": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/test-utils": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/builder": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/bundled-angular-compiler": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/ng-package.json

@@ -15,7 +15,7 @@
     "@typescript-eslint/",
     "picocolors",
     "ignore",
-    "minimatch",
+    "picomatch",
     "rxjs-for-await",
     "webpack-merge",
     "ts-node",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "21.0.0-beta.0",
+  "version": "21.0.0-beta.2",
   "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": {
@@ -65,19 +65,21 @@
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^8.0.0",
+    "enquirer": "~2.3.6",
     "picocolors": "^1.1.0",
+    "picomatch": "4.0.2",
     "magic-string": "~0.30.2",
-    "minimatch": "9.0.3",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "21.0.0-beta.0",
-    "@nx/js": "21.0.0-beta.0",
-    "@nx/eslint": "21.0.0-beta.0",
-    "@nx/webpack": "21.0.0-beta.0",
-    "@nx/module-federation": "21.0.0-beta.0",
-    "@nx/web": "21.0.0-beta.0",
-    "@nx/workspace": "21.0.0-beta.0",
+    "@nx/devkit": "21.0.0-beta.2",
+    "@nx/js": "21.0.0-beta.2",
+    "@nx/eslint": "21.0.0-beta.2",
+    "@nx/webpack": "21.0.0-beta.2",
+    "@nx/rspack": "21.0.0-beta.2",
+    "@nx/module-federation": "21.0.0-beta.2",
+    "@nx/web": "21.0.0-beta.2",
+    "@nx/workspace": "21.0.0-beta.2",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/builders/dev-server/dev-server.impl.js

@@ -118,9 +118,7 @@ function executeDevServerBuilder(rawOptions, context) {
                     // run the target for all projects.
                     // This will occur when workspaceDependencies = []
                     if (workspaceDependencies.length > 0) {
-                        baseWebpackConfig.plugins.push(
-                        // @ts-expect-error - difference between angular and webpack plugin definitions bc of webpack versions
-                        new webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${parsedBuildTarget.target} --projects=${workspaceDependencies.join(',')}`));
+                        baseWebpackConfig.plugins.push(new webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${parsedBuildTarget.target} --projects=${workspaceDependencies.join(',')}`, { skipWatchingDeps: !options.watchDependencies }));
                     }
                 }
                 if (!pathToWebpackConfig) {
@@ -151,6 +149,7 @@ function getDelegateBuilderOptions(options) {
     }
     // delete extra option not supported by the delegate builder
     delete delegateBuilderOptions.buildLibsFromSource;
+    delete delegateBuilderOptions.watchDependencies;
     return delegateBuilderOptions;
 }
 async function loadIndexHtmlFileTransformer(pathToIndexFileTransformer, tsConfig, context, isUsingWebpackBuilder) {

package/src/builders/dev-server/lib/normalize-options.js

@@ -18,5 +18,6 @@ function normalizeOptions(schema) {
         hmr: schema.hmr ?? (angularMajorVersion < 19 ? false : undefined),
         open: schema.open ?? false,
         ssl: schema.ssl ?? false,
+        watchDependencies: schema.watchDependencies ?? true,
     };
 }

package/src/builders/dev-server/schema.d.ts

@@ -21,6 +21,7 @@ interface BaseSchema {
   prebundle?: boolean | { exclude: string[] };
   buildLibsFromSource?: boolean;
   esbuildMiddleware?: string[];
+  watchDependencies?: boolean;
 }
 
 export type SchemaWithBrowserTarget = BaseSchema & {

package/src/builders/dev-server/schema.json

@@ -78,11 +78,11 @@
     },
     "publicHost": {
       "type": "string",
-      "description": "The URL that the browser client (or live-reload client, if enabled) should use to connect to the development server. Use for a complex dev server setup, such as one with reverse proxies."
+      "description": "The URL that the browser client (or live-reload client, if enabled) should use to connect to the development server. Use for a complex dev server setup, such as one with reverse proxies. This option has no effect when using the 'application' or other esbuild-based builders."
     },
     "allowedHosts": {
       "type": "array",
-      "description": "List of hosts that are allowed to access the dev server.",
+      "description": "List of hosts that are allowed to access the dev server. This option has no effect when using the 'application' or other esbuild-based builders in Angular versions lower than 19.2.0.",
       "default": [],
       "items": {
         "type": "string"
@@ -94,7 +94,7 @@
     },
     "disableHostCheck": {
       "type": "boolean",
-      "description": "Don't verify connected clients are part of allowed hosts.",
+      "description": "Don't verify connected clients are part of allowed hosts. This option has no effect when using the 'application' or other esbuild-based builders in Angular versions lower than 19.2.0.",
       "default": false
     },
     "hmr": {
@@ -156,6 +156,11 @@
         "type": "string",
         "description": "The path to the middleware function. Relative to the workspace root."
       }
+    },
+    "watchDependencies": {
+      "type": "boolean",
+      "description": "Watch buildable dependencies and rebuild when they change.",
+      "default": true
     }
   },
   "additionalProperties": false,

package/src/builders/webpack-browser/schema.d.ts

@@ -6,8 +6,10 @@ export type BrowserBuilderSchema = Schema & {
   };
   indexHtmlTransformer?: string;
   buildLibsFromSource?: boolean;
+  watchDependencies?: boolean;
+
   /**
-   * @deprecated Use `indexHtmlTransformer` instead. It will be removed in Nx 20.
+   * @deprecated Use `indexHtmlTransformer` instead. It will be removed in Nx 21.
    */
   indexFileTransformer?: string;
 };

package/src/builders/webpack-browser/schema.json

@@ -464,6 +464,11 @@
       "type": "boolean",
       "description": "Read buildable libraries from source instead of building them separately.",
       "default": true
+    },
+    "watchDependencies": {
+      "type": "boolean",
+      "description": "Watch buildable dependencies and rebuild when they change.",
+      "default": true
     }
   },
   "additionalProperties": false,

package/src/builders/webpack-browser/webpack-browser.impl.js

@@ -25,7 +25,8 @@ function shouldSkipInitialTargetRun(projectGraph, project, target) {
 }
 function executeWebpackBrowserBuilder(options, context) {
     options.buildLibsFromSource ??= true;
-    const { buildLibsFromSource, customWebpackConfig, indexHtmlTransformer, indexFileTransformer, ...delegateBuilderOptions } = options;
+    options.watchDependencies ??= true;
+    const { buildLibsFromSource, customWebpackConfig, indexHtmlTransformer, indexFileTransformer, watchDependencies, ...delegateBuilderOptions } = options;
     process.env.NX_BUILD_LIBS_FROM_SOURCE = `${buildLibsFromSource}`;
     process.env.NX_BUILD_TARGET = (0, devkit_1.targetToTargetString)({ ...context.target });
     const pathToWebpackConfig = customWebpackConfig?.path &&
@@ -61,7 +62,7 @@ function executeWebpackBrowserBuilder(options, context) {
                     const skipInitialRun = shouldSkipInitialTargetRun(projectGraph, context.target.project, context.target.target);
                     baseWebpackConfig.plugins.push(
                     // @ts-expect-error - difference between angular and webpack plugin definitions bc of webpack versions
-                    new webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${context.target.target} --projects=${workspaceDependencies.join(',')}`, skipInitialRun));
+                    new webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${context.target.target} --projects=${workspaceDependencies.join(',')}`, { skipInitialRun, skipWatchingDeps: !watchDependencies }));
                 }
             }
             if (!pathToWebpackConfig) {

package/src/executors/delegate-build/delegate-build.impl.d.ts

@@ -2,7 +2,5 @@ import type { ExecutorContext } from '@nx/devkit';
 import type { DelegateBuildExecutorSchema } from './schema';
 export declare function delegateBuildExecutor(options: DelegateBuildExecutorSchema, context: ExecutorContext): AsyncGenerator<{
     success: boolean;
-}, {
-    success: boolean;
-}, any>;
+}, void, any>;
 export default delegateBuildExecutor;

package/src/executors/delegate-build/delegate-build.impl.js

@@ -6,9 +6,6 @@ const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 async function* delegateBuildExecutor(options, context) {
     const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
     options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, devkit_1.joinPathFragments)(context.root, options.tsConfig), context.root, target.data.root, dependencies);
-    if (!(0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
-        return { success: false };
-    }
     const { buildTarget, ...targetOptions } = options;
     const delegateTarget = (0, devkit_1.parseTargetString)(buildTarget, context);
     yield* await (0, devkit_1.runExecutor)(delegateTarget, targetOptions, context);

package/src/executors/package/package.impl.js

@@ -31,10 +31,7 @@ function createLibraryExecutor(initializeNgPackagr) {
         if (angularMajorVersion < 18 && options.poll !== undefined) {
             throw new Error(`The "poll" option requires Angular version 18.0.0 or greater. You are currently using version ${angularVersion}.`);
         }
-        const { target, dependencies, topLevelDependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
-        if (!(0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
-            return Promise.resolve({ success: false });
-        }
+        const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
         if (options.watch) {
             return yield* (0, rxjs_for_await_1.eachValueFrom)((0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies)).pipe((0, operators_1.switchMap)((packagr) => packagr.watch()), (0, operators_1.mapTo)({ success: true })));
         }

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,
     });
@@ -61,21 +61,6 @@ async function addLintingGenerator(tree, options) {
                 files: ['*.html'],
                 rules: {},
             });
-            if ((0, buildable_project_1.isBuildableLibraryProject)(tree, options.projectName)) {
-                (0, eslint_file_1.addOverrideToLintConfig)(tree, '', {
-                    files: ['*.json'],
-                    parser: 'jsonc-eslint-parser',
-                    rules: {
-                        '@nx/dependency-checks': [
-                            'error',
-                            {
-                                // With flat configs, we don't want to include imports in the eslint js/cjs/mjs files to be checked
-                                ignoredFiles: ['{projectRoot}/eslint.config.{js,cjs,mjs}'],
-                            },
-                        ],
-                    },
-                });
-            }
         }
         else {
             (0, eslint_file_1.replaceOverridesInLintConfig)(tree, options.projectRoot, [

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,8 +5,13 @@ 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) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+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,
         projectType: 'application',
@@ -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.d.ts

@@ -0,0 +1,4 @@
+import { type Tree, GeneratorCallback } from '@nx/devkit';
+import type { ConvertToRspackSchema } from './schema';
+export declare function convertToRspack(tree: Tree, schema: ConvertToRspackSchema): Promise<GeneratorCallback>;
+export default convertToRspack;