@nx/angular 0.0.0-pr-31222-862e973 → 0.0.0-pr-31313-387cdca

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/files/standalone-components/src/app/app.component.html__tpl__

@@ -1 +1,8 @@
-<% if(minimal) { %><h1>Welcome <%= appName %></h1><% } else { %><<%= nxWelcomeSelector %>></<%= nxWelcomeSelector %>><% } %> <% if(routing) { %><router-outlet></router-outlet><% } %>
+<%_ if(minimal) { _%>
+<h1>Welcome <%= appName %></h1>
+<%_ } else { _%>
+<<%= nxWelcomeSelector %>></<%= nxWelcomeSelector %>>
+<%_ } _%>
+<%_ if(routing) { _%>
+<router-outlet></router-outlet>
+<%_ } _%>

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

@@ -2,16 +2,14 @@ import { Component<% if(viewEncapsulation) { %>, ViewEncapsulation<% } %> } from
 import { RouterModule } from '@angular/router';<% } %><% if(!minimal) { %>
 import { NxWelcomeComponent } from './nx-welcome.component';<% } %>
 
-@Component({
-  standalone: true,
+@Component({<% if (setStandaloneTrue) { %>
+  standalone: true,<% } %>
   imports: [<% if(!minimal) { %>NxWelcomeComponent, <% } %><% if(routing) { %>RouterModule<% } %>],
   selector: '<%= rootSelector %>',<% if(!inlineTemplate) { %>
   templateUrl: './app.component.html',<% } else { %>
-  template: `<% if(minimal) { %><h1>Welcome <%= appName %></h1><% } else { %><<%= nxWelcomeSelector %>></<%= nxWelcomeSelector %>><% } %> <% if(routing) { %><router-outlet></router-outlet><% } %>`,<% } %><% if (angularMajorVersion < 17) { if(!inlineStyle) { %>
-  styleUrls: ['./app.component.<%= style %>'],<% } else { %>
-  styles: [``],<% } %><% } else { if(!inlineStyle) { %>
+  template: `<% if(minimal) { %><h1>Welcome <%= appName %></h1><% } else { %><<%= nxWelcomeSelector %>></<%= nxWelcomeSelector %>><% } %> <% if(routing) { %><router-outlet></router-outlet><% } %>`,<% } %><% if(!inlineStyle) { %>
   styleUrl: './app.component.<%= style %>',<% } else { %>
-  styles: ``,<% } %><% } %><% if(viewEncapsulation) { %>
+  styles: ``,<% } %><% if(viewEncapsulation) { %>
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %>,<% } %>
 })
 export class AppComponent {<% if(!minimal) { %>

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

@@ -3,12 +3,11 @@ 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);
-    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);
@@ -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/application/lib/add-linting.js

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = addLinting;
 const tslib_1 = require("tslib");
-const eslint_1 = require("@nx/eslint");
 const add_linting_1 = tslib_1.__importDefault(require("../../add-linting/add-linting"));
 async function addLinting(host, options) {
-    if (options.linter === eslint_1.Linter.None) {
+    if (options.linter === 'none') {
         return;
     }
     await (0, add_linting_1.default)(host, {
@@ -16,5 +15,6 @@ async function addLinting(host, options) {
         skipPackageJson: options.skipPackageJson,
         unitTestRunner: options.unitTestRunner,
         skipFormat: true,
+        addPlugin: options.addPlugin,
     });
 }

package/src/generators/application/lib/add-serve-static-target.d.ts

@@ -1,3 +1,3 @@
-import { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
 import type { NormalizedSchema } from './normalized-schema';
 export declare function addServeStaticTarget(tree: Tree, options: NormalizedSchema, port: number): void;

package/src/generators/application/lib/add-serve-static-target.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addServeStaticTarget = addServeStaticTarget;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-const version_utils_1 = require("../../utils/version-utils");
 function addServeStaticTarget(tree, options, port) {
     addFileServerTarget(tree, options, 'serve-static', port);
 }
@@ -11,10 +10,10 @@ function addFileServerTarget(tree, options, targetName, e2ePort) {
     if (!options.skipPackageJson) {
         (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/web': versions_1.nxVersion });
     }
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const isUsingApplicationBuilder = angularMajorVersion >= 17 && options.bundler === 'esbuild';
+    const isUsingApplicationBuilder = options.bundler === 'esbuild';
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.name);
     projectConfig.targets[targetName] = {
+        continuous: true,
         executor: '@nx/web:file-server',
         options: {
             buildTarget: `${options.name}:build`,

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

@@ -3,13 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addUnitTestRunner = addUnitTestRunner;
 const test_runners_1 = require("../../../utils/test-runners");
 const add_jest_1 = require("../../utils/add-jest");
+const add_vitest_1 = require("../../utils/add-vitest");
 async function addUnitTestRunner(host, options) {
-    if (options.unitTestRunner === test_runners_1.UnitTestRunner.Jest) {
-        await (0, add_jest_1.addJest)(host, {
-            name: options.name,
-            projectRoot: options.appProjectRoot,
-            skipPackageJson: options.skipPackageJson,
-            strict: options.strict,
-        });
+    switch (options.unitTestRunner) {
+        case test_runners_1.UnitTestRunner.Jest:
+            await (0, add_jest_1.addJest)(host, {
+                name: options.name,
+                projectRoot: options.appProjectRoot,
+                skipPackageJson: options.skipPackageJson,
+                strict: options.strict,
+                addPlugin: options.addPlugin,
+            });
+            break;
+        case test_runners_1.UnitTestRunner.Vitest:
+            await (0, add_vitest_1.addVitest)(host, {
+                name: options.name,
+                projectRoot: options.appProjectRoot,
+                skipPackageJson: options.skipPackageJson,
+                strict: options.strict,
+                addPlugin: options.addPlugin,
+            });
+            break;
     }
 }

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

@@ -11,7 +11,7 @@ const version_utils_1 = require("../../utils/version-utils");
 const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
 async function createFiles(tree, options, rootOffset) {
     const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const isUsingApplicationBuilder = angularMajorVersion >= 17 && options.bundler === 'esbuild';
+    const isUsingApplicationBuilder = options.bundler === 'esbuild';
     const disableModernClassFieldsBehavior = (0, semver_1.lt)(angularVersion, '18.1.0-rc.0');
     const rootSelector = `${options.prefix}-root`;
     (0, selector_1.validateHtmlSelector)(rootSelector);
@@ -38,6 +38,9 @@ async function createFiles(tree, options, rootOffset) {
         disableModernClassFieldsBehavior,
         useEventCoalescing: angularMajorVersion >= 18,
         useRouterTestingModule: angularMajorVersion < 18,
+        // Angular v19 or higher defaults to true, while v18 or lower defaults to false
+        setStandaloneFalse: angularMajorVersion >= 19,
+        setStandaloneTrue: angularMajorVersion < 19,
         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

@@ -8,36 +8,29 @@ function createProject(tree, options) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const buildExecutor = options.bundler === 'webpack'
         ? '@angular-devkit/build-angular:browser'
-        : angularMajorVersion >= 17
-            ? '@angular-devkit/build-angular:application'
-            : '@angular-devkit/build-angular:browser-esbuild';
-    const buildTargetOptionName = angularMajorVersion >= 17 ? 'buildTarget' : 'browserTarget';
-    const buildMainOptionName = angularMajorVersion >= 17 && options.bundler === 'esbuild'
-        ? 'browser'
-        : 'main';
+        : '@angular-devkit/build-angular:application';
+    const buildMainOptionName = options.bundler === 'esbuild' ? 'browser' : 'main';
     (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, buildExecutor);
     let budgets = undefined;
-    if (options.bundler === 'webpack' || angularMajorVersion >= 17) {
-        if (options.strict) {
-            budgets = [
-                { type: 'initial', maximumWarning: '500kb', maximumError: '1mb' },
-                {
-                    type: 'anyComponentStyle',
-                    maximumWarning: '2kb',
-                    maximumError: '4kb',
-                },
-            ];
-        }
-        else {
-            budgets = [
-                { type: 'initial', maximumWarning: '2mb', maximumError: '5mb' },
-                {
-                    type: 'anyComponentStyle',
-                    maximumWarning: '6kb',
-                    maximumError: '10kb',
-                },
-            ];
-        }
+    if (options.strict) {
+        budgets = [
+            { type: 'initial', maximumWarning: '500kb', maximumError: '1mb' },
+            {
+                type: 'anyComponentStyle',
+                maximumWarning: '4kb',
+                maximumError: '8kb',
+            },
+        ];
+    }
+    else {
+        budgets = [
+            { type: 'initial', maximumWarning: '2mb', maximumError: '5mb' },
+            {
+                type: 'anyComponentStyle',
+                maximumWarning: '6kb',
+                maximumError: '10kb',
+            },
+        ];
     }
     const inlineStyleLanguage = options?.style !== 'css' ? options.style : undefined;
     const project = {
@@ -89,6 +82,7 @@ function createProject(tree, options) {
                 defaultConfiguration: 'production',
             },
             serve: {
+                continuous: true,
                 executor: '@angular-devkit/build-angular:dev-server',
                 options: options.port
                     ? {
@@ -97,10 +91,10 @@ function createProject(tree, options) {
                     : undefined,
                 configurations: {
                     production: {
-                        [buildTargetOptionName]: `${options.name}:build:production`,
+                        buildTarget: `${options.name}:build:production`,
                     },
                     development: {
-                        [buildTargetOptionName]: `${options.name}:build:development`,
+                        buildTarget: `${options.name}:build:development`,
                     },
                 },
                 defaultConfiguration: 'development',
@@ -108,7 +102,7 @@ function createProject(tree, options) {
             'extract-i18n': {
                 executor: '@angular-devkit/build-angular:extract-i18n',
                 options: {
-                    [buildTargetOptionName]: `${options.name}:build`,
+                    buildTarget: `${options.name}:build`,
                 },
             },
         },

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

@@ -3,44 +3,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../../utils/test-runners");
-const version_utils_1 = require("../../utils/version-utils");
-async function normalizeOptions(host, options) {
-    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+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',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
-        callingGenerator: '@nx/angular:application',
     });
     options.rootProject = appProjectRoot === '.';
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
-    const nxJson = (0, devkit_1.readNxJson)(host);
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
-    let bundler = options.bundler;
-    if (!bundler) {
-        const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(host);
-        bundler = angularMajorVersion >= 17 ? 'esbuild' : 'webpack';
-    }
+    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,
         inlineTemplate: false,
         skipTests: options.unitTestRunner === test_runners_1.UnitTestRunner.None,
         skipFormat: false,
-        unitTestRunner: test_runners_1.UnitTestRunner.Jest,
         e2eTestRunner: test_runners_1.E2eTestRunner.Playwright,
-        linter: eslint_1.Linter.EsLint,
+        linter: 'eslint',
         strict: true,
         standalone: true,
+        directory: appProjectRoot,
         ...options,
         prefix: options.prefix || 'app',
         name: appProjectName,
@@ -52,5 +50,6 @@ async function normalizeOptions(host, options) {
         bundler,
         outputPath: (0, devkit_1.joinPathFragments)('dist', !options.rootProject ? appProjectRoot : appProjectName),
         ssr: options.ssr ?? false,
+        unitTestRunner: options.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
     };
 }

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

@@ -1,10 +1,10 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
 export interface Schema {
-  name: string;
+  directory: string;
+  name?: string;
   addTailwind?: boolean;
   skipFormat?: boolean;
   inlineStyle?: boolean;
@@ -14,22 +14,21 @@ export interface Schema {
   prefix?: string;
   style?: Styles;
   skipTests?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;
   strict?: boolean;
-  standaloneConfig?: boolean;
   port?: number;
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
   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

@@ -6,26 +6,21 @@
   "type": "object",
   "cli": "nx",
   "properties": {
-    "name": {
-      "description": "The name of the application.",
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the application?",
-      "pattern": "^[a-zA-Z][^:]*$"
+      "x-prompt": "Which directory do you want to create the application in?"
     },
-    "directory": {
-      "description": "The directory of the new application.",
+    "name": {
+      "description": "The name of the application.",
       "type": "string",
+      "pattern": "^[a-zA-Z][^:]*$",
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -104,8 +99,9 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "none"],
+      "enum": ["jest", "vitest", "none"],
       "description": "Test runner to use for unit tests.",
+      "x-prompt": "Which unit test runner would you like to use?",
       "default": "jest"
     },
     "e2eTestRunner": {
@@ -134,12 +130,6 @@
       "description": "Create an application with stricter type checking and build optimization options.",
       "default": true
     },
-    "standaloneConfig": {
-      "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean",
-      "default": true,
-      "x-deprecated": "Nx only supports standaloneConfig"
-    },
     "port": {
       "type": "number",
       "description": "The port at which the remote application should be served."
@@ -173,9 +163,10 @@
       "default": false
     },
     "bundler": {
-      "description": "Bundler to use to build the application. It defaults to `esbuild` for Angular versions >= 17.0.0. Otherwise, it defaults to `webpack`. _Note: The `esbuild` bundler is only considered stable from Angular v17._",
+      "description": "Bundler to use to build the application.",
       "type": "string",
-      "enum": ["webpack", "esbuild"],
+      "enum": ["esbuild", "rspack", "webpack"],
+      "default": "esbuild",
       "x-prompt": "Which bundler do you want to use to build the application?",
       "x-priority": "important"
     },
@@ -184,9 +175,13 @@
       "type": "boolean",
       "x-prompt": "Do you want to enable Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering)?",
       "default": false
+    },
+    "serverRouting": {
+      "description": "Creates a server application using the Server Routing and App Engine APIs (Developer Preview). _Note: this is only supported in Angular versions >= 19.0.0_.",
+      "type": "boolean"
     }
   },
   "additionalProperties": false,
-  "required": ["name"],
+  "required": ["directory"],
   "examplesFile": "../../../docs/application-examples.md"
 }

package/src/generators/component/component.d.ts

@@ -1,5 +1,4 @@
 import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function componentGenerator(tree: Tree, rawOptions: Schema): Promise<void>;
-export declare function componentGeneratorInternal(tree: Tree, rawOptions: Schema): Promise<void>;
 export default componentGenerator;

package/src/generators/component/component.js

@@ -1,24 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentGenerator = componentGenerator;
-exports.componentGeneratorInternal = componentGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const utils_1 = require("../utils");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function componentGenerator(tree, rawOptions) {
-    await componentGeneratorInternal(tree, {
-        nameAndDirectoryFormat: 'derived',
-        ...rawOptions,
-    });
-}
-async function componentGeneratorInternal(tree, rawOptions) {
     const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {
         name: options.name,
         fileName: options.fileName,
         symbolName: options.symbolName,
+        exportDefault: options.exportDefault,
         style: options.style,
         inlineStyle: options.inlineStyle,
         inlineTemplate: options.inlineTemplate,
@@ -28,6 +22,9 @@ async function componentGeneratorInternal(tree, rawOptions) {
         viewEncapsulation: options.viewEncapsulation,
         displayBlock: options.displayBlock,
         selector: options.selector,
+        // Angular v19 or higher defaults to true, while v18 or lower defaults to false
+        setStandalone: (angularMajorVersion >= 19 && !options.standalone) ||
+            (angularMajorVersion < 19 && options.standalone),
         angularMajorVersion,
         tpl: '',
     });

package/src/generators/component/files/__fileName__.__style__

@@ -2,5 +2,5 @@
   display: block;
 }
 <% } else { %>\:host
-  display: block;
+  display: block
 <% }} %>

package/src/generators/component/files/__fileName__.spec.ts__tpl__

@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { <%= symbolName %> } from './<%= fileName %>';
+import <% if (exportDefault) { %><%= symbolName %><% } else { %>{ <%= symbolName %> }<% } %> from './<%= fileName %>';
 
 describe('<%= symbolName %>', () => {
   let component: <%= symbolName %>;

package/src/generators/component/files/__fileName__.ts__tpl__

@@ -2,26 +2,18 @@ import { <% if(changeDetection !== 'Default') { %>ChangeDetectionStrategy, <% }%
 import { CommonModule } from '@angular/common';<% } %>
 
 @Component({<% if(!skipSelector) {%>
-  selector: '<%= selector %>',<%}%><% if(standalone) {%>
-  standalone: true,
+  selector: '<%= selector %>',<%}%><% if (setStandalone) { %>
+  standalone: <%= standalone %>,<% } %><% if(standalone) { %>
   imports: [CommonModule],<%}%><% if(inlineTemplate) { %>
   template: `<p><%= name %> works!</p>`<% } else { %>
-  templateUrl: './<%= fileName %>.html'<% } if (angularMajorVersion < 17) { if(inlineStyle) { %>,
-  styles: [<% if(displayBlock){ %>
-    `
-      :host {
-        display: block;
-      }
-    `<% } %>
-  ]<% } else if (style !== 'none') { %>,
-  styleUrls: ['./<%= fileName %>.<%= style %>']<% } %><% } else { if(inlineStyle) { %>,
+  templateUrl: './<%= fileName %>.html'<% } if(inlineStyle) { %>,
   styles: `<% if(displayBlock){ %>
     :host {
       display: block;
     }
   <% } %>`<% } else if (style !== 'none') { %>,
-  styleUrl: './<%= fileName %>.<%= style %>'<% } %><% } %><% if(!!viewEncapsulation) { %>,
+  styleUrl: './<%= fileName %>.<%= style %>'<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>
 })
-export class <%= symbolName %> {}
+export <% if (exportDefault) {%>default <%}%>class <%= symbolName %> {}