@nx/angular 22.2.4 → 22.3.0-beta.1

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

@@ -0,0 +1,111 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = unitTestExecutor;
+const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
+const targets_1 = require("../../utils/targets");
+const angular_version_utils_1 = require("../utilities/angular-version-utils");
+const builder_package_1 = require("../utilities/builder-package");
+const esbuild_extensions_1 = require("../utilities/esbuild-extensions");
+async function* unitTestExecutor(options, context) {
+    validateOptions();
+    const { plugins: pluginPaths, indexHtmlTransformer: indexHtmlTransformerPath, ...delegateExecutorOptions } = options;
+    const plugins = await (0, esbuild_extensions_1.loadPlugins)(pluginPaths, options.tsConfig);
+    const indexHtmlTransformer = indexHtmlTransformerPath
+        ? await (0, esbuild_extensions_1.loadIndexHtmlTransformer)(indexHtmlTransformerPath, options.tsConfig)
+        : undefined;
+    const builderContext = await (0, ngcli_adapter_1.createBuilderContext)({
+        builderName: '@nx/angular:unit-test',
+        description: 'Run application unit tests.',
+        optionSchema: require('./schema.json'),
+    }, context);
+    const buildTargetSpecifier = options.buildTarget ?? `::development`;
+    const buildTarget = (0, targets_1.targetFromTargetString)(buildTargetSpecifier, context.projectName, 'build');
+    patchBuilderContext(builderContext, buildTarget);
+    (0, builder_package_1.assertBuilderPackageIsInstalled)('@angular/build');
+    const { executeUnitTestBuilder } = await Promise.resolve().then(() => __importStar(require('@angular/build')));
+    return yield* executeUnitTestBuilder(delegateExecutorOptions, builderContext, {
+        codePlugins: plugins,
+        indexHtmlTransformer,
+    });
+}
+function validateOptions() {
+    const { version: angularVersion, major: angularMajorVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    if (angularMajorVersion < 21) {
+        throw new Error(`The "unit-test" executor is only available for Angular versions >= 21.0.0. You are currently using version ${angularVersion}.`);
+    }
+}
+/**
+ * The Angular CLI unit-test builder only accepts the `@angular/build:application`
+ * and `@angular/build:ng-packagr` builders. We need to patch the builder context
+ * so that it accepts the `@nx/angular:*` executors.
+ *
+ * https://github.com/angular/angular-cli/blob/f9de11d67d3e0e0524372819583bc77756596d4f/packages/angular/build/src/builders/unit-test/builder.ts#L246-L262
+ */
+function patchBuilderContext(context, buildTarget) {
+    const executorToBuilderMap = new Map([
+        ['@nx/angular:application', '@angular/build:application'],
+        ['@nx/angular:ng-packagr-lite', '@angular/build:ng-packagr'],
+        ['@nx/angular:package', '@angular/build:ng-packagr'],
+    ]);
+    const originalGetBuilderNameForTarget = context.getBuilderNameForTarget;
+    context.getBuilderNameForTarget = async (target) => {
+        const builderName = await originalGetBuilderNameForTarget(target);
+        if (executorToBuilderMap.has(builderName)) {
+            return executorToBuilderMap.get(builderName);
+        }
+        return builderName;
+    };
+    const originalGetTargetOptions = context.getTargetOptions;
+    context.getTargetOptions = async (target) => {
+        const options = await originalGetTargetOptions(target);
+        if (target.project === buildTarget.project &&
+            target.target === buildTarget.target &&
+            target.configuration === buildTarget.configuration) {
+            cleanBuildTargetOptions(options);
+        }
+        return options;
+    };
+}
+function cleanBuildTargetOptions(options) {
+    if ('buildLibsFromSource' in options ||
+        'indexHtmlTransformer' in options ||
+        'plugins' in options) {
+        delete options.buildLibsFromSource;
+        delete options.indexHtmlTransformer;
+        delete options.plugins;
+    }
+    return options;
+}

package/src/executors/utilities/ng-packagr/stylesheet-processor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stylesheet-processor.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/executors/utilities/ng-packagr/stylesheet-processor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAIhF,oBAAY,MAAM;IAChB,MAAM,WAAW;IACjB,IAAI,SAAS;CACd;AAED,wBAAgB,sBAAsB,IAAI,KACxC,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,MAAM,EAAE,EACvB,IAAI,CAAC,EAAE,oBAAoB,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,EAC1C,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,EAC/B,KAAK,CAAC,EAAE,OAAO,KACZ;IACH,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAuEA"}

package/src/executors/utilities/ng-packagr/stylesheet-processor.di.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stylesheet-processor.di.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/executors/utilities/ng-packagr/stylesheet-processor.di.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAIpD,wBAAgB,qCAAqC,IAAI,eAAe,CAsBvE"}
+{"version":3,"file":"stylesheet-processor.di.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/executors/utilities/ng-packagr/stylesheet-processor.di.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAIpD,wBAAgB,qCAAqC,IAAI,eAAe,CAevE"}

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

@@ -9,12 +9,8 @@ function getStylesheetProcessorFactoryProvider() {
     return {
         provide: STYLESHEET_PROCESSOR_TOKEN,
         useFactory: () => {
-            if (ngPackagrMajorVersion >= 19) {
-                const { getStylesheetProcessor, } = require('./v19+/stylesheet-processor');
-                return getStylesheetProcessor();
-            }
-            const { StylesheetProcessor } = require('./pre-v19/stylesheet-processor');
-            return StylesheetProcessor;
+            const { getStylesheetProcessor } = require('./stylesheet-processor');
+            return getStylesheetProcessor();
         },
         deps: [],
     };

package/src/executors/utilities/ng-packagr/{v19+/stylesheet-processor.js → stylesheet-processor.js}

@@ -11,8 +11,8 @@ exports.getStylesheetProcessor = getStylesheetProcessor;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const browserslist_1 = tslib_1.__importDefault(require("browserslist"));
-const ng_packagr_version_1 = require("../ng-packagr-version");
-const package_imports_1 = require("../package-imports");
+const ng_packagr_version_1 = require("./ng-packagr-version");
+const package_imports_1 = require("./package-imports");
 var CssUrl;
 (function (CssUrl) {
     CssUrl["inline"] = "inline";

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

@@ -1,5 +1,5 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import type { Schema } from './schema';
-export declare function applicationGenerator(tree: Tree, schema: Partial<Schema>): Promise<GeneratorCallback>;
+export declare function applicationGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default applicationGenerator;
 //# sourceMappingURL=application.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAKjB,IAAI,EAEL,MAAM,YAAY,CAAC;AA0BpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GACtB,OAAO,CAAC,iBAAiB,CAAC,CA+H5B;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAKjB,IAAI,EAEL,MAAM,YAAY,CAAC;AA2BpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAsI5B;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/application/application.js

@@ -14,6 +14,7 @@ const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function applicationGenerator(tree, schema) {
     (0, validations_1.assertNotUsingTsSolutionSetup)(tree, 'application');
+    (0, lib_1.validateOptions)(tree, schema);
     const isRspack = schema.bundler === 'rspack';
     if (isRspack) {
         schema.bundler = 'webpack';
@@ -32,7 +33,7 @@ async function applicationGenerator(tree, schema) {
         addPlugin: options.addPlugin,
     });
     if (!options.skipPackageJson) {
-        (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree);
+        (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree, options.zoneless);
     }
     (0, lib_1.createProject)(tree, options);
     await (0, lib_1.createFiles)(tree, options, rootOffset);
@@ -72,8 +73,12 @@ async function applicationGenerator(tree, schema) {
             skipFormat: true,
         });
         if (options.ssr) {
+            const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
             (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'),
+                zoneless: options.zoneless,
+                useDefaultImport: angularMajorVersion >= 21,
+                angularMajorVersion,
                 tmpl: '',
             });
         }

package/src/generators/application/files/base/tsconfig.app.json__tpl__

@@ -11,9 +11,7 @@
   "include": ["src/**/*.ts"],
   <%_ } _%>
   "exclude": [
-    "jest.config.ts",
-    "src/test-setup.ts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts"
+    "src/**/*.spec.ts",
+    "src/**/*.test.ts"
   ]
 }

package/src/generators/application/files/ng-module/src/app/app__componentFileSuffix__.spec.ts__tpl__

@@ -11,9 +11,9 @@ describe('App<%= componentType %>', () => {
     }).compileComponents();
   });
 
-  it('should render title', () => {
+  it('should render title', <% if (zoneless) { %>async <% } %>() => {
     const fixture = TestBed.createComponent(App<%= componentType %>);
-    fixture.detectChanges();
+    <%= zoneless ? 'await fixture.whenStable();' : 'fixture.detectChanges();' %>
     const compiled = fixture.nativeElement as HTMLElement;
     expect(compiled.querySelector('h1')?.textContent).toContain(
       'Welcome <%= appName %>'

package/src/generators/application/files/ng-module/src/app/app__componentFileSuffix__.ts__tpl__

@@ -1,8 +1,8 @@
 import { Component<% if(viewEncapsulation) { %>, ViewEncapsulation<% } %> } from '@angular/core';
 
 @Component({
-  selector: '<%= rootSelector %>',<% if (setStandaloneFalse) { %>
-  standalone: false,<% } if(!inlineTemplate) { %>
+  selector: '<%= rootSelector %>',
+  standalone: false,<% if(!inlineTemplate) { %>
   templateUrl: './app<%= componentFileSuffix %>.html',<% } else { %>
   template: `<% if(minimal) { %><h1>Welcome <%= appName %></h1><% } else { %><<%= nxWelcomeSelector %>></<%= nxWelcomeSelector %>><% } %> <% if(routing) { %><router-outlet></router-outlet><% } %>`,<% } %><% if(!inlineStyle) { %>
   styleUrl: './app<%= componentFileSuffix %>.<%= style %>',<% } else { %>

package/src/generators/application/files/ng-module/src/main.ts__tpl__

@@ -10,7 +10,5 @@ platformBrowserDynamic()
 <%_ } else { _%>
 platformBrowser()
 <%_ } _%>
-  .bootstrapModule(AppModule, {
-    ngZoneEventCoalescing: true
-  })
+  .bootstrapModule(AppModule<% if (!zoneless) { %>, { ngZoneEventCoalescing: true }<% } %>)
   .catch((err) => console.error(err));

package/src/generators/application/files/nx-welcome/claimed/ng-module/src/app/nx-welcome__componentFileSuffix__.ts__tpl__

@@ -1,8 +1,8 @@
 import { Component, ViewEncapsulation } from '@angular/core';
 
 @Component({
-  selector: '<%= nxWelcomeSelector %>',<% if (setStandaloneFalse) { %>
-  standalone: false,<% } %>
+  selector: '<%= nxWelcomeSelector %>',
+  standalone: false,
   template: `
     <!--
      * * * * * * * * * * * * * * * * * * * * * * * * * * * *

package/src/generators/application/files/nx-welcome/claimed/standalone/src/app/nx-welcome__componentFileSuffix__.ts__tpl__

@@ -2,8 +2,7 @@ import { Component, ViewEncapsulation } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 @Component({
-  selector: '<%= nxWelcomeSelector %>',<% if (setStandaloneTrue) { %>
-  standalone: true,<% } %>
+  selector: '<%= nxWelcomeSelector %>',
   imports: [CommonModule],
   template: `
     <!--

package/src/generators/application/files/nx-welcome/not-configured/ng-module/src/app/nx-welcome__componentFileSuffix__.ts__tpl__

@@ -1,8 +1,8 @@
 import { Component, ViewEncapsulation } from '@angular/core';
 
 @Component({
-  selector: '<%= nxWelcomeSelector %>',<% if (setStandaloneFalse) { %>
-  standalone: false,<% } %>
+  selector: '<%= nxWelcomeSelector %>',
+  standalone: false,
   template: `
     <!--
      * * * * * * * * * * * * * * * * * * * * * * * * * * * *

package/src/generators/application/files/nx-welcome/not-configured/standalone/src/app/nx-welcome__componentFileSuffix__.ts__tpl__

@@ -2,8 +2,7 @@ import { Component, ViewEncapsulation } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 @Component({
-  selector: '<%= nxWelcomeSelector %>',<% if (setStandaloneTrue) { %>
-  standalone: true,<% } %>
+  selector: '<%= nxWelcomeSelector %>',
   imports: [CommonModule],
   template: `
     <!--

package/src/generators/application/files/nx-welcome/unclaimed/ng-module/src/app/nx-welcome__componentFileSuffix__.ts__tpl__

@@ -1,8 +1,8 @@
 import { Component, ViewEncapsulation } from '@angular/core';
 
 @Component({
-  selector: '<%= nxWelcomeSelector %>',<% if (setStandaloneFalse) { %>
-  standalone: false,<% } %>
+  selector: '<%= nxWelcomeSelector %>',
+  standalone: false,
   template: `
     <!--
      * * * * * * * * * * * * * * * * * * * * * * * * * * * *

package/src/generators/application/files/nx-welcome/unclaimed/standalone/src/app/nx-welcome__componentFileSuffix__.ts__tpl__

@@ -2,8 +2,7 @@ import { Component, ViewEncapsulation } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 @Component({
-  selector: '<%= nxWelcomeSelector %>',<% if (setStandaloneTrue) { %>
-  standalone: true,<% } %>
+  selector: '<%= nxWelcomeSelector %>',
   imports: [CommonModule],
   template: `
     <!--

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

@@ -1,8 +1,14 @@
+<%_ if (!zoneless && angularMajorVersion < 21) { _%>
 import 'zone.js/node';
 
+<%_ } _%>
 import { APP_BASE_HREF } from '@angular/common';
 import { CommonEngine } from '@angular/ssr/node';
+<%_ if (useDefaultImport) { _%>
+import express from 'express';
+<%_ } else { _%>
 import * as express from 'express';
+<%_ } _%>
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import bootstrap from './main.server';

package/src/generators/application/files/standalone-components/src/app/app.config.ts__tpl__

@@ -1,11 +1,11 @@
-import { ApplicationConfig<% if (provideGlobalErrorListener) { %>, provideBrowserGlobalErrorListeners<% } %>, provideZoneChangeDetection } from '@angular/core';<% if (routing) { %>
+import { ApplicationConfig<% if (provideGlobalErrorListener) { %>, provideBrowserGlobalErrorListeners<% } %><% if (!zoneless) { %>, provideZoneChangeDetection<% } %> } from '@angular/core';<% if (routing) { %>
 import { provideRouter } from '@angular/router';
 import { appRoutes } from './app.routes';<% } %>
 
 export const appConfig: ApplicationConfig = {
   providers: [<% if (provideGlobalErrorListener) { %>
-    provideBrowserGlobalErrorListeners(),<% } %>
-    provideZoneChangeDetection({ eventCoalescing: true })<% if (routing) { %>,
+    provideBrowserGlobalErrorListeners(),<% } %><% if (!zoneless) { %>
+    provideZoneChangeDetection({ eventCoalescing: true }),<% } %><% if (routing) { %>
     provideRouter(appRoutes)<% } %>
   ]
 };

package/src/generators/application/files/standalone-components/src/app/app__componentFileSuffix__.spec.ts__tpl__

@@ -9,9 +9,9 @@ describe('App<%= componentType %>', () => {
     }).compileComponents();
   });
 
-  it('should render title', () => {
+  it('should render title', <% if (zoneless) { %>async <% } %>() => {
     const fixture = TestBed.createComponent(App<%= componentType %>);
-    fixture.detectChanges();
+    <%= zoneless ? 'await fixture.whenStable();' : 'fixture.detectChanges();' %>
     const compiled = fixture.nativeElement as HTMLElement;
     expect(compiled.querySelector('h1')?.textContent).toContain(
       'Welcome <%= appName %>'

package/src/generators/application/files/standalone-components/src/app/app__componentFileSuffix__.ts__tpl__

@@ -2,8 +2,7 @@ import { Component<% if(viewEncapsulation) { %>, ViewEncapsulation<% } %> } from
 import { RouterModule } from '@angular/router';<% } %><% if(!minimal) { %>
 import { NxWelcome<%= componentType %> } from './nx-welcome<%= componentFileSuffix %>';<% } %>
 
-@Component({<% if (setStandaloneTrue) { %>
-  standalone: true,<% } %>
+@Component({
   imports: [<% if(!minimal) { %>NxWelcome<%= componentType %>, <% } %><% if(routing) { %>RouterModule<% } %>],
   selector: '<%= rootSelector %>',<% if(!inlineTemplate) { %>
   templateUrl: './app<%= componentFileSuffix %>.html',<% } else { %>

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

@@ -1,4 +1,4 @@
-import { Tree } from '@nx/devkit';
+import type { Tree } from '@nx/devkit';
 import type { NormalizedSchema } from './normalized-schema';
 export declare function addUnitTestRunner(host: Tree, options: NormalizedSchema): Promise<void>;
 //# sourceMappingURL=add-unit-test-runner.d.ts.map

package/src/generators/application/lib/add-unit-test-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-unit-test-runner.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIlC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,iBAqB5E"}
+{"version":3,"file":"add-unit-test-runner.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,iBAgC5E"}

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

@@ -13,15 +13,26 @@ async function addUnitTestRunner(host, options) {
                 skipPackageJson: options.skipPackageJson,
                 strict: options.strict,
                 addPlugin: options.addPlugin,
+                runtimeTsconfigFileName: 'tsconfig.app.json',
+                zoneless: options.zoneless,
             });
             break;
-        case test_runners_1.UnitTestRunner.Vitest:
-            await (0, add_vitest_1.addVitest)(host, {
+        case test_runners_1.UnitTestRunner.VitestAngular:
+            await (0, add_vitest_1.addVitestAngular)(host, {
                 name: options.name,
                 projectRoot: options.appProjectRoot,
                 skipPackageJson: options.skipPackageJson,
+            });
+            break;
+        case test_runners_1.UnitTestRunner.VitestAnalog:
+            await (0, add_vitest_1.addVitestAnalog)(host, {
+                name: options.name,
+                projectRoot: options.appProjectRoot,
+                skipFormat: options.skipFormat,
+                skipPackageJson: options.skipPackageJson,
                 strict: options.strict,
                 addPlugin: options.addPlugin,
+                zoneless: options.zoneless,
             });
             break;
     }

package/src/generators/application/lib/create-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/create-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAchF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,WAAW,CAC/B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,EACzB,UAAU,EAAE,MAAM,iBA8InB"}
+{"version":3,"file":"create-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/create-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAchF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,WAAW,CAC/B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,EACzB,UAAU,EAAE,MAAM,iBA4InB"}

package/src/generators/application/lib/create-files.js

@@ -35,14 +35,12 @@ async function createFiles(tree, options, rootOffset) {
         rootTsConfig: (0, devkit_1.joinPathFragments)(rootOffset, (0, js_1.getRootTsConfigFileName)(tree)),
         angularMajorVersion,
         rootOffset,
-        // Angular v19 or higher defaults to true, while lower versions default to false
-        setStandaloneFalse: angularMajorVersion >= 19,
-        setStandaloneTrue: angularMajorVersion < 19,
         provideGlobalErrorListener: angularMajorVersion >= 20,
         usePlatformBrowserDynamic: angularMajorVersion < 20,
         componentType: componentType ? (0, devkit_1.names)(componentType).className : '',
         componentFileSuffix,
         moduleTypeSeparator,
+        zoneless: options.zoneless,
         connectCloudUrl,
         tutorialUrl: options.standalone
             ? 'https://nx.dev/getting-started/tutorials/angular-standalone-tutorial?utm_source=nx-project'

package/src/generators/application/lib/create-project.js

@@ -59,7 +59,7 @@ function createProjectForEsbuild(tree, options) {
                         ? undefined
                         : `${options.appProjectSourceRoot}/index.html`,
                     browser: `${options.appProjectSourceRoot}/main.ts`,
-                    polyfills: ['zone.js'],
+                    polyfills: options.zoneless ? undefined : ['zone.js'],
                     tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
                     inlineStyleLanguage,
                     assets: [
@@ -99,14 +99,16 @@ function createProjectForEsbuild(tree, options) {
                 },
                 defaultConfiguration: 'development',
             },
-            'extract-i18n': {
-                executor: angularMajorVersion >= 20
-                    ? '@angular/build:extract-i18n'
-                    : '@angular-devkit/build-angular:extract-i18n',
-                options: {
-                    buildTarget: `${options.name}:build`,
-                },
-            },
+            'extract-i18n': angularMajorVersion < 21
+                ? {
+                    executor: angularMajorVersion >= 20
+                        ? '@angular/build:extract-i18n'
+                        : '@angular-devkit/build-angular:extract-i18n',
+                    options: {
+                        buildTarget: `${options.name}:build`,
+                    },
+                }
+                : undefined,
         },
     };
     return project;
@@ -151,7 +153,7 @@ function createProjectForWebpack(tree, options) {
                     outputPath: options.outputPath,
                     index: `${options.appProjectSourceRoot}/index.html`,
                     main: `${options.appProjectSourceRoot}/main.ts`,
-                    polyfills: ['zone.js'],
+                    polyfills: options.zoneless ? undefined : ['zone.js'],
                     tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
                     inlineStyleLanguage,
                     assets: [

package/src/generators/application/lib/enable-strict-type-checking.js

@@ -21,7 +21,7 @@ function enableStrictTypeChecking(host, options) {
                 ...json.angularCompilerOptions,
                 strictInjectionParameters: true,
                 strictInputAccessModifiers: true,
-                typeCheckHostBindings: angularMajorVersion >= 20 ? true : undefined,
+                typeCheckHostBindings: angularMajorVersion === 20 ? true : undefined,
                 strictTemplates: true,
             };
             return json;

package/src/generators/application/lib/index.d.ts

@@ -1,6 +1,7 @@
 export * from './add-e2e';
 export * from './add-linting';
 export * from './add-proxy-config';
+export * from './add-serve-static-target';
 export * from './add-unit-test-runner';
 export * from './create-files';
 export * from './create-project';
@@ -9,5 +10,5 @@ export * from './normalize-options';
 export * from './normalized-schema';
 export * from './set-generator-defaults';
 export * from './update-tsconfig-files';
-export * from './add-serve-static-target';
+export * from './validate-options';
 //# sourceMappingURL=index.d.ts.map

package/src/generators/application/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC"}

package/src/generators/application/lib/index.js

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./add-e2e"), exports);
 tslib_1.__exportStar(require("./add-linting"), exports);
 tslib_1.__exportStar(require("./add-proxy-config"), exports);
+tslib_1.__exportStar(require("./add-serve-static-target"), exports);
 tslib_1.__exportStar(require("./add-unit-test-runner"), exports);
 tslib_1.__exportStar(require("./create-files"), exports);
 tslib_1.__exportStar(require("./create-project"), exports);
@@ -12,4 +13,4 @@ tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./normalized-schema"), exports);
 tslib_1.__exportStar(require("./set-generator-defaults"), exports);
 tslib_1.__exportStar(require("./update-tsconfig-files"), exports);
-tslib_1.__exportStar(require("./add-serve-static-target"), exports);
+tslib_1.__exportStar(require("./validate-options"), exports);

package/src/generators/application/lib/normalize-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAMtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAiB5D,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EACxB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,gBAAgB,CAAC,CAqD3B"}
+{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAOtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAiB5D,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EACxB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,gBAAgB,CAAC,CAgE3B"}

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

@@ -4,6 +4,7 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const test_runners_1 = require("../../../utils/test-runners");
+const version_utils_1 = require("../../utils/version-utils");
 function arePluginsExplicitlyDisabled(host) {
     const { useInferencePlugins } = (0, devkit_1.readNxJson)(host);
     const addPluginEnvVar = process.env.NX_ADD_PLUGINS;
@@ -31,6 +32,14 @@ async function normalizeOptions(host, options, isRspack) {
         : [];
     const bundler = validateBundler(options.bundler ?? 'esbuild');
     const addPlugin = options.addPlugin ?? (!arePluginsExplicitlyDisabled(host) && isRspack);
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(host);
+    const zonelessDefaultValue = angularMajorVersion >= 21 ? true : false;
+    const unitTestRunner = options.unitTestRunner ??
+        (angularMajorVersion >= 21 && bundler === 'esbuild'
+            ? test_runners_1.UnitTestRunner.VitestAngular
+            : angularMajorVersion >= 21
+                ? test_runners_1.UnitTestRunner.VitestAnalog
+                : test_runners_1.UnitTestRunner.Jest);
     // Set defaults and then overwrite with user options
     return {
         addPlugin,
@@ -38,7 +47,7 @@ async function normalizeOptions(host, options, isRspack) {
         routing: true,
         inlineStyle: false,
         inlineTemplate: false,
-        skipTests: options.unitTestRunner === test_runners_1.UnitTestRunner.None,
+        skipTests: unitTestRunner === test_runners_1.UnitTestRunner.None,
         skipFormat: false,
         e2eTestRunner: test_runners_1.E2eTestRunner.Playwright,
         linter: 'eslint',
@@ -56,6 +65,7 @@ async function normalizeOptions(host, options, isRspack) {
         bundler,
         outputPath: (0, devkit_1.joinPathFragments)('dist', !options.rootProject ? appProjectRoot : appProjectName),
         ssr: options.ssr ?? false,
-        unitTestRunner: options.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
+        unitTestRunner,
+        zoneless: options.zoneless ?? zonelessDefaultValue,
     };
 }

package/src/generators/application/lib/update-tsconfig-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-tsconfig-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-tsconfig-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAS5D,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QA0ExE"}
+{"version":3,"file":"update-tsconfig-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-tsconfig-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAS5D,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QA8ExE"}