@nx/angular 16.8.0-beta.3 → 16.8.0-beta.5

package/src/generators/application/application.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
@@ -9,65 +8,67 @@ const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 const semver_1 = require("semver");
 const enquirer_1 = require("enquirer");
-function applicationGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield applicationGeneratorInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function applicationGenerator(tree, schema) {
+    return await applicationGeneratorInternal(tree, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.applicationGenerator = applicationGenerator;
-function applicationGeneratorInternal(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-        if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') && schema.standalone) {
-            throw new Error((0, devkit_1.stripIndents) `The "standalone" option is only supported in Angular >= 14.1.0. You are currently using ${installedAngularVersionInfo.version}.
+async function applicationGeneratorInternal(tree, schema) {
+    const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') && schema.standalone) {
+        throw new Error((0, devkit_1.stripIndents) `The "standalone" option is only supported in Angular >= 14.1.0. You are currently using ${installedAngularVersionInfo.version}.
     You can resolve this error by removing the "standalone" option or by migrating to Angular 14.1.0.`);
-        }
-        if ((0, semver_1.gte)(installedAngularVersionInfo.version, '14.1.0') &&
-            schema.standalone === undefined &&
-            process.env.NX_INTERACTIVE === 'true') {
-            schema.standalone = yield (0, enquirer_1.prompt)({
-                name: 'standalone-components',
-                message: 'Would you like to use Standalone Components?',
-                type: 'confirm',
-            }).then((a) => a['standalone-components']);
-        }
-        const options = yield (0, lib_1.normalizeOptions)(tree, schema);
-        const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
-        yield (0, init_1.angularInitGenerator)(tree, Object.assign(Object.assign({}, options), { skipFormat: true }));
-        (0, lib_1.createProject)(tree, options);
-        yield (0, lib_1.createFiles)(tree, options, rootOffset);
-        if (options.addTailwind) {
-            yield (0, setup_tailwind_1.setupTailwindGenerator)(tree, {
-                project: options.name,
-                skipFormat: true,
-                skipPackageJson: options.skipPackageJson,
-            });
-        }
-        yield (0, lib_1.addLinting)(tree, options);
-        yield (0, lib_1.addUnitTestRunner)(tree, options);
-        yield (0, lib_1.addE2e)(tree, options);
-        (0, lib_1.updateEditorTsConfig)(tree, options);
-        if (options.rootProject) {
-            const nxJson = (0, devkit_1.readNxJson)(tree);
-            nxJson.defaultProject = options.name;
-            (0, devkit_1.updateNxJson)(tree, nxJson);
-        }
-        if (options.backendProject) {
-            (0, lib_1.addProxyConfig)(tree, options);
-        }
-        if (options.strict) {
-            (0, lib_1.enableStrictTypeChecking)(tree, options);
-        }
-        else {
-            (0, lib_1.setApplicationStrictDefault)(tree, false);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return () => {
-            (0, devkit_1.installPackagesTask)(tree);
-        };
+    }
+    if ((0, semver_1.gte)(installedAngularVersionInfo.version, '14.1.0') &&
+        schema.standalone === undefined &&
+        process.env.NX_INTERACTIVE === 'true') {
+        schema.standalone = await (0, enquirer_1.prompt)({
+            name: 'standalone-components',
+            message: 'Would you like to use Standalone Components?',
+            type: 'confirm',
+        }).then((a) => a['standalone-components']);
+    }
+    const options = await (0, lib_1.normalizeOptions)(tree, schema);
+    const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
+    await (0, init_1.angularInitGenerator)(tree, {
+        ...options,
+        skipFormat: true,
     });
+    (0, lib_1.createProject)(tree, options);
+    await (0, lib_1.createFiles)(tree, options, rootOffset);
+    if (options.addTailwind) {
+        await (0, setup_tailwind_1.setupTailwindGenerator)(tree, {
+            project: options.name,
+            skipFormat: true,
+            skipPackageJson: options.skipPackageJson,
+        });
+    }
+    await (0, lib_1.addLinting)(tree, options);
+    await (0, lib_1.addUnitTestRunner)(tree, options);
+    await (0, lib_1.addE2e)(tree, options);
+    (0, lib_1.updateEditorTsConfig)(tree, options);
+    if (options.rootProject) {
+        const nxJson = (0, devkit_1.readNxJson)(tree);
+        nxJson.defaultProject = options.name;
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+    if (options.backendProject) {
+        (0, lib_1.addProxyConfig)(tree, options);
+    }
+    if (options.strict) {
+        (0, lib_1.enableStrictTypeChecking)(tree, options);
+    }
+    else {
+        (0, lib_1.setApplicationStrictDefault)(tree, false);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return () => {
+        (0, devkit_1.installPackagesTask)(tree);
+    };
 }
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 exports.default = applicationGenerator;

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

@@ -1,49 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 const cypress_1 = require("@nx/cypress");
-function addE2e(tree, options) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (options.e2eTestRunner === 'cypress') {
-            // TODO: This can call `@nx/web:static-config` generator when ready
-            addFileServerTarget(tree, options, 'serve-static');
-            yield (0, cypress_1.cypressProjectGenerator)(tree, {
-                name: options.e2eProjectName,
-                directory: options.e2eProjectRoot,
-                // the name and root are already normalized, instruct the generator to use them as is
-                projectNameAndRootFormat: 'as-provided',
-                project: options.name,
-                linter: options.linter,
-                standaloneConfig: options.standaloneConfig,
-                skipPackageJson: options.skipPackageJson,
-                skipFormat: true,
-            });
-        }
-        else if (options.e2eTestRunner === 'playwright') {
-            const { configurationGenerator: playwrightConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
-                root: options.e2eProjectRoot,
-                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-                targets: {},
-                implicitDependencies: [options.name],
-            });
-            yield playwrightConfigurationGenerator(tree, {
-                project: options.e2eProjectName,
-                skipFormat: true,
-                skipPackageJson: options.skipPackageJson,
-                directory: 'src',
-                js: false,
-                linter: options.linter,
-                setParserOptionsProject: options.setParserOptionsProject,
-                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
-                webServerAddress: `http://localhost:${(_a = options.port) !== null && _a !== void 0 ? _a : 4200}`,
-            });
-        }
-    });
+async function addE2e(tree, options) {
+    if (options.e2eTestRunner === 'cypress') {
+        // TODO: This can call `@nx/web:static-config` generator when ready
+        addFileServerTarget(tree, options, 'serve-static');
+        await (0, cypress_1.cypressProjectGenerator)(tree, {
+            name: options.e2eProjectName,
+            directory: options.e2eProjectRoot,
+            // the name and root are already normalized, instruct the generator to use them as is
+            projectNameAndRootFormat: 'as-provided',
+            project: options.name,
+            linter: options.linter,
+            standaloneConfig: options.standaloneConfig,
+            skipPackageJson: options.skipPackageJson,
+            skipFormat: true,
+        });
+    }
+    else if (options.e2eTestRunner === 'playwright') {
+        const { configurationGenerator: playwrightConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
+        (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+            root: options.e2eProjectRoot,
+            sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+            targets: {},
+            implicitDependencies: [options.name],
+        });
+        await playwrightConfigurationGenerator(tree, {
+            project: options.e2eProjectName,
+            skipFormat: true,
+            skipPackageJson: options.skipPackageJson,
+            directory: 'src',
+            js: false,
+            linter: options.linter,
+            setParserOptionsProject: options.setParserOptionsProject,
+            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
+            webServerAddress: `http://localhost:${options.port ?? 4200}`,
+        });
+    }
 }
 exports.addE2e = addE2e;
 function addFileServerTarget(tree, options, targetName) {

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

@@ -1,23 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = void 0;
-const tslib_1 = require("tslib");
 const linter_1 = require("@nx/linter");
 const add_linting_1 = require("../../add-linting/add-linting");
-function addLinting(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (options.linter === linter_1.Linter.None) {
-            return;
-        }
-        yield (0, add_linting_1.default)(host, {
-            projectName: options.name,
-            projectRoot: options.appProjectRoot,
-            prefix: options.prefix,
-            setParserOptionsProject: options.setParserOptionsProject,
-            skipPackageJson: options.skipPackageJson,
-            unitTestRunner: options.unitTestRunner,
-            skipFormat: true,
-        });
+async function addLinting(host, options) {
+    if (options.linter === linter_1.Linter.None) {
+        return;
+    }
+    await (0, add_linting_1.default)(host, {
+        projectName: options.name,
+        projectRoot: options.appProjectRoot,
+        prefix: options.prefix,
+        setParserOptionsProject: options.setParserOptionsProject,
+        skipPackageJson: options.skipPackageJson,
+        unitTestRunner: options.unitTestRunner,
+        skipFormat: true,
     });
 }
 exports.addLinting = addLinting;

package/src/generators/application/lib/add-proxy-config.js

@@ -15,7 +15,10 @@ function addProxyConfig(host, options) {
                 secure: false,
             },
         }));
-        projectConfig.targets.serve.options = Object.assign(Object.assign({}, projectConfig.targets.serve.options), { proxyConfig: pathToProxyFile });
+        projectConfig.targets.serve.options = {
+            ...projectConfig.targets.serve.options,
+            proxyConfig: pathToProxyFile,
+        };
         (0, devkit_1.updateProjectConfiguration)(host, options.name, projectConfig);
     }
 }

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

@@ -1,25 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addUnitTestRunner = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const jest_1 = require("@nx/jest");
 const test_runners_1 = require("../../../utils/test-runners");
-function addUnitTestRunner(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (options.unitTestRunner === test_runners_1.UnitTestRunner.Jest) {
-            yield (0, jest_1.configurationGenerator)(host, {
-                project: options.name,
-                setupFile: 'angular',
-                supportTsx: false,
-                skipSerializers: false,
-                skipPackageJson: options.skipPackageJson,
-                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
+async function addUnitTestRunner(host, options) {
+    if (options.unitTestRunner === test_runners_1.UnitTestRunner.Jest) {
+        await (0, jest_1.configurationGenerator)(host, {
+            project: options.name,
+            setupFile: 'angular',
+            supportTsx: false,
+            skipSerializers: false,
+            skipPackageJson: options.skipPackageJson,
+            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,
@@ -27,8 +25,7 @@ globalThis.ngJest = {
   },
 };
 ${contents}`);
-            }
         }
-    });
+    }
 }
 exports.addUnitTestRunner = addUnitTestRunner;

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

@@ -1,57 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 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");
-function createFiles(tree, options, rootOffset) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const installedAngularInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-        const substitutions = {
-            rootSelector: `${options.prefix}-root`,
-            appName: options.name,
-            inlineStyle: options.inlineStyle,
-            inlineTemplate: options.inlineTemplate,
-            style: options.style,
-            viewEncapsulation: options.viewEncapsulation,
-            unitTesting: options.unitTestRunner !== test_runners_1.UnitTestRunner.None,
-            routing: options.routing,
-            minimal: options.minimal,
-            nxWelcomeSelector: `${options.prefix}-nx-welcome`,
-            rootTsConfig: (0, devkit_1.joinPathFragments)(rootOffset, (0, js_1.getRootTsConfigFileName)(tree)),
-            installedAngularInfo,
-            rootOffset,
-            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 {
-            yield (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/ng-module'), options.appProjectRoot, substitutions);
-        }
-        (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'));
-        }
-        if (options.skipTests || options.unitTestRunner === test_runners_1.UnitTestRunner.None) {
-            tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, '/src/app/app.component.spec.ts'));
-        }
-        if (options.inlineTemplate) {
-            tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, '/src/app/app.component.html'));
-        }
-        if (options.inlineStyle) {
-            tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, `/src/app/app.component.${options.style}`));
-        }
-        if (options.minimal) {
-            tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/app/nx-welcome.component.ts'));
-        }
-    });
+async function createFiles(tree, options, rootOffset) {
+    const installedAngularInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const substitutions = {
+        rootSelector: `${options.prefix}-root`,
+        appName: options.name,
+        inlineStyle: options.inlineStyle,
+        inlineTemplate: options.inlineTemplate,
+        style: options.style,
+        viewEncapsulation: options.viewEncapsulation,
+        unitTesting: options.unitTestRunner !== test_runners_1.UnitTestRunner.None,
+        routing: options.routing,
+        minimal: options.minimal,
+        nxWelcomeSelector: `${options.prefix}-nx-welcome`,
+        rootTsConfig: (0, devkit_1.joinPathFragments)(rootOffset, (0, js_1.getRootTsConfigFileName)(tree)),
+        installedAngularInfo,
+        rootOffset,
+        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 {
+        await (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/ng-module'), options.appProjectRoot, substitutions);
+    }
+    (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'));
+    }
+    if (options.skipTests || options.unitTestRunner === test_runners_1.UnitTestRunner.None) {
+        tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, '/src/app/app.component.spec.ts'));
+    }
+    if (options.inlineTemplate) {
+        tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, '/src/app/app.component.html'));
+    }
+    if (options.inlineStyle) {
+        tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, `/src/app/app.component.${options.style}`));
+    }
+    if (options.minimal) {
+        tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/app/nx-welcome.component.ts'));
+    }
 }
 exports.createFiles = createFiles;

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

@@ -15,7 +15,7 @@ function enableStrictTypeChecking(host, options) {
     const appTsConfigPath = `${options.appProjectRoot}/tsconfig.json`;
     if (host.exists(appTsConfigPath)) {
         (0, devkit_1.updateJson)(host, appTsConfigPath, (json) => {
-            json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), compilerOptions);
+            json.compilerOptions = { ...json.compilerOptions, ...compilerOptions };
             json.angularCompilerOptions = {
                 enableI18nLegacyMessageIdFormat: false,
                 strictInjectionParameters: true,
@@ -28,7 +28,7 @@ function enableStrictTypeChecking(host, options) {
     const e2eTsConfigPath = `${options.e2eProjectRoot}/tsconfig.json`;
     if (host.exists(e2eTsConfigPath)) {
         (0, devkit_1.updateJson)(host, e2eTsConfigPath, (json) => {
-            json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), compilerOptions);
+            json.compilerOptions = { ...json.compilerOptions, ...compilerOptions };
             return json;
         });
     }

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

@@ -1,36 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const tslib_1 = require("tslib");
 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 linter_1 = require("@nx/linter");
 const test_runners_1 = require("../../../utils/test-runners");
 const project_1 = require("../../utils/project");
-function normalizeOptions(host, options) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = yield (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 e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
-        const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
-        const parsedTags = options.tags
-            ? options.tags.split(',').map((s) => s.trim())
-            : [];
-        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 Object.assign(Object.assign({ style: 'css', routing: false, 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.Cypress, linter: linter_1.Linter.EsLint, strict: true, bundler: (_a = options.bundler) !== null && _a !== void 0 ? _a : 'webpack' }, options), { prefix, name: appProjectName, appProjectRoot,
-            e2eProjectRoot,
-            e2eProjectName,
-            parsedTags });
+async function normalizeOptions(host, options) {
+    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = 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 e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
+    const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
+    const parsedTags = options.tags
+        ? options.tags.split(',').map((s) => s.trim())
+        : [];
+    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: false,
+        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.Cypress,
+        linter: linter_1.Linter.EsLint,
+        strict: true,
+        bundler: options.bundler ?? 'webpack',
+        ...options,
+        prefix,
+        name: appProjectName,
+        appProjectRoot,
+        e2eProjectRoot,
+        e2eProjectName,
+        parsedTags,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/application/lib/set-app-strict-default.js

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setApplicationStrictDefault = void 0;
 const devkit_1 = require("@nx/devkit");
 function setApplicationStrictDefault(host, strict) {
-    var _a;
     const nxJson = (0, devkit_1.readNxJson)(host);
     nxJson.generators = nxJson.generators || {};
     nxJson.generators['@nx/angular:application'] =
         nxJson.generators['@nx/angular:application'] || {};
     nxJson.generators['@nx/angular:application'].strict =
-        (_a = nxJson.generators['@nx/angular:application'].strict) !== null && _a !== void 0 ? _a : strict;
+        nxJson.generators['@nx/angular:application'].strict ?? strict;
     (0, devkit_1.updateNxJson)(host, nxJson);
 }
 exports.setApplicationStrictDefault = setApplicationStrictDefault;

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

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateEditorTsConfig = void 0;
 const devkit_1 = require("@nx/devkit");
 function getCompilerOptionsTypes(tsConfig) {
-    var _a, _b;
-    return (_b = (_a = tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.compilerOptions) === null || _a === void 0 ? void 0 : _a.types) !== null && _b !== void 0 ? _b : [];
+    return tsConfig?.compilerOptions?.types ?? [];
 }
 function updateEditorTsConfig(tree, options) {
     const types = getCompilerOptionsTypes((0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json')));