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

package/src/generators/host/host.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hostGeneratorInternal = exports.hostGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const update_module_federation_project_1 = require("../../rules/update-module-federation-project");
 const application_1 = require("../application/application");
@@ -12,64 +11,66 @@ const add_module_federation_files_1 = require("./lib/add-module-federation-files
 const normalize_remote_1 = require("./lib/normalize-remote");
 const setup_ssr_for_host_1 = require("./lib/setup-ssr-for-host");
 const update_module_federation_e2e_project_1 = require("./lib/update-module-federation-e2e-project");
-function hostGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return hostGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function hostGenerator(host, schema) {
+    return hostGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.hostGenerator = hostGenerator;
-function hostGeneratorInternal(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const options = yield (0, normalize_options_1.normalizeOptions)(host, schema, '@nx/react:host');
-        const initTask = yield (0, application_1.default)(host, Object.assign(Object.assign({}, options), { 
-            // The target use-case is loading remotes as child routes, thus always enable routing.
-            routing: true, 
-            // Only webpack works with module federation for now.
-            bundler: 'webpack', skipFormat: true }));
-        tasks.push(initTask);
-        const remotesWithPorts = [];
-        if (schema.remotes) {
-            let remotePort = options.devServerPort + 1;
-            for (const remote of schema.remotes) {
-                const remoteName = yield (0, normalize_remote_1.normalizeRemoteName)(host, remote, options);
-                remotesWithPorts.push({ name: remoteName, port: remotePort });
-                yield (0, remote_1.default)(host, {
-                    name: remote,
-                    directory: (0, normalize_remote_1.normalizeRemoteDirectory)(remote, options),
-                    style: options.style,
-                    unitTestRunner: options.unitTestRunner,
-                    e2eTestRunner: options.e2eTestRunner,
-                    linter: options.linter,
-                    devServerPort: remotePort,
-                    ssr: options.ssr,
-                    skipFormat: true,
-                    projectNameAndRootFormat: options.projectNameAndRootFormat,
-                });
-                remotePort++;
-            }
-        }
-        (0, add_module_federation_files_1.addModuleFederationFiles)(host, options, remotesWithPorts);
-        (0, update_module_federation_project_1.updateModuleFederationProject)(host, options);
-        (0, update_module_federation_e2e_project_1.updateModuleFederationE2eProject)(host, options);
-        if (options.ssr) {
-            const setupSsrTask = yield (0, setup_ssr_1.default)(host, {
-                project: options.projectName,
-                serverPort: options.devServerPort,
+async function hostGeneratorInternal(host, schema) {
+    const tasks = [];
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema, '@nx/react:host');
+    const initTask = await (0, application_1.default)(host, {
+        ...options,
+        // The target use-case is loading remotes as child routes, thus always enable routing.
+        routing: true,
+        // Only webpack works with module federation for now.
+        bundler: 'webpack',
+        skipFormat: true,
+    });
+    tasks.push(initTask);
+    const remotesWithPorts = [];
+    if (schema.remotes) {
+        let remotePort = options.devServerPort + 1;
+        for (const remote of schema.remotes) {
+            const remoteName = await (0, normalize_remote_1.normalizeRemoteName)(host, remote, options);
+            remotesWithPorts.push({ name: remoteName, port: remotePort });
+            await (0, remote_1.default)(host, {
+                name: remote,
+                directory: (0, normalize_remote_1.normalizeRemoteDirectory)(remote, options),
+                style: options.style,
+                unitTestRunner: options.unitTestRunner,
+                e2eTestRunner: options.e2eTestRunner,
+                linter: options.linter,
+                devServerPort: remotePort,
+                ssr: options.ssr,
                 skipFormat: true,
+                projectNameAndRootFormat: options.projectNameAndRootFormat,
             });
-            tasks.push(setupSsrTask);
-            const setupSsrForHostTask = yield (0, setup_ssr_for_host_1.setupSsrForHost)(host, options, options.projectName, remotesWithPorts);
-            tasks.push(setupSsrForHostTask);
-            const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-            projectConfig.targets.server.options.webpackConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, 'webpack.server.config.js');
-            (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
+            remotePort++;
         }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+    }
+    (0, add_module_federation_files_1.addModuleFederationFiles)(host, options, remotesWithPorts);
+    (0, update_module_federation_project_1.updateModuleFederationProject)(host, options);
+    (0, update_module_federation_e2e_project_1.updateModuleFederationE2eProject)(host, options);
+    if (options.ssr) {
+        const setupSsrTask = await (0, setup_ssr_1.default)(host, {
+            project: options.projectName,
+            serverPort: options.devServerPort,
+            skipFormat: true,
+        });
+        tasks.push(setupSsrTask);
+        const setupSsrForHostTask = await (0, setup_ssr_for_host_1.setupSsrForHost)(host, options, options.projectName, remotesWithPorts);
+        tasks.push(setupSsrForHostTask);
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
+        projectConfig.targets.server.options.webpackConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, 'webpack.server.config.js');
+        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.hostGeneratorInternal = hostGeneratorInternal;
 exports.default = hostGenerator;

package/src/generators/host/lib/add-module-federation-files.js

@@ -4,9 +4,17 @@ exports.addModuleFederationFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 function addModuleFederationFiles(host, options, defaultRemoteManifest) {
-    const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { tmpl: '', remotes: defaultRemoteManifest.map(({ name, port }) => {
-            return Object.assign(Object.assign({}, (0, devkit_1.names)(name)), { port });
-        }) });
+    const templateVariables = {
+        ...(0, devkit_1.names)(options.name),
+        ...options,
+        tmpl: '',
+        remotes: defaultRemoteManifest.map(({ name, port }) => {
+            return {
+                ...(0, devkit_1.names)(name),
+                port,
+            };
+        }),
+    };
     // Module federation requires bootstrap code to be dynamically imported.
     // Renaming original entry file so we can use `import(./bootstrap)` in
     // new entry file.

package/src/generators/host/lib/normalize-remote.js

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeRemoteDirectory = exports.normalizeRemoteName = 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");
-function normalizeRemoteName(tree, remote, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectName: remoteName } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
-            name: remote,
-            projectType: 'application',
-            directory: options.directory,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
-            callingGenerator: '@nx/react:host',
-        });
-        return remoteName;
+async function normalizeRemoteName(tree, remote, options) {
+    const { projectName: remoteName } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+        name: remote,
+        projectType: 'application',
+        directory: options.directory,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        callingGenerator: '@nx/react:host',
     });
+    return remoteName;
 }
 exports.normalizeRemoteName = normalizeRemoteName;
 function normalizeRemoteDirectory(remote, options) {

package/src/generators/host/lib/setup-ssr-for-host.js

@@ -1,23 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsrForHost = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-function setupSsrForHost(tree, options, appName, defaultRemoteManifest) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
-        project.targets.serve.executor = '@nx/react:module-federation-ssr-dev-server';
-        (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/module-federation-ssr'), project.root, Object.assign(Object.assign({}, options), { remotes: defaultRemoteManifest.map(({ name, port }) => {
-                return Object.assign(Object.assign({}, (0, devkit_1.names)(name)), { port });
-            }), appName, tmpl: '', browserBuildOutputPath: project.targets.build.options.outputPath }));
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            '@module-federation/node': versions_1.moduleFederationNodeVersion,
-        }, {});
-        tasks.push(installTask);
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function setupSsrForHost(tree, options, appName, defaultRemoteManifest) {
+    const tasks = [];
+    let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
+    project.targets.serve.executor = '@nx/react:module-federation-ssr-dev-server';
+    (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/module-federation-ssr'), project.root, {
+        ...options,
+        remotes: defaultRemoteManifest.map(({ name, port }) => {
+            return {
+                ...(0, devkit_1.names)(name),
+                port,
+            };
+        }),
+        appName,
+        tmpl: '',
+        browserBuildOutputPath: project.targets.build.options.outputPath,
     });
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
+        '@module-federation/node': versions_1.moduleFederationNodeVersion,
+    }, {});
+    tasks.push(installTask);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.setupSsrForHost = setupSsrForHost;

package/src/generators/host/lib/update-module-federation-e2e-project.js

@@ -5,10 +5,13 @@ const devkit_1 = require("@nx/devkit");
 function updateModuleFederationE2eProject(host, options) {
     try {
         let projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.e2eProjectName);
-        projectConfig.targets.e2e.options = Object.assign(Object.assign({}, projectConfig.targets.e2e.options), { baseUrl: `http://localhost:${options.devServerPort}` });
+        projectConfig.targets.e2e.options = {
+            ...projectConfig.targets.e2e.options,
+            baseUrl: `http://localhost:${options.devServerPort}`,
+        };
         (0, devkit_1.updateProjectConfiguration)(host, options.e2eProjectName, projectConfig);
     }
-    catch (_a) {
+    catch {
         // nothing
     }
 }

package/src/generators/init/init.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactInitSchematic = exports.reactInitGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
@@ -9,8 +8,17 @@ function setDefault(host) {
     const workspace = (0, devkit_1.readNxJson)(host);
     workspace.generators = workspace.generators || {};
     const reactGenerators = workspace.generators['@nx/react'] || {};
-    const generators = Object.assign(Object.assign({}, workspace.generators), { '@nx/react': Object.assign(Object.assign({}, reactGenerators), { application: Object.assign(Object.assign({}, reactGenerators.application), { babel: true }) }) });
-    (0, devkit_1.updateNxJson)(host, Object.assign(Object.assign({}, workspace), { generators }));
+    const generators = {
+        ...workspace.generators,
+        '@nx/react': {
+            ...reactGenerators,
+            application: {
+                ...reactGenerators.application,
+                babel: true,
+            },
+        },
+    };
+    (0, devkit_1.updateNxJson)(host, { ...workspace, generators });
 }
 function updateDependencies(host, schema) {
     (0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/react'], []);
@@ -29,24 +37,26 @@ function updateDependencies(host, schema) {
         '@testing-library/react': versions_1.testingLibraryReactVersion,
     });
 }
-function reactInitGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const jsInitTask = yield (0, js_1.initGenerator)(host, Object.assign(Object.assign({}, schema), { tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', skipFormat: true }));
-        tasks.push(jsInitTask);
-        setDefault(host);
-        if (!schema.e2eTestRunner || schema.e2eTestRunner === 'cypress') {
-            (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            const { cypressInitGenerator } = yield Promise.resolve().then(() => require('@nx/cypress/src/generators/init/init'));
-            const cypressTask = yield cypressInitGenerator(host, {});
-            tasks.push(cypressTask);
-        }
-        if (!schema.skipPackageJson) {
-            const installTask = updateDependencies(host, schema);
-            tasks.push(installTask);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function reactInitGenerator(host, schema) {
+    const tasks = [];
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        ...schema,
+        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
+        skipFormat: true,
     });
+    tasks.push(jsInitTask);
+    setDefault(host);
+    if (!schema.e2eTestRunner || schema.e2eTestRunner === 'cypress') {
+        (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+        const { cypressInitGenerator } = await Promise.resolve().then(() => require('@nx/cypress/src/generators/init/init'));
+        const cypressTask = await cypressInitGenerator(host, {});
+        tasks.push(cypressTask);
+    }
+    if (!schema.skipPackageJson) {
+        const installTask = updateDependencies(host, schema);
+        tasks.push(installTask);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.reactInitGenerator = reactInitGenerator;
 exports.default = reactInitGenerator;

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

@@ -1,39 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = void 0;
-const tslib_1 = require("tslib");
 const linter_1 = require("@nx/linter");
 const path_1 = require("nx/src/utils/path");
 const devkit_1 = require("@nx/devkit");
 const lint_1 = require("../../../utils/lint");
 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* () {
-        if (options.linter === linter_1.Linter.EsLint) {
-            const lintTask = yield (0, linter_1.lintProjectGenerator)(host, {
-                linter: options.linter,
-                project: options.name,
-                tsConfigPaths: [
-                    (0, path_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
-                ],
-                unitTestRunner: options.unitTestRunner,
-                eslintFilePatterns: [`${options.projectRoot}/**/*.{ts,tsx,js,jsx}`],
-                skipFormat: true,
-                skipPackageJson: options.skipPackageJson,
-                setParserOptionsProject: options.setParserOptionsProject,
-            });
-            if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
-                (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, 'plugin:@nx/react');
-            }
-            let installTask = () => { };
-            if (!options.skipPackageJson) {
-                installTask = yield (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
-            }
-            return (0, devkit_1.runTasksInSerial)(lintTask, installTask);
+async function addLinting(host, options) {
+    if (options.linter === linter_1.Linter.EsLint) {
+        const lintTask = await (0, linter_1.lintProjectGenerator)(host, {
+            linter: options.linter,
+            project: options.name,
+            tsConfigPaths: [
+                (0, path_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
+            ],
+            unitTestRunner: options.unitTestRunner,
+            eslintFilePatterns: [`${options.projectRoot}/**/*.{ts,tsx,js,jsx}`],
+            skipFormat: true,
+            skipPackageJson: options.skipPackageJson,
+            setParserOptionsProject: options.setParserOptionsProject,
+        });
+        if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
+            (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, 'plugin:@nx/react');
         }
-        else {
-            return () => { };
+        let installTask = () => { };
+        if (!options.skipPackageJson) {
+            installTask = await (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
         }
-    });
+        return (0, devkit_1.runTasksInSerial)(lintTask, installTask);
+    }
+    else {
+        return () => { };
+    }
 }
 exports.addLinting = addLinting;

package/src/generators/library/lib/add-rollup-build-target.js

@@ -1,55 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRollupBuildTarget = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const maybe_js_1 = require("./maybe-js");
 const versions_1 = require("../../../utils/versions");
-function addRollupBuildTarget(host, options) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { rollupInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
-        // These are used in `@nx/react/plugins/bundle-rollup`
-        (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-            '@rollup/plugin-url': versions_1.rollupPluginUrlVersion,
-            '@svgr/rollup': versions_1.svgrRollupVersion,
-        });
-        const { targets } = (0, devkit_1.readProjectConfiguration)(host, options.name);
-        const external = ['react', 'react-dom'];
-        if (options.style === '@emotion/styled') {
-            external.push('@emotion/react/jsx-runtime');
-        }
-        else {
-            external.push('react/jsx-runtime');
-        }
-        targets.build = {
-            executor: '@nx/rollup:rollup',
-            outputs: ['{options.outputPath}'],
-            options: {
-                outputPath: (0, devkit_1.joinPathFragments)('dist', options.projectRoot),
-                tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
-                project: `${options.projectRoot}/package.json`,
-                entryFile: (0, maybe_js_1.maybeJs)(options, `${options.projectRoot}/src/index.ts`),
-                external,
-                rollupConfig: `@nx/react/plugins/bundle-rollup`,
-                compiler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'babel',
-                assets: [
-                    {
-                        glob: `${options.projectRoot}/README.md`,
-                        input: '.',
-                        output: '.',
-                    },
-                ],
-            },
-        };
-        (0, devkit_1.updateProjectConfiguration)(host, options.name, {
-            root: options.projectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
-            projectType: 'library',
-            tags: options.parsedTags,
-            targets,
-        });
-        return rollupInitGenerator(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
+async function addRollupBuildTarget(host, options) {
+    const { rollupInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
+    // These are used in `@nx/react/plugins/bundle-rollup`
+    (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
+        '@rollup/plugin-url': versions_1.rollupPluginUrlVersion,
+        '@svgr/rollup': versions_1.svgrRollupVersion,
     });
+    const { targets } = (0, devkit_1.readProjectConfiguration)(host, options.name);
+    const external = ['react', 'react-dom'];
+    if (options.style === '@emotion/styled') {
+        external.push('@emotion/react/jsx-runtime');
+    }
+    else {
+        external.push('react/jsx-runtime');
+    }
+    targets.build = {
+        executor: '@nx/rollup:rollup',
+        outputs: ['{options.outputPath}'],
+        options: {
+            outputPath: (0, devkit_1.joinPathFragments)('dist', options.projectRoot),
+            tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
+            project: `${options.projectRoot}/package.json`,
+            entryFile: (0, maybe_js_1.maybeJs)(options, `${options.projectRoot}/src/index.ts`),
+            external,
+            rollupConfig: `@nx/react/plugins/bundle-rollup`,
+            compiler: options.compiler ?? 'babel',
+            assets: [
+                {
+                    glob: `${options.projectRoot}/README.md`,
+                    input: '.',
+                    output: '.',
+                },
+            ],
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(host, options.name, {
+        root: options.projectRoot,
+        sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
+        projectType: 'library',
+        tags: options.parsedTags,
+        targets,
+    });
+    return rollupInitGenerator(host, { ...options, skipFormat: true });
 }
 exports.addRollupBuildTarget = addRollupBuildTarget;

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

@@ -6,7 +6,13 @@ const js_1 = require("@nx/js");
 const create_ts_config_1 = require("../../../utils/create-ts-config");
 function createFiles(host, options) {
     const relativePathToRootTsConfig = (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot);
-    const substitutions = Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.name)), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), fileName: options.fileName });
+    const substitutions = {
+        ...options,
+        ...(0, devkit_1.names)(options.name),
+        tmpl: '',
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
+        fileName: options.fileName,
+    };
     (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, '../files/common'), options.projectRoot, substitutions);
     if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
         (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, '../files/vite'), options.projectRoot, substitutions);

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

@@ -1,60 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = 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");
-function normalizeOptions(host, options) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectName, names: projectNames, projectRoot, importPath, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-            name: options.name,
-            projectType: 'library',
-            directory: options.directory,
-            importPath: options.importPath,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
-            callingGenerator: '@nx/react:library',
-        });
-        const fileName = options.simpleName
-            ? projectNames.projectSimpleName
-            : projectNames.projectFileName;
-        const parsedTags = options.tags
-            ? options.tags.split(',').map((s) => s.trim())
-            : [];
-        let bundler = (_a = options.bundler) !== null && _a !== void 0 ? _a : 'none';
-        if (bundler === 'none') {
-            if (options.publishable) {
-                devkit_1.logger.warn(`Publishable libraries cannot be used with bundler: 'none'. Defaulting to 'rollup'.`);
-                bundler = 'rollup';
-            }
-            if (options.buildable) {
-                devkit_1.logger.warn(`Buildable libraries cannot be used with bundler: 'none'. Defaulting to 'rollup'.`);
-                bundler = 'rollup';
-            }
+async function normalizeOptions(host, options) {
+    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        name: options.name,
+        projectType: 'library',
+        directory: options.directory,
+        importPath: options.importPath,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        callingGenerator: '@nx/react:library',
+    });
+    const fileName = options.simpleName
+        ? projectNames.projectSimpleName
+        : projectNames.projectFileName;
+    const parsedTags = options.tags
+        ? options.tags.split(',').map((s) => s.trim())
+        : [];
+    let bundler = options.bundler ?? 'none';
+    if (bundler === 'none') {
+        if (options.publishable) {
+            devkit_1.logger.warn(`Publishable libraries cannot be used with bundler: 'none'. Defaulting to 'rollup'.`);
+            bundler = 'rollup';
         }
-        const normalized = Object.assign(Object.assign({}, options), { compiler: (_b = options.compiler) !== null && _b !== void 0 ? _b : 'babel', bundler,
-            fileName, routePath: `/${projectNames.projectSimpleName}`, name: projectName, projectRoot,
-            parsedTags,
-            importPath });
-        // Libraries with a bundler or is publishable must also be buildable.
-        normalized.buildable = Boolean(normalized.bundler !== 'none' || options.buildable || options.publishable);
-        normalized.inSourceTests === normalized.minimal || normalized.inSourceTests;
-        if (options.appProject) {
-            const appProjectConfig = (0, devkit_1.getProjects)(host).get(options.appProject);
-            if (appProjectConfig.projectType !== 'application') {
-                throw new Error(`appProject expected type of "application" but got "${appProjectConfig.projectType}"`);
-            }
-            try {
-                normalized.appMain = appProjectConfig.targets.build.options.main;
-                normalized.appSourceRoot = (0, devkit_1.normalizePath)(appProjectConfig.sourceRoot);
-            }
-            catch (e) {
-                throw new Error(`Could not locate project main for ${options.appProject}`);
-            }
+        if (options.buildable) {
+            devkit_1.logger.warn(`Buildable libraries cannot be used with bundler: 'none'. Defaulting to 'rollup'.`);
+            bundler = 'rollup';
         }
-        (0, assertion_1.assertValidStyle)(normalized.style);
-        return normalized;
-    });
+    }
+    const normalized = {
+        ...options,
+        compiler: options.compiler ?? 'babel',
+        bundler,
+        fileName,
+        routePath: `/${projectNames.projectSimpleName}`,
+        name: projectName,
+        projectRoot,
+        parsedTags,
+        importPath,
+    };
+    // Libraries with a bundler or is publishable must also be buildable.
+    normalized.buildable = Boolean(normalized.bundler !== 'none' || options.buildable || options.publishable);
+    normalized.inSourceTests === normalized.minimal || normalized.inSourceTests;
+    if (options.appProject) {
+        const appProjectConfig = (0, devkit_1.getProjects)(host).get(options.appProject);
+        if (appProjectConfig.projectType !== 'application') {
+            throw new Error(`appProject expected type of "application" but got "${appProjectConfig.projectType}"`);
+        }
+        try {
+            normalized.appMain = appProjectConfig.targets.build.options.main;
+            normalized.appSourceRoot = (0, devkit_1.normalizePath)(appProjectConfig.sourceRoot);
+        }
+        catch (e) {
+            throw new Error(`Could not locate project main for ${options.appProject}`);
+        }
+    }
+    (0, assertion_1.assertValidStyle)(normalized.style);
+    return normalized;
 }
 exports.normalizeOptions = normalizeOptions;

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

@@ -3,13 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setDefaults = void 0;
 const devkit_1 = require("@nx/devkit");
 function setDefaults(host, options) {
-    var _a, _b;
     const nxJson = (0, devkit_1.readNxJson)(host);
     nxJson.generators = nxJson.generators || {};
     nxJson.generators['@nx/react'] = nxJson.generators['@nx/react'] || {};
-    const prev = Object.assign({}, nxJson.generators['@nx/react']);
-    const libDefaults = Object.assign(Object.assign({}, prev.library), { unitTestRunner: (_b = (_a = prev.library) === null || _a === void 0 ? void 0 : _a.unitTestRunner) !== null && _b !== void 0 ? _b : options.unitTestRunner });
-    nxJson.generators = Object.assign(Object.assign({}, nxJson.generators), { '@nx/react': Object.assign(Object.assign({}, prev), { library: libDefaults }) });
+    const prev = { ...nxJson.generators['@nx/react'] };
+    const libDefaults = {
+        ...prev.library,
+        unitTestRunner: prev.library?.unitTestRunner ?? options.unitTestRunner,
+    };
+    nxJson.generators = {
+        ...nxJson.generators,
+        '@nx/react': {
+            ...prev,
+            library: libDefaults,
+        },
+    };
     (0, devkit_1.updateNxJson)(host, nxJson);
 }
 exports.setDefaults = setDefaults;