@nx/react 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.applicationSchematic = exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
-const tslib_1 = require("tslib");
 const lint_1 = require("../../utils/lint");
 const create_application_files_1 = require("./lib/create-application-files");
 const update_jest_config_1 = require("./lib/update-jest-config");
@@ -23,129 +22,131 @@ const chalk = require("chalk");
 const show_possible_warnings_1 = require("./lib/show-possible-warnings");
 const add_e2e_1 = require("./lib/add-e2e");
 const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
-function addLinting(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        if (options.linter === linter_1.Linter.EsLint) {
-            const lintTask = yield (0, linter_1.lintProjectGenerator)(host, {
-                linter: options.linter,
-                project: options.projectName,
-                tsConfigPaths: [
-                    (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-                ],
-                unitTestRunner: options.unitTestRunner,
-                eslintFilePatterns: [
-                    (0, lint_project_1.mapLintPattern)(options.appProjectRoot, '{ts,tsx,js,jsx}', options.rootProject),
-                ],
-                skipFormat: true,
-                rootProject: options.rootProject,
-                skipPackageJson: options.skipPackageJson,
-            });
-            tasks.push(lintTask);
-            if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
-                (0, eslint_file_1.addExtendsToLintConfig)(host, options.appProjectRoot, 'plugin:@nx/react');
-            }
-            if (!options.skipPackageJson) {
-                const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
-                const addSwcTask = (0, add_swc_dependencies_1.addSwcDependencies)(host);
-                tasks.push(installTask, addSwcTask);
-            }
+async function addLinting(host, options) {
+    const tasks = [];
+    if (options.linter === linter_1.Linter.EsLint) {
+        const lintTask = await (0, linter_1.lintProjectGenerator)(host, {
+            linter: options.linter,
+            project: options.projectName,
+            tsConfigPaths: [
+                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
+            ],
+            unitTestRunner: options.unitTestRunner,
+            eslintFilePatterns: [
+                (0, lint_project_1.mapLintPattern)(options.appProjectRoot, '{ts,tsx,js,jsx}', options.rootProject),
+            ],
+            skipFormat: true,
+            rootProject: options.rootProject,
+            skipPackageJson: options.skipPackageJson,
+        });
+        tasks.push(lintTask);
+        if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
+            (0, eslint_file_1.addExtendsToLintConfig)(host, options.appProjectRoot, 'plugin:@nx/react');
         }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+        if (!options.skipPackageJson) {
+            const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
+            const addSwcTask = (0, add_swc_dependencies_1.addSwcDependencies)(host);
+            tasks.push(installTask, addSwcTask);
+        }
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-function applicationGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield applicationGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function applicationGenerator(host, schema) {
+    return await applicationGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.applicationGenerator = applicationGenerator;
-function applicationGeneratorInternal(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const options = yield (0, normalize_options_1.normalizeOptions)(host, schema);
-        (0, show_possible_warnings_1.showPossibleWarnings)(host, options);
-        const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true, skipHelperLibs: options.bundler === 'vite' }));
-        tasks.push(initTask);
-        if (!options.rootProject) {
-            (0, create_ts_config_1.extractTsConfigBase)(host);
-        }
-        (0, create_application_files_1.createApplicationFiles)(host, options);
-        (0, add_project_1.addProject)(host, options);
-        if (options.bundler === 'vite') {
-            const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-            // We recommend users use `import.meta.env.MODE` and other variables in their code to differentiate between production and development.
-            // See: https://vitejs.dev/guide/env-and-mode.html
-            if (host.exists((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/environments'))) {
-                host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/environments'));
-            }
-            const viteTask = yield viteConfigurationGenerator(host, {
-                uiFramework: 'react',
-                project: options.projectName,
-                newProject: true,
-                includeVitest: options.unitTestRunner === 'vitest',
-                inSourceTests: options.inSourceTests,
-                compiler: options.compiler,
-                skipFormat: true,
-            });
-            tasks.push(viteTask);
-        }
-        else if (options.bundler === 'webpack') {
-            const { webpackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
-            const webpackInitTask = yield webpackInitGenerator(host, {
-                uiFramework: 'react',
-                skipFormat: true,
-            });
-            tasks.push(webpackInitTask);
-        }
-        else if (options.bundler === 'rspack') {
-            const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxRspackVersion);
-            const rspackTask = yield configurationGenerator(host, {
-                project: options.projectName,
-                main: (0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, add_project_1.maybeJs)(options, `src/main.tsx`)),
-                tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-                target: 'web',
-                newProject: true,
-                uiFramework: 'react',
-            });
-            tasks.push(rspackTask);
-        }
-        if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
-            const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-            const vitestTask = yield vitestGenerator(host, {
-                uiFramework: 'react',
-                coverageProvider: 'c8',
-                project: options.projectName,
-                inSourceTests: options.inSourceTests,
-                skipFormat: true,
-            });
-            tasks.push(vitestTask);
-        }
-        if ((options.bundler === 'vite' || options.unitTestRunner === 'vitest') &&
-            options.inSourceTests) {
-            host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/app/${options.fileName}.spec.tsx`));
-        }
-        const lintTask = yield addLinting(host, options);
-        tasks.push(lintTask);
-        const e2eTask = yield (0, add_e2e_1.addE2e)(host, options);
-        tasks.push(e2eTask);
-        if (options.unitTestRunner === 'jest') {
-            const jestTask = yield (0, add_jest_1.addJest)(host, options);
-            tasks.push(jestTask);
+async function applicationGeneratorInternal(host, schema) {
+    const tasks = [];
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    (0, show_possible_warnings_1.showPossibleWarnings)(host, options);
+    const initTask = await (0, init_1.default)(host, {
+        ...options,
+        skipFormat: true,
+        skipHelperLibs: options.bundler === 'vite',
+    });
+    tasks.push(initTask);
+    if (!options.rootProject) {
+        (0, create_ts_config_1.extractTsConfigBase)(host);
+    }
+    (0, create_application_files_1.createApplicationFiles)(host, options);
+    (0, add_project_1.addProject)(host, options);
+    if (options.bundler === 'vite') {
+        const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+        // We recommend users use `import.meta.env.MODE` and other variables in their code to differentiate between production and development.
+        // See: https://vitejs.dev/guide/env-and-mode.html
+        if (host.exists((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/environments'))) {
+            host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/environments'));
         }
-        // Handle tsconfig.spec.json for jest or vitest
-        (0, update_jest_config_1.updateSpecConfig)(host, options);
-        const stylePreprocessorTask = (0, install_common_dependencies_1.installCommonDependencies)(host, options);
-        tasks.push(stylePreprocessorTask);
-        const styledTask = (0, add_styled_dependencies_1.addStyledModuleDependencies)(host, options);
-        tasks.push(styledTask);
-        const routingTask = (0, add_routing_1.addRouting)(host, options);
-        tasks.push(routingTask);
-        (0, set_defaults_1.setDefaults)(host, options);
-        if (options.bundler === 'rspack' && options.style === 'styled-jsx') {
-            devkit_1.logger.warn(`${chalk.bold('styled-jsx')} is not supported by ${chalk.bold('Rspack')}. We've added ${chalk.bold('babel-loader')} to your project, but using babel will slow down your build.`);
-            tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, { 'babel-loader': versions_1.babelLoaderVersion }));
-            host.write((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'rspack.config.js'), (0, devkit_1.stripIndents) `
+        const viteTask = await viteConfigurationGenerator(host, {
+            uiFramework: 'react',
+            project: options.projectName,
+            newProject: true,
+            includeVitest: options.unitTestRunner === 'vitest',
+            inSourceTests: options.inSourceTests,
+            compiler: options.compiler,
+            skipFormat: true,
+        });
+        tasks.push(viteTask);
+    }
+    else if (options.bundler === 'webpack') {
+        const { webpackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
+        const webpackInitTask = await webpackInitGenerator(host, {
+            uiFramework: 'react',
+            skipFormat: true,
+        });
+        tasks.push(webpackInitTask);
+    }
+    else if (options.bundler === 'rspack') {
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxRspackVersion);
+        const rspackTask = await configurationGenerator(host, {
+            project: options.projectName,
+            main: (0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, add_project_1.maybeJs)(options, `src/main.tsx`)),
+            tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
+            target: 'web',
+            newProject: true,
+            uiFramework: 'react',
+        });
+        tasks.push(rspackTask);
+    }
+    if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
+        const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+        const vitestTask = await vitestGenerator(host, {
+            uiFramework: 'react',
+            coverageProvider: 'c8',
+            project: options.projectName,
+            inSourceTests: options.inSourceTests,
+            skipFormat: true,
+        });
+        tasks.push(vitestTask);
+    }
+    if ((options.bundler === 'vite' || options.unitTestRunner === 'vitest') &&
+        options.inSourceTests) {
+        host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/app/${options.fileName}.spec.tsx`));
+    }
+    const lintTask = await addLinting(host, options);
+    tasks.push(lintTask);
+    const e2eTask = await (0, add_e2e_1.addE2e)(host, options);
+    tasks.push(e2eTask);
+    if (options.unitTestRunner === 'jest') {
+        const jestTask = await (0, add_jest_1.addJest)(host, options);
+        tasks.push(jestTask);
+    }
+    // Handle tsconfig.spec.json for jest or vitest
+    (0, update_jest_config_1.updateSpecConfig)(host, options);
+    const stylePreprocessorTask = (0, install_common_dependencies_1.installCommonDependencies)(host, options);
+    tasks.push(stylePreprocessorTask);
+    const styledTask = (0, add_styled_dependencies_1.addStyledModuleDependencies)(host, options);
+    tasks.push(styledTask);
+    const routingTask = (0, add_routing_1.addRouting)(host, options);
+    tasks.push(routingTask);
+    (0, set_defaults_1.setDefaults)(host, options);
+    if (options.bundler === 'rspack' && options.style === 'styled-jsx') {
+        devkit_1.logger.warn(`${chalk.bold('styled-jsx')} is not supported by ${chalk.bold('Rspack')}. We've added ${chalk.bold('babel-loader')} to your project, but using babel will slow down your build.`);
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, { 'babel-loader': versions_1.babelLoaderVersion }));
+        host.write((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'rspack.config.js'), (0, devkit_1.stripIndents) `
         const { composePlugins, withNx, withWeb } = require('@nx/rspack');
         module.exports = composePlugins(withNx(), withWeb(), (config) => {
           config.module.rules.push({
@@ -163,12 +164,11 @@ function applicationGeneratorInternal(host, schema) {
           return config;
         });
         `);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 exports.default = applicationGenerator;

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

@@ -1,45 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const web_1 = require("@nx/web");
 const versions_1 = require("../../../utils/versions");
-function addE2e(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        switch (options.e2eTestRunner) {
-            case 'cypress':
-                (0, web_1.webStaticServeGenerator)(tree, {
-                    buildTarget: `${options.projectName}:build`,
-                    targetName: 'serve-static',
-                });
-                const { cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-                return yield cypressProjectGenerator(tree, Object.assign(Object.assign({}, options), { 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.projectName, bundler: options.bundler === 'rspack' ? 'webpack' : options.bundler, skipFormat: true }));
-            case 'playwright':
-                const { configurationGenerator } = (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.projectName],
-                });
-                return configurationGenerator(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:4200',
-                });
-            case 'none':
-            default:
-                return () => { };
-        }
-    });
+async function addE2e(tree, options) {
+    switch (options.e2eTestRunner) {
+        case 'cypress':
+            (0, web_1.webStaticServeGenerator)(tree, {
+                buildTarget: `${options.projectName}:build`,
+                targetName: 'serve-static',
+            });
+            const { cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+            return await cypressProjectGenerator(tree, {
+                ...options,
+                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.projectName,
+                bundler: options.bundler === 'rspack' ? 'webpack' : options.bundler,
+                skipFormat: true,
+            });
+        case 'playwright':
+            const { configurationGenerator } = (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.projectName],
+            });
+            return configurationGenerator(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:4200',
+            });
+        case 'none':
+        default:
+            return () => { };
+    }
 }
 exports.addE2e = addE2e;

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

@@ -1,16 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJest = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-function addJest(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
-        if (options.unitTestRunner !== 'jest') {
-            return () => { };
-        }
-        return yield configurationGenerator(host, Object.assign(Object.assign({}, options), { project: options.projectName, supportTsx: true, skipSerializers: true, setupFile: 'none', compiler: options.compiler, skipFormat: true }));
+async function addJest(host, options) {
+    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
+    if (options.unitTestRunner !== 'jest') {
+        return () => { };
+    }
+    return await configurationGenerator(host, {
+        ...options,
+        project: options.projectName,
+        supportTsx: true,
+        skipSerializers: true,
+        setupFile: 'none',
+        compiler: options.compiler,
+        skipFormat: true,
     });
 }
 exports.addJest = addJest;

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

@@ -16,7 +16,9 @@ function addProject(host, options) {
             serve: createServeTarget(options),
         };
     }
-    (0, devkit_1.addProjectConfiguration)(host, options.projectName, Object.assign({}, project));
+    (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
+        ...project,
+    });
 }
 exports.addProject = addProject;
 function maybeJs(options, path) {
@@ -26,13 +28,12 @@ function maybeJs(options, path) {
 }
 exports.maybeJs = maybeJs;
 function createBuildTarget(options) {
-    var _a;
     return {
         executor: '@nx/webpack:webpack',
         outputs: ['{options.outputPath}'],
         defaultConfiguration: 'production',
         options: {
-            compiler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'babel',
+            compiler: options.compiler ?? 'babel',
             outputPath: (0, devkit_1.joinPathFragments)('dist', options.appProjectRoot != '.'
                 ? options.appProjectRoot
                 : options.projectName),

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

@@ -26,7 +26,14 @@ function createApplicationFiles(host, options) {
     }
     const relativePathToRootTsConfig = (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot);
     const appTests = (0, get_app_tests_1.getAppTests)(options);
-    const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot), appTests, inSourceVitestTests: (0, get_in_source_vitest_tests_template_1.getInSourceVitestTestsTemplate)(appTests) });
+    const templateVariables = {
+        ...(0, devkit_1.names)(options.name),
+        ...options,
+        tmpl: '',
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
+        appTests,
+        inSourceVitestTests: (0, get_in_source_vitest_tests_template_1.getInSourceVitestTestsTemplate)(appTests),
+    };
     if (options.bundler === 'vite') {
         (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/base-vite'), options.appProjectRoot, templateVariables);
     }

package/src/generators/application/lib/find-free-port.js

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findFreePort = void 0;
 const devkit_1 = require("@nx/devkit");
 function findFreePort(host) {
-    var _a, _b, _c;
     const projects = (0, devkit_1.getProjects)(host);
     let port = -Infinity;
     for (const [, p] of projects.entries()) {
-        const curr = (_c = (_b = (_a = p.targets) === null || _a === void 0 ? void 0 : _a.serve) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.port;
+        const curr = p.targets?.serve?.options?.port;
         if (typeof curr === 'number') {
             port = Math.max(port, curr);
         }

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

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = exports.normalizeProjectName = exports.normalizeDirectory = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const assertion_1 = require("../../../utils/assertion");
 const find_free_port_1 = require("./find-free-port");
 function normalizeDirectory(options) {
-    var _a;
-    options.directory = (_a = options.directory) === null || _a === void 0 ? void 0 : _a.replace(/\\{1,2}/g, '/');
+    options.directory = options.directory?.replace(/\\{1,2}/g, '/');
     const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
     return projectDirectory
         ? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
@@ -19,50 +17,54 @@ function normalizeProjectName(options) {
     return normalizeDirectory(options).replace(new RegExp('/', 'g'), '-');
 }
 exports.normalizeProjectName = normalizeProjectName;
-function normalizeOptions(host, options, callingGenerator = '@nx/react:application') {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-    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,
-        });
-        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 fileName = options.pascalCaseFiles ? 'App' : 'app';
-        const styledModule = /^(css|scss|less|styl|none)$/.test(options.style)
-            ? null
-            : options.style;
-        (0, assertion_1.assertValidStyle)(options.style);
-        if (options.bundler === 'vite') {
-            options.unitTestRunner = 'vitest';
-        }
-        const normalized = Object.assign(Object.assign({}, options), { name: (0, devkit_1.names)(options.name).fileName, projectName: appProjectName, appProjectRoot,
-            e2eProjectName,
-            e2eProjectRoot,
-            parsedTags,
-            fileName,
-            styledModule, hasStyles: options.style !== 'none' });
-        normalized.routing = (_a = normalized.routing) !== null && _a !== void 0 ? _a : false;
-        normalized.strict = (_b = normalized.strict) !== null && _b !== void 0 ? _b : true;
-        normalized.classComponent = (_c = normalized.classComponent) !== null && _c !== void 0 ? _c : false;
-        normalized.compiler = (_d = normalized.compiler) !== null && _d !== void 0 ? _d : 'babel';
-        normalized.bundler = (_e = normalized.bundler) !== null && _e !== void 0 ? _e : 'webpack';
-        normalized.unitTestRunner =
-            (_f = normalized.unitTestRunner) !== null && _f !== void 0 ? _f : (normalized.bundler === 'vite' ? 'vitest' : 'jest');
-        normalized.e2eTestRunner = (_g = normalized.e2eTestRunner) !== null && _g !== void 0 ? _g : 'cypress';
-        normalized.inSourceTests = normalized.minimal || normalized.inSourceTests;
-        (_h = normalized.devServerPort) !== null && _h !== void 0 ? _h : (normalized.devServerPort = (0, find_free_port_1.findFreePort)(host));
-        normalized.minimal = (_j = normalized.minimal) !== null && _j !== void 0 ? _j : false;
-        return normalized;
+async function normalizeOptions(host, options, callingGenerator = '@nx/react:application') {
+    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,
     });
+    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 fileName = options.pascalCaseFiles ? 'App' : 'app';
+    const styledModule = /^(css|scss|less|styl|none)$/.test(options.style)
+        ? null
+        : options.style;
+    (0, assertion_1.assertValidStyle)(options.style);
+    if (options.bundler === 'vite') {
+        options.unitTestRunner = 'vitest';
+    }
+    const normalized = {
+        ...options,
+        name: (0, devkit_1.names)(options.name).fileName,
+        projectName: appProjectName,
+        appProjectRoot,
+        e2eProjectName,
+        e2eProjectRoot,
+        parsedTags,
+        fileName,
+        styledModule,
+        hasStyles: options.style !== 'none',
+    };
+    normalized.routing = normalized.routing ?? false;
+    normalized.strict = normalized.strict ?? true;
+    normalized.classComponent = normalized.classComponent ?? false;
+    normalized.compiler = normalized.compiler ?? 'babel';
+    normalized.bundler = normalized.bundler ?? 'webpack';
+    normalized.unitTestRunner =
+        normalized.unitTestRunner ??
+            (normalized.bundler === 'vite' ? 'vitest' : 'jest');
+    normalized.e2eTestRunner = normalized.e2eTestRunner ?? 'cypress';
+    normalized.inSourceTests = normalized.minimal || normalized.inSourceTests;
+    normalized.devServerPort ??= (0, find_free_port_1.findFreePort)(host);
+    normalized.minimal = normalized.minimal ?? false;
+    return normalized;
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/application/lib/set-defaults.js

@@ -12,11 +12,31 @@ function setDefaults(host, options) {
     }
     nxJson.generators = nxJson.generators || {};
     nxJson.generators['@nx/react'] = nxJson.generators['@nx/react'] || {};
-    const prev = Object.assign({}, nxJson.generators['@nx/react']);
-    const appDefaults = Object.assign({ style: options.style, linter: options.linter, bundler: options.bundler }, prev.application);
-    const componentDefaults = Object.assign({ style: options.style }, prev.component);
-    const libDefaults = Object.assign({ style: options.style, linter: options.linter }, prev.library);
-    nxJson.generators = Object.assign(Object.assign({}, nxJson.generators), { '@nx/react': Object.assign(Object.assign({}, prev), { application: appDefaults, component: componentDefaults, library: libDefaults }) });
+    const prev = { ...nxJson.generators['@nx/react'] };
+    const appDefaults = {
+        style: options.style,
+        linter: options.linter,
+        bundler: options.bundler,
+        ...prev.application,
+    };
+    const componentDefaults = {
+        style: options.style,
+        ...prev.component,
+    };
+    const libDefaults = {
+        style: options.style,
+        linter: options.linter,
+        ...prev.library,
+    };
+    nxJson.generators = {
+        ...nxJson.generators,
+        '@nx/react': {
+            ...prev,
+            application: appDefaults,
+            component: componentDefaults,
+            library: libDefaults,
+        },
+    };
     (0, devkit_1.updateNxJson)(host, nxJson);
 }
 exports.setDefaults = setDefaults;