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

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

@@ -7,10 +7,11 @@ const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const angular_version_utils_1 = require("../utilities/angular-version-utils");
 const typescript_1 = require("../utilities/typescript");
 const ng_packagr_1 = require("./ng-packagr-adjustments/ng-packagr");
 async function initializeNgPackagr(options, context, projectDependencies) {
-    const ngPackagr = await (0, ng_packagr_1.getNgPackagrInstance)(options);
+    const ngPackagr = await (0, ng_packagr_1.getNgPackagrInstance)();
     ngPackagr.forProject((0, path_1.resolve)(context.root, options.project));
     if (options.tsConfig) {
         const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, options.tsConfig), context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
@@ -26,10 +27,11 @@ async function initializeNgPackagr(options, context, projectDependencies) {
  */
 function createLibraryExecutor(initializeNgPackagr) {
     return async function* (options, context) {
-        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 { major: angularMajorVersion, version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+        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 { 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/executors/package/schema.d.ts

@@ -1,6 +1,4 @@
-export interface BuildAngularLibraryExecutorOptions {
-  project: string;
-  tailwindConfig?: string;
-  tsConfig?: string;
-  watch?: boolean;
-}
+import type { NgPackagrBuilderOptions } from '@angular-devkit/build-angular';
+
+export interface BuildAngularLibraryExecutorOptions
+  extends NgPackagrBuilderOptions {}

package/src/executors/package/schema.json

@@ -3,14 +3,10 @@
   "outputCapture": "direct-nodejs",
   "$schema": "https://json-schema.org/schema",
   "title": "ng-packagr Target",
-  "description": "Builds and packages an Angular library producing an output following the Angular Package Format (APF) to be distributed as an NPM package.\n\nThis executor is a drop-in replacement for the `@angular-devkit/build-angular:ng-packagr` with additional support for incremental builds.",
+  "description": "Builds and packages an Angular library producing an output following the Angular Package Format (APF) to be distributed as an NPM package.\n\nThis executor is a drop-in replacement for the `@angular-devkit/build-angular:ng-packagr` and `@angular/build:ng-packagr` builders, with additional support for incremental builds.",
   "cli": "nx",
   "type": "object",
   "presets": [
-    {
-      "name": "Publishable Library with Tailwind",
-      "keys": ["project", "tailwindConfig"]
-    },
     {
       "name": "Updating Project Dependencies for Publishable Library",
       "keys": ["project"]
@@ -33,11 +29,9 @@
       "description": "Whether to run a build when any file changes.",
       "default": false
     },
-    "tailwindConfig": {
-      "type": "string",
-      "description": "The full path for the Tailwind configuration file, relative to the workspace root. If not provided and a `tailwind.config.js` file exists in the project or workspace root, it will be used. Otherwise, Tailwind will not be configured. _Note: starting with Angular v17, this option is no longer used and the configuration will be picked up if exists at the project or workspace root_.",
-      "x-completion-type": "file",
-      "x-completion-glob": "tailwind.config@(.js|.cjs|.mjs|.ts)"
+    "poll": {
+      "type": "number",
+      "description": "Enable and define the file watching poll time period in milliseconds. _Note: this is only supported in Angular versions >= 18.0.0_."
     }
   },
   "additionalProperties": false,

package/src/executors/utilities/ng-packagr/ng-packagr-version.d.ts

@@ -0,0 +1,2 @@
+import { type VersionInfo } from '../angular-version-utils';
+export declare function getNgPackagrVersionInfo(): VersionInfo;

package/src/executors/utilities/ng-packagr/ng-packagr-version.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNgPackagrVersionInfo = getNgPackagrVersionInfo;
+const angular_version_utils_1 = require("../angular-version-utils");
+let ngPackagrVersionInfo;
+function getNgPackagrVersionInfo() {
+    if (!ngPackagrVersionInfo) {
+        ngPackagrVersionInfo = (0, angular_version_utils_1.getInstalledPackageVersionInfo)('ng-packagr');
+    }
+    return ngPackagrVersionInfo;
+}

package/src/executors/utilities/ng-packagr/package-imports.d.ts

@@ -0,0 +1 @@
+export declare function importNgPackagrPath<T>(path: string, ngPackagrMajorVersion: number): T;

package/src/executors/utilities/ng-packagr/package-imports.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.importNgPackagrPath = importNgPackagrPath;
+function importNgPackagrPath(path, ngPackagrMajorVersion) {
+    let finalPath = path;
+    if (ngPackagrMajorVersion >= 20 && !path.startsWith('ng-packagr/src/')) {
+        finalPath = path.replace(/^ng-packagr\//, 'ng-packagr/src/');
+    }
+    return require(finalPath);
+}

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

@@ -15,10 +15,10 @@ const path_1 = require("path");
 const Piscina = require('piscina');
 const color_1 = require("ng-packagr/lib/utils/color");
 // using this instead of the one from ng-packagr
-const tailwindcss_1 = require("./tailwindcss");
+const tailwindcss_1 = require("../tailwindcss");
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
-const angular_version_utils_1 = require("../angular-version-utils");
+const ng_packagr_version_1 = require("../ng-packagr-version");
 const maxWorkersVariable = process.env['NG_BUILD_MAX_WORKERS'];
 const maxThreads = typeof maxWorkersVariable === 'string' && maxWorkersVariable !== ''
     ? +maxWorkersVariable
@@ -72,7 +72,7 @@ class StylesheetProcessor {
             currentDir = (0, path_1.dirname)(prevDir);
         }
         const browserslistData = (0, browserslist_1.default)(undefined, { path: this.basePath });
-        const { version: ngPackagrVersion } = (0, angular_version_utils_1.getInstalledPackageVersionInfo)('ng-packagr');
+        const { version: ngPackagrVersion } = (0, ng_packagr_version_1.getNgPackagrVersionInfo)();
         let tailwindConfigPath;
         let postcssConfiguration;
         if ((0, semver_1.gte)(ngPackagrVersion, '18.0.0')) {
@@ -163,7 +163,7 @@ class AsyncStylesheetProcessor {
             currentDir = (0, path_1.dirname)(prevDir);
         }
         const browserslistData = (0, browserslist_1.default)(undefined, { path: this.basePath });
-        const { version: ngPackagrVersion } = (0, angular_version_utils_1.getInstalledPackageVersionInfo)('ng-packagr');
+        const { version: ngPackagrVersion } = (0, ng_packagr_version_1.getNgPackagrVersionInfo)();
         let postcssConfiguration;
         if (ngPackagrVersion === '17.2.0') {
             const { loadPostcssConfiguration, } = require('ng-packagr/lib/styles/postcss-configuration');

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

@@ -1,2 +1,2 @@
 import type { FactoryProvider } from 'injection-js';
-export declare const STYLESHEET_PROCESSOR: FactoryProvider;
+export declare function getStylesheetProcessorFactoryProvider(): FactoryProvider;

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

@@ -1,16 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STYLESHEET_PROCESSOR = void 0;
-const stylesheet_processor_di_1 = require("ng-packagr/lib/styles/stylesheet-processor.di");
-const angular_version_utils_1 = require("../angular-version-utils");
-const stylesheet_processor_1 = require("./stylesheet-processor");
-exports.STYLESHEET_PROCESSOR = {
-    provide: stylesheet_processor_di_1.STYLESHEET_PROCESSOR_TOKEN,
-    useFactory: () => {
-        const { version: ngPackagrVersion } = (0, angular_version_utils_1.getInstalledPackageVersionInfo)('ng-packagr');
-        return ngPackagrVersion !== '17.2.0'
-            ? stylesheet_processor_1.StylesheetProcessor
-            : stylesheet_processor_1.AsyncStylesheetProcessor;
-    },
-    deps: [],
-};
+exports.getStylesheetProcessorFactoryProvider = getStylesheetProcessorFactoryProvider;
+const ng_packagr_version_1 = require("./ng-packagr-version");
+const package_imports_1 = require("./package-imports");
+function getStylesheetProcessorFactoryProvider() {
+    const { major: ngPackagrMajorVersion, version: ngPackagrVersion } = (0, ng_packagr_version_1.getNgPackagrVersionInfo)();
+    const { STYLESHEET_PROCESSOR_TOKEN } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/lib/styles/stylesheet-processor.di', ngPackagrMajorVersion);
+    return {
+        provide: STYLESHEET_PROCESSOR_TOKEN,
+        useFactory: () => {
+            if (ngPackagrMajorVersion >= 19) {
+                const { getStylesheetProcessor, } = require('./v19+/stylesheet-processor');
+                return getStylesheetProcessor();
+            }
+            if (ngPackagrVersion !== '17.2.0') {
+                const { StylesheetProcessor, } = require('./pre-v19/stylesheet-processor');
+                return StylesheetProcessor;
+            }
+            const { AsyncStylesheetProcessor, } = require('./pre-v19/stylesheet-processor');
+            return AsyncStylesheetProcessor;
+        },
+        deps: [],
+    };
+}

package/src/executors/utilities/ng-packagr/tailwindcss.d.ts

@@ -1,7 +1 @@
-export interface TailwindSetup {
-    tailwindConfigPath: string;
-    tailwindPackagePath: string;
-}
-export declare function getTailwindSetup(basePath: string, tailwindConfig?: string): TailwindSetup | undefined;
 export declare function getTailwindConfigPath(projectRoot: string, workspaceRoot: string): string | undefined;
-export declare function getTailwindPostCssPlugin({ tailwindConfigPath, tailwindPackagePath, }: TailwindSetup): any;

package/src/executors/utilities/ng-packagr/tailwindcss.js

@@ -1,37 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTailwindSetup = getTailwindSetup;
 exports.getTailwindConfigPath = getTailwindConfigPath;
-exports.getTailwindPostCssPlugin = getTailwindPostCssPlugin;
-const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
 const fs_1 = require("fs");
 const path_1 = require("path");
-function getTailwindSetup(basePath, tailwindConfig) {
-    let tailwindConfigPath = tailwindConfig;
-    if (!tailwindConfigPath) {
-        tailwindConfigPath = getTailwindConfigPath(basePath, devkit_2.workspaceRoot);
-    }
-    // Only load Tailwind CSS plugin if configuration file was found.
-    if (!tailwindConfigPath) {
-        return undefined;
-    }
-    let tailwindPackagePath;
-    try {
-        tailwindPackagePath = require.resolve('tailwindcss');
-    }
-    catch {
-        const relativeTailwindConfigPath = (0, path_1.relative)(devkit_2.workspaceRoot, tailwindConfigPath);
-        devkit_1.logger.warn(`Tailwind CSS configuration file found (${relativeTailwindConfigPath})` +
-            ` but the 'tailwindcss' package is not installed.` +
-            ` To enable Tailwind CSS, please install the 'tailwindcss' package.`);
-        return undefined;
-    }
-    if (!tailwindPackagePath) {
-        return undefined;
-    }
-    return { tailwindConfigPath, tailwindPackagePath };
-}
 function getTailwindConfigPath(projectRoot, workspaceRoot) {
     // valid tailwind config files https://github.com/tailwindlabs/tailwindcss/blob/master/src/util/resolveConfigPath.js#L4
     const tailwindConfigFiles = [
@@ -50,6 +21,3 @@ function getTailwindConfigPath(projectRoot, workspaceRoot) {
     }
     return undefined;
 }
-function getTailwindPostCssPlugin({ tailwindConfigPath, tailwindPackagePath, }) {
-    return require(tailwindPackagePath)({ config: tailwindConfigPath });
-}

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

@@ -0,0 +1,14 @@
+/**
+ * Adapted from the original ng-packagr source.
+ *
+ * Changes made:
+ * - Add the project root to the search directories.
+ */
+import type { NgPackageEntryConfig } from 'ng-packagr/ng-entrypoint.schema';
+export declare enum CssUrl {
+    inline = "inline",
+    none = "none"
+}
+export declare function getStylesheetProcessor(): new (projectBasePath: string, basePath: string, cssUrl?: CssUrl, includePaths?: string[], sass?: NgPackageEntryConfig['lib']['sass'], cacheDirectory?: string | false, watch?: boolean) => {
+    [key: string]: any;
+};

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

@@ -0,0 +1,99 @@
+"use strict";
+/**
+ * Adapted from the original ng-packagr source.
+ *
+ * Changes made:
+ * - Add the project root to the search directories.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CssUrl = void 0;
+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");
+var CssUrl;
+(function (CssUrl) {
+    CssUrl["inline"] = "inline";
+    CssUrl["none"] = "none";
+})(CssUrl || (exports.CssUrl = CssUrl = {}));
+function getStylesheetProcessor() {
+    const { major: ngPackagrMajorVersion } = (0, ng_packagr_version_1.getNgPackagrVersionInfo)();
+    const { ComponentStylesheetBundler } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/lib/styles/component-stylesheets', ngPackagrMajorVersion);
+    const { generateSearchDirectories, getTailwindConfig, loadPostcssConfiguration, } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/lib/styles/postcss-configuration', ngPackagrMajorVersion);
+    class StylesheetProcessor extends ComponentStylesheetBundler {
+        constructor(projectBasePath, basePath, cssUrl, includePaths, sass, cacheDirectory, watch) {
+            // By default, browserslist defaults are too inclusive
+            // https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
+            // We change the default query to browsers that Angular support.
+            // https://angular.io/guide/browser-support
+            browserslist_1.default.defaults = [
+                'last 2 Chrome versions',
+                'last 1 Firefox version',
+                'last 2 Edge major versions',
+                'last 2 Safari major versions',
+                'last 2 iOS major versions',
+                'Firefox ESR',
+            ];
+            const browserslistData = (0, browserslist_1.default)(undefined, { path: basePath });
+            let searchDirs = generateSearchDirectories([projectBasePath]);
+            const postcssConfiguration = loadPostcssConfiguration(searchDirs);
+            // (nx-specific): we support loading the TailwindCSS config from the root of the workspace
+            searchDirs = generateSearchDirectories([projectBasePath, devkit_1.workspaceRoot]);
+            super({
+                cacheDirectory: cacheDirectory,
+                postcssConfiguration: postcssConfiguration,
+                tailwindConfiguration: postcssConfiguration
+                    ? undefined
+                    : getTailwindConfig(searchDirs, projectBasePath),
+                sass: sass,
+                workspaceRoot: projectBasePath,
+                cssUrl: cssUrl,
+                target: transformSupportedBrowsersToTargets(browserslistData),
+                includePaths: includePaths,
+            }, 'css', watch);
+            this.projectBasePath = projectBasePath;
+            this.basePath = basePath;
+            this.cssUrl = cssUrl;
+            this.includePaths = includePaths;
+            this.sass = sass;
+            this.cacheDirectory = cacheDirectory;
+            this.watch = watch;
+        }
+        destroy() {
+            void super.dispose();
+        }
+    }
+    return StylesheetProcessor;
+}
+function transformSupportedBrowsersToTargets(supportedBrowsers) {
+    const transformed = [];
+    // https://esbuild.github.io/api/#target
+    const esBuildSupportedBrowsers = new Set([
+        'safari',
+        'firefox',
+        'edge',
+        'chrome',
+        'ios',
+    ]);
+    for (const browser of supportedBrowsers) {
+        let [browserName, version] = browser.split(' ');
+        // browserslist uses the name `ios_saf` for iOS Safari whereas esbuild uses `ios`
+        if (browserName === 'ios_saf') {
+            browserName = 'ios';
+        }
+        // browserslist uses ranges `15.2-15.3` versions but only the lowest is required
+        // to perform minimum supported feature checks. esbuild also expects a single version.
+        [version] = version.split('-');
+        if (esBuildSupportedBrowsers.has(browserName)) {
+            if (browserName === 'safari' && version === 'tp') {
+                // esbuild only supports numeric versions so `TP` is converted to a high number (999) since
+                // a Technology Preview (TP) of Safari is assumed to support all currently known features.
+                version = '999';
+            }
+            transformed.push(browserName + version);
+        }
+    }
+    return transformed.length ? transformed : undefined;
+}

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

@@ -13,7 +13,7 @@ async function addLintingGenerator(tree, options) {
     const tasks = [];
     const rootProject = options.projectRoot === '.' || options.projectRoot === '';
     const lintTask = await (0, eslint_1.lintProjectGenerator)(tree, {
-        linter: eslint_1.Linter.EsLint,
+        linter: 'eslint',
         project: options.projectName,
         tsConfigPaths: [
             (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
@@ -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/lib/create-eslint-configuration.d.ts

@@ -5,7 +5,7 @@ type EslintExtensionSchema = {
     prefix: string;
 };
 /**
- * @deprecated Use tools from `@nx/eslint/src/generators/utils/eslint-file` instead
+ * @deprecated Use tools from `@nx/eslint/src/generators/utils/eslint-file` instead. It will be removed in Nx v22.
  */
 export declare const extendAngularEslintJson: (json: Linter.Config, options: EslintExtensionSchema) => {
     overrides: ({
@@ -75,7 +75,7 @@ export declare const extendAngularEslintJson: (json: Linter.Config, options: Esl
     rules?: Partial<Linter.RulesRecord>;
 };
 /**
- * @deprecated Use {@link extendAngularEslintJson} instead
+ * @deprecated Use {@link extendAngularEslintJson} instead. It will be removed in Nx v22.
  */
 export declare function createEsLintConfiguration(tree: Tree, options: AddLintingGeneratorSchema): void;
 export {};

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

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

package/src/generators/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.d.ts

@@ -1,5 +1,4 @@
 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 applicationGeneratorInternal(tree: Tree, schema: Partial<Schema>): Promise<GeneratorCallback>;
 export default applicationGenerator;

package/src/generators/application/application.js

@@ -1,23 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
-exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 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");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function applicationGenerator(tree, schema) {
-    return await applicationGeneratorInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function applicationGeneratorInternal(tree, schema) {
-    const options = await (0, lib_1.normalizeOptions)(tree, schema);
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'application');
+    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,
@@ -28,6 +28,7 @@ async function applicationGeneratorInternal(tree, schema) {
     await (0, init_1.angularInitGenerator)(tree, {
         ...options,
         skipFormat: true,
+        addPlugin: options.addPlugin,
     });
     if (!options.skipPackageJson) {
         (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree);
@@ -66,7 +67,21 @@ async function applicationGeneratorInternal(tree, schema) {
             project: options.name,
             standalone: options.standalone,
             skipPackageJson: options.skipPackageJson,
+            serverRouting: options.serverRouting,
+        });
+    }
+    if (isRspack) {
+        await (0, convert_to_rspack_1.convertToRspack)(tree, {
+            project: options.name,
+            skipInstall: options.skipPackageJson,
+            skipFormat: true,
         });
+        if (options.ssr) {
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/rspack-ssr'), options.appProjectSourceRoot, {
+                pathToDistFolder: (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.appProjectRoot), options.outputPath, 'browser'),
+                tmpl: '',
+            });
+        }
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/application/files/ng-module/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/ng-module/src/app/app.component.ts__tpl__

@@ -1,13 +1,12 @@
 import { Component<% if(viewEncapsulation) { %>, ViewEncapsulation<% } %> } from '@angular/core';
 
 @Component({
-  selector: '<%= rootSelector %>',<% if(!inlineTemplate) { %>
+  selector: '<%= rootSelector %>',<% if (setStandaloneFalse) { %>
+  standalone: false,<% } 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/files/nx-welcome/claimed/ng-module/src/app/nx-welcome.component.ts__tpl__

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

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

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

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

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

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

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

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

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

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

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