@nx/angular 17.0.5 → 17.0.6

package/src/generators/application/files/tsconfig.editor.json__tpl__

@@ -0,0 +1,5 @@
+{
+  "extends": "./tsconfig.json",
+  "include": ["src/**/*.ts"],
+  "compilerOptions": {}
+}

package/src/generators/application/files/v14/.browserlistrc__tpl__

@@ -0,0 +1,16 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
+Firefox ESR

package/src/generators/application/files/v14/src/environments/environment.prod.ts__tpl__

@@ -0,0 +1,3 @@
+export const environment = {
+  production: true
+};

package/src/generators/application/files/v14/src/environments/environment.ts__tpl__

@@ -0,0 +1,16 @@
+// This file can be replaced during build by using the `fileReplacements` array.
+// `ng build` replaces `environment.ts` with `environment.prod.ts`.
+// The list of file replacements can be found in `angular.json`.
+
+export const environment = {
+  production: false
+};
+
+/*
+ * For easier debugging in development mode, you can import the following file
+ * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
+ *
+ * This import should be commented out in production mode because it will have a negative impact
+ * on performance if an error is thrown.
+ */
+// import 'zone.js/plugins/zone-error';

package/src/generators/application/files/v14/src/polyfills.ts__tpl__

@@ -0,0 +1,53 @@
+/**
+ * This file includes polyfills needed by Angular and is loaded before the app.
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ *      file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes recent versions of Safari, Chrome (including
+ * Opera), Edge on the desktop, and iOS and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/guide/browser-support
+ */
+
+/***************************************************************************************************
+ * BROWSER POLYFILLS
+ */
+
+/**
+ * By default, zone.js will patch all possible macroTask and DomEvents
+ * user can disable parts of macroTask/DomEvents patch by setting following flags
+ * because those flags need to be set before `zone.js` being loaded, and webpack
+ * will put import in the top of bundle, so user need to create a separate file
+ * in this directory (for example: zone-flags.ts), and put the following flags
+ * into that file, and then add the following code before importing zone.js.
+ * import './zone-flags';
+ *
+ * The flags allowed in zone-flags.ts are listed here.
+ *
+ * The following flags will work for all browsers.
+ *
+ * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+ * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+ * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+ *
+ *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
+ *  with the following flag, it will bypass `zone.js` patch for IE/Edge
+ *
+ *  (window as any).__Zone_enable_cross_context_check = true;
+ *
+ */
+
+/***************************************************************************************************
+ * Zone JS is required by default for Angular itself.
+ */
+import 'zone.js';  // Included with Angular CLI.
+
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */

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

@@ -3,14 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = void 0;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-const version_utils_1 = require("../../utils/version-utils");
+const cypress_1 = require("@nx/cypress");
 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;
     if (options.e2eTestRunner === 'cypress') {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
         // TODO: This can call `@nx/web:static-config` generator when ready
         addFileServerTarget(tree, options, 'serve-static');
         (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -21,20 +16,18 @@ async function addE2e(tree, options) {
             tags: [],
             implicitDependencies: [options.name],
         });
-        await configurationGenerator(tree, {
+        await (0, cypress_1.configurationGenerator)(tree, {
             project: options.e2eProjectName,
             directory: 'src',
             linter: options.linter,
             skipPackageJson: options.skipPackageJson,
             skipFormat: true,
-            devServerTarget: `${options.name}:${options.e2eWebServerTarget}:development`,
-            baseUrl: options.e2eWebServerAddress,
+            devServerTarget: `${options.name}:serve:development`,
             rootProject: options.rootProject,
-            addPlugin,
         });
     }
     else if (options.e2eTestRunner === 'playwright') {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
+        const { configurationGenerator: playwrightConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
         (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
             projectType: 'application',
             root: options.e2eProjectRoot,
@@ -42,7 +35,7 @@ async function addE2e(tree, options) {
             targets: {},
             implicitDependencies: [options.name],
         });
-        await configurationGenerator(tree, {
+        await playwrightConfigurationGenerator(tree, {
             project: options.e2eProjectName,
             skipFormat: true,
             skipPackageJson: options.skipPackageJson,
@@ -50,28 +43,21 @@ async function addE2e(tree, options) {
             js: false,
             linter: options.linter,
             setParserOptionsProject: options.setParserOptionsProject,
-            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.name}`,
-            webServerAddress: options.e2eWebServerAddress,
+            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
+            webServerAddress: `http://localhost:${options.port ?? 4200}`,
             rootProject: options.rootProject,
-            addPlugin,
         });
     }
 }
 exports.addE2e = addE2e;
 function addFileServerTarget(tree, options, targetName) {
     (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 projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.name);
     projectConfig.targets[targetName] = {
         executor: '@nx/web:file-server',
         options: {
             buildTarget: `${options.name}:build`,
-            port: options.e2ePort,
-            staticFilePath: isUsingApplicationBuilder
-                ? (0, devkit_1.joinPathFragments)(options.outputPath, 'browser')
-                : undefined,
-            spa: true,
+            port: options.port,
         },
     };
     (0, devkit_1.updateProjectConfiguration)(tree, options.name, projectConfig);

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

@@ -1,16 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addUnitTestRunner = void 0;
+const devkit_1 = require("@nx/devkit");
+const jest_1 = require("@nx/jest");
 const test_runners_1 = require("../../../utils/test-runners");
-const add_jest_1 = require("../../utils/add-jest");
 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,
+        await (0, jest_1.configurationGenerator)(host, {
+            project: options.name,
+            setupFile: 'angular',
+            supportTsx: false,
+            skipSerializers: false,
             skipPackageJson: options.skipPackageJson,
-            strict: options.strict,
+            skipFormat: true,
         });
+        const setupFile = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src', 'test-setup.ts');
+        if (options.strict && host.exists(setupFile)) {
+            const contents = host.read(setupFile, 'utf-8');
+            host.write(setupFile, `// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
+globalThis.ngJest = {
+  testEnvironmentOptions: {
+    errorOnUnknownElements: true,
+    errorOnUnknownProperties: true,
+  },
+};
+${contents}`);
+        }
     }
 }
 exports.addUnitTestRunner = addUnitTestRunner;

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

@@ -3,19 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const update_project_root_tsconfig_1 = require("../../utils/update-project-root-tsconfig");
+const create_ts_config_1 = require("../../utils/create-ts-config");
 const test_runners_1 = require("../../../utils/test-runners");
 const version_utils_1 = require("../../utils/version-utils");
-const selector_1 = require("../../utils/selector");
 async function createFiles(tree, options, rootOffset) {
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const isUsingApplicationBuilder = angularMajorVersion >= 17 && options.bundler === 'esbuild';
-    const rootSelector = `${options.prefix}-root`;
-    (0, selector_1.validateHtmlSelector)(rootSelector);
-    const nxWelcomeSelector = `${options.prefix}-nx-welcome`;
-    (0, selector_1.validateHtmlSelector)(nxWelcomeSelector);
+    const installedAngularInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const substitutions = {
-        rootSelector,
+        rootSelector: `${options.prefix}-root`,
         appName: options.name,
         inlineStyle: options.inlineStyle,
         inlineTemplate: options.inlineTemplate,
@@ -24,21 +18,23 @@ async function createFiles(tree, options, rootOffset) {
         unitTesting: options.unitTestRunner !== test_runners_1.UnitTestRunner.None,
         routing: options.routing,
         minimal: options.minimal,
-        nxWelcomeSelector,
+        nxWelcomeSelector: `${options.prefix}-nx-welcome`,
         rootTsConfig: (0, devkit_1.joinPathFragments)(rootOffset, (0, js_1.getRootTsConfigFileName)(tree)),
-        angularMajorVersion,
+        installedAngularInfo,
         rootOffset,
-        isUsingApplicationBuilder,
         tpl: '',
     };
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/base'), options.appProjectRoot, substitutions);
+    if (installedAngularInfo.major === 14) {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/v14'), options.appProjectRoot, substitutions);
+    }
     if (options.standalone) {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/standalone-components'), options.appProjectRoot, substitutions);
     }
     else {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/ng-module'), options.appProjectRoot, substitutions);
+        await (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/ng-module'), options.appProjectRoot, substitutions);
     }
-    (0, update_project_root_tsconfig_1.updateProjectRootTsConfig)(tree, options.appProjectRoot, (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot), options.rootProject);
+    (0, create_ts_config_1.createTsConfig)(tree, options.appProjectRoot, 'app', options, (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot));
     if (!options.routing) {
         tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, '/src/app/app.routes.ts'));
     }

package/src/generators/application/lib/create-project.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 createProject(tree: Tree, options: NormalizedSchema): void;

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

@@ -3,75 +3,65 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProject = void 0;
 const devkit_1 = require("@nx/devkit");
 const version_utils_1 = require("../../utils/version-utils");
-const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 function createProject(tree, options) {
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const installedAngularInfo = (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';
-    (0, add_build_target_defaults_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',
-                },
-            ];
-        }
-    }
-    const inlineStyleLanguage = options?.style !== 'css' ? options.style : undefined;
+        : '@angular-devkit/build-angular:browser-esbuild';
     const project = {
         name: options.name,
         projectType: 'application',
         prefix: options.prefix,
         root: options.appProjectRoot,
-        sourceRoot: options.appProjectSourceRoot,
+        sourceRoot: `${options.appProjectRoot}/src`,
         tags: options.parsedTags,
         targets: {
             build: {
                 executor: buildExecutor,
                 outputs: ['{options.outputPath}'],
                 options: {
-                    outputPath: options.outputPath,
-                    index: `${options.appProjectSourceRoot}/index.html`,
-                    [buildMainOptionName]: `${options.appProjectSourceRoot}/main.ts`,
-                    polyfills: ['zone.js'],
+                    outputPath: `dist/${!options.rootProject ? options.appProjectRoot : options.name}`,
+                    index: `${options.appProjectRoot}/src/index.html`,
+                    main: `${options.appProjectRoot}/src/main.ts`,
+                    polyfills: installedAngularInfo.major === 14
+                        ? `${options.appProjectRoot}/src/polyfills.ts`
+                        : ['zone.js'],
                     tsConfig: `${options.appProjectRoot}/tsconfig.app.json`,
-                    inlineStyleLanguage,
                     assets: [
-                        `${options.appProjectSourceRoot}/favicon.ico`,
-                        `${options.appProjectSourceRoot}/assets`,
+                        `${options.appProjectRoot}/src/favicon.ico`,
+                        `${options.appProjectRoot}/src/assets`,
                     ],
-                    styles: [`${options.appProjectSourceRoot}/styles.${options.style}`],
+                    styles: [`${options.appProjectRoot}/src/styles.${options.style}`],
                     scripts: [],
                 },
                 configurations: {
                     production: {
-                        budgets,
+                        budgets: options.bundler === 'webpack'
+                            ? [
+                                {
+                                    type: 'initial',
+                                    maximumWarning: '500kb',
+                                    maximumError: '1mb',
+                                },
+                                {
+                                    type: 'anyComponentStyle',
+                                    maximumWarning: '2kb',
+                                    maximumError: '4kb',
+                                },
+                            ]
+                            : undefined,
+                        fileReplacements: installedAngularInfo.major === 14
+                            ? [
+                                {
+                                    replace: `${options.appProjectRoot}/src/environments/environment.ts`,
+                                    with: `${options.appProjectRoot}/src/environments/environment.prod.ts`,
+                                },
+                            ]
+                            : undefined,
                         outputHashing: 'all',
                     },
                     development: {
-                        buildOptimizer: options.bundler === 'webpack' ? false : undefined,
+                        buildOptimizer: false,
                         optimization: false,
                         vendorChunk: options.bundler === 'webpack' ? true : undefined,
                         extractLicenses: false,
@@ -90,10 +80,10 @@ function createProject(tree, options) {
                     : undefined,
                 configurations: {
                     production: {
-                        [buildTargetOptionName]: `${options.name}:build:production`,
+                        browserTarget: `${options.name}:build:production`,
                     },
                     development: {
-                        [buildTargetOptionName]: `${options.name}:build:development`,
+                        browserTarget: `${options.name}:build:development`,
                     },
                 },
                 defaultConfiguration: 'development',
@@ -101,7 +91,7 @@ function createProject(tree, options) {
             'extract-i18n': {
                 executor: '@angular-devkit/build-angular:extract-i18n',
                 options: {
-                    [buildTargetOptionName]: `${options.name}:build`,
+                    browserTarget: `${options.name}:build`,
                 },
             },
         },

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

@@ -8,5 +8,4 @@ export * from './enable-strict-type-checking';
 export * from './normalize-options';
 export * from './normalized-schema';
 export * from './set-app-strict-default';
-export * from './set-generator-defaults';
 export * from './update-editor-tsconfig';

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

@@ -11,5 +11,4 @@ tslib_1.__exportStar(require("./enable-strict-type-checking"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./normalized-schema"), exports);
 tslib_1.__exportStar(require("./set-app-strict-default"), exports);
-tslib_1.__exportStar(require("./set-generator-defaults"), exports);
 tslib_1.__exportStar(require("./update-editor-tsconfig"), exports);

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

@@ -1,4 +1,4 @@
-import { type Tree } from '@nx/devkit';
+import { 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>;

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

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 const eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../../utils/test-runners");
-const version_utils_1 = require("../../utils/version-utils");
+const project_1 = require("../../utils/project");
 async function normalizeOptions(host, options) {
     const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
@@ -17,31 +17,16 @@ async function normalizeOptions(host, options) {
     });
     options.rootProject = appProjectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    let e2eWebServerTarget = 'serve';
-    let e2ePort = options.port ?? 4200;
-    if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
-        (nxJson.targetDefaults?.[e2eWebServerTarget].options?.port ||
-            nxJson.targetDefaults?.[e2eWebServerTarget].options?.env?.PORT)) {
-        e2ePort =
-            nxJson.targetDefaults?.[e2eWebServerTarget].options?.port ||
-                nxJson.targetDefaults?.[e2eWebServerTarget].options?.env?.PORT;
-    }
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
-    const e2eWebServerAddress = `http://localhost:${e2ePort}`;
     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 prefix = (0, project_1.normalizeNewProjectPrefix)(options.prefix, (0, get_npm_scope_1.getNpmScope)(host), 'app');
     // Set defaults and then overwrite with user options
     return {
         style: 'css',
-        routing: true,
+        routing: false,
         inlineStyle: false,
         inlineTemplate: false,
         skipTests: options.unitTestRunner === test_runners_1.UnitTestRunner.None,
@@ -50,21 +35,14 @@ async function normalizeOptions(host, options) {
         e2eTestRunner: test_runners_1.E2eTestRunner.Cypress,
         linter: eslint_1.Linter.EsLint,
         strict: true,
-        standalone: true,
+        bundler: options.bundler ?? 'webpack',
         ...options,
-        prefix: options.prefix || 'app',
+        prefix,
         name: appProjectName,
         appProjectRoot,
-        appProjectSourceRoot: `${appProjectRoot}/src`,
         e2eProjectRoot,
         e2eProjectName,
-        e2eWebServerAddress,
-        e2eWebServerTarget,
-        e2ePort,
         parsedTags,
-        bundler,
-        outputPath: (0, devkit_1.joinPathFragments)('dist', !options.rootProject ? appProjectRoot : appProjectName),
-        ssr: options.ssr ?? false,
     };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/application/lib/normalized-schema.d.ts

@@ -7,12 +7,7 @@ export interface NormalizedSchema extends Schema {
     e2eTestRunner: E2eTestRunner;
     prefix: string;
     appProjectRoot: string;
-    appProjectSourceRoot: string;
     e2eProjectName: string;
     e2eProjectRoot: string;
-    e2eWebServerAddress: string;
-    e2eWebServerTarget: string;
-    e2ePort: number;
     parsedTags: string[];
-    outputPath: string;
 }

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

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

package/src/generators/application/lib/update-editor-tsconfig.js

@@ -2,21 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateEditorTsConfig = void 0;
 const devkit_1 = require("@nx/devkit");
-const update_app_editor_tsconfig_excluded_files_1 = require("../../utils/update-app-editor-tsconfig-excluded-files");
 function getCompilerOptionsTypes(tsConfig) {
     return tsConfig?.compilerOptions?.types ?? [];
 }
 function updateEditorTsConfig(tree, options) {
-    const appTsConfig = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'));
-    const types = getCompilerOptionsTypes(appTsConfig);
-    if (types?.length) {
-        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.editor.json'), (json) => {
-            json.compilerOptions ??= {};
-            json.compilerOptions.types = Array.from(new Set(types));
-            return json;
-        });
+    const types = getCompilerOptionsTypes((0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json')));
+    if (options.unitTestRunner !== 'none') {
+        types.push(...getCompilerOptionsTypes((0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json'))));
     }
-    const project = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-    (0, update_app_editor_tsconfig_excluded_files_1.updateAppEditorTsConfigExcludedFiles)(tree, project);
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.editor.json'), (json) => {
+        json.compilerOptions.types = types;
+        return json;
+    });
+    // This should be the last tsconfig references so it's not in the template
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
+        json.references.push({
+            path: './tsconfig.editor.json',
+        });
+        return json;
+    });
 }
 exports.updateEditorTsConfig = updateEditorTsConfig;

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

@@ -30,5 +30,4 @@ export interface Schema {
   rootProject?: boolean;
   minimal?: boolean;
   bundler?: 'webpack' | 'esbuild';
-  ssr?: boolean;
 }

package/src/generators/application/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "GeneratorNxApp",
   "title": "Creates an Angular application.",
   "description": "Creates an Angular application.",
@@ -41,23 +41,24 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)  [ https://sass-lang.com   ]"
+            "label": "SASS(.scss)  [ http://sass-lang.com   ]"
           },
           {
             "value": "sass",
-            "label": "SASS(.sass)  [ https://sass-lang.com   ]"
+            "label": "SASS(.sass)  [ http://sass-lang.com   ]"
           },
           {
             "value": "less",
-            "label": "LESS         [ https://lesscss.org     ]"
+            "label": "LESS         [ http://lesscss.org     ]"
           }
         ]
       }
     },
     "routing": {
       "type": "boolean",
-      "description": "Enable routing for the application.",
-      "default": true,
+      "description": "Generate a routing module.",
+      "default": false,
+      "x-prompt": "Would you like to configure routing for this application?",
       "x-priority": "important"
     },
     "inlineStyle": {
@@ -81,7 +82,6 @@
       "type": "string",
       "format": "html-selector",
       "description": "The prefix to apply to generated selectors.",
-      "default": "app",
       "alias": "p"
     },
     "skipTests": {
@@ -155,9 +155,8 @@
       "default": false
     },
     "standalone": {
-      "description": "Generate an application that is setup to use standalone components.",
+      "description": "Generate an application that is setup to use standalone components. _Note: This is only supported in Angular versions >= 14.1.0_",
       "type": "boolean",
-      "default": true,
       "x-priority": "important"
     },
     "rootProject": {
@@ -173,17 +172,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"],
-      "x-prompt": "Which bundler do you want to use to build the application?",
-      "x-priority": "important"
-    },
-    "ssr": {
-      "description": "Creates an application with Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering) enabled.",
-      "type": "boolean",
-      "x-prompt": "Do you want to enable Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering)?",
-      "default": false
+      "default": "webpack"
     }
   },
   "additionalProperties": false,