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

package/src/generators/library/library.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.librarySchematic = exports.libraryGeneratorInternal = exports.libraryGenerator = 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");
@@ -16,121 +15,133 @@ const create_files_1 = require("./lib/create-files");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const install_common_dependencies_1 = require("./lib/install-common-dependencies");
 const set_defaults_1 = require("./lib/set-defaults");
-function libraryGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield libraryGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function libraryGenerator(host, schema) {
+    return await libraryGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.libraryGenerator = libraryGenerator;
-function libraryGeneratorInternal(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const options = yield (0, normalize_options_1.normalizeOptions)(host, schema);
-        if (options.publishable === true && !schema.importPath) {
-            throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
-        }
-        if (!options.component) {
-            options.style = 'none';
-        }
-        const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { e2eTestRunner: 'none', skipFormat: true, skipHelperLibs: options.bundler === 'vite' }));
-        tasks.push(initTask);
-        (0, devkit_1.addProjectConfiguration)(host, options.name, {
-            root: options.projectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
-            projectType: 'library',
-            tags: options.parsedTags,
-            targets: {},
+async function libraryGeneratorInternal(host, schema) {
+    const tasks = [];
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    if (options.publishable === true && !schema.importPath) {
+        throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
+    }
+    if (!options.component) {
+        options.style = 'none';
+    }
+    const initTask = await (0, init_1.default)(host, {
+        ...options,
+        e2eTestRunner: 'none',
+        skipFormat: true,
+        skipHelperLibs: options.bundler === 'vite',
+    });
+    tasks.push(initTask);
+    (0, devkit_1.addProjectConfiguration)(host, options.name, {
+        root: options.projectRoot,
+        sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
+        projectType: 'library',
+        tags: options.parsedTags,
+        targets: {},
+    });
+    const lintTask = await (0, add_linting_1.addLinting)(host, options);
+    tasks.push(lintTask);
+    (0, create_files_1.createFiles)(host, options);
+    // Set up build target
+    if (options.buildable && options.bundler === 'vite') {
+        const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+        const viteTask = await viteConfigurationGenerator(host, {
+            uiFramework: 'react',
+            project: options.name,
+            newProject: true,
+            includeLib: true,
+            inSourceTests: options.inSourceTests,
+            includeVitest: options.unitTestRunner === 'vitest',
+            compiler: options.compiler,
+            skipFormat: true,
+            testEnvironment: 'jsdom',
         });
-        const lintTask = yield (0, add_linting_1.addLinting)(host, options);
-        tasks.push(lintTask);
-        (0, create_files_1.createFiles)(host, options);
-        // Set up build target
-        if (options.buildable && options.bundler === 'vite') {
-            const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-            const viteTask = yield viteConfigurationGenerator(host, {
-                uiFramework: 'react',
-                project: options.name,
-                newProject: true,
-                includeLib: true,
-                inSourceTests: options.inSourceTests,
-                includeVitest: options.unitTestRunner === 'vitest',
-                compiler: options.compiler,
-                skipFormat: true,
-                testEnvironment: 'jsdom',
-            });
-            tasks.push(viteTask);
-        }
-        else if (options.buildable && options.bundler === 'rollup') {
-            const rollupTask = yield (0, add_rollup_build_target_1.addRollupBuildTarget)(host, options);
-            tasks.push(rollupTask);
-        }
-        // Set up test target
-        if (options.unitTestRunner === 'jest') {
-            const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
-            const jestTask = yield configurationGenerator(host, Object.assign(Object.assign({}, options), { project: options.name, setupFile: 'none', supportTsx: true, skipSerializers: true, compiler: options.compiler, skipFormat: true }));
-            tasks.push(jestTask);
-            const jestConfigPath = (0, devkit_1.joinPathFragments)(options.projectRoot, options.js ? 'jest.config.js' : 'jest.config.ts');
-            if (options.compiler === 'babel' && host.exists(jestConfigPath)) {
-                const updatedContent = (0, jest_utils_1.updateJestConfigContent)(host.read(jestConfigPath, 'utf-8'));
-                host.write(jestConfigPath, updatedContent);
-            }
-        }
-        else if (options.unitTestRunner === 'vitest' &&
-            options.bundler !== 'vite' // tests are already configured if bundler is vite
-        ) {
-            const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-            const vitestTask = yield vitestGenerator(host, {
-                uiFramework: 'react',
-                project: options.name,
-                coverageProvider: 'c8',
-                inSourceTests: options.inSourceTests,
-                skipFormat: true,
-                testEnvironment: 'jsdom',
-            });
-            tasks.push(vitestTask);
-        }
-        if (options.component) {
-            const componentTask = yield (0, component_1.default)(host, {
-                name: options.fileName,
-                project: options.name,
-                flat: true,
-                style: options.style,
-                skipTests: options.unitTestRunner === 'none' ||
-                    (options.unitTestRunner === 'vitest' && options.inSourceTests == true),
-                export: true,
-                routing: options.routing,
-                js: options.js,
-                pascalCaseFiles: options.pascalCaseFiles,
-                inSourceTests: options.inSourceTests,
-                skipFormat: true,
-                globalCss: options.globalCss,
-            });
-            tasks.push(componentTask);
-        }
-        if (options.publishable || options.buildable) {
-            (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
-                json.name = options.importPath;
-                return json;
-            });
-        }
-        if (!options.skipPackageJson) {
-            const installReactTask = yield (0, install_common_dependencies_1.installCommonDependencies)(host, options);
-            tasks.push(installReactTask);
-        }
-        const routeTask = (0, update_app_routes_1.updateAppRoutes)(host, options);
-        tasks.push(routeTask);
-        (0, set_defaults_1.setDefaults)(host, options);
-        (0, create_ts_config_1.extractTsConfigBase)(host);
-        if (!options.skipTsConfig) {
-            (0, js_1.addTsConfigPath)(host, options.importPath, [
-                (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
-            ]);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
+        tasks.push(viteTask);
+    }
+    else if (options.buildable && options.bundler === 'rollup') {
+        const rollupTask = await (0, add_rollup_build_target_1.addRollupBuildTarget)(host, options);
+        tasks.push(rollupTask);
+    }
+    // Set up test target
+    if (options.unitTestRunner === 'jest') {
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
+        const jestTask = await configurationGenerator(host, {
+            ...options,
+            project: options.name,
+            setupFile: 'none',
+            supportTsx: true,
+            skipSerializers: true,
+            compiler: options.compiler,
+            skipFormat: true,
+        });
+        tasks.push(jestTask);
+        const jestConfigPath = (0, devkit_1.joinPathFragments)(options.projectRoot, options.js ? 'jest.config.js' : 'jest.config.ts');
+        if (options.compiler === 'babel' && host.exists(jestConfigPath)) {
+            const updatedContent = (0, jest_utils_1.updateJestConfigContent)(host.read(jestConfigPath, 'utf-8'));
+            host.write(jestConfigPath, updatedContent);
         }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+    }
+    else if (options.unitTestRunner === 'vitest' &&
+        options.bundler !== 'vite' // tests are already configured if bundler is vite
+    ) {
+        const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+        const vitestTask = await vitestGenerator(host, {
+            uiFramework: 'react',
+            project: options.name,
+            coverageProvider: 'c8',
+            inSourceTests: options.inSourceTests,
+            skipFormat: true,
+            testEnvironment: 'jsdom',
+        });
+        tasks.push(vitestTask);
+    }
+    if (options.component) {
+        const componentTask = await (0, component_1.default)(host, {
+            name: options.fileName,
+            project: options.name,
+            flat: true,
+            style: options.style,
+            skipTests: options.unitTestRunner === 'none' ||
+                (options.unitTestRunner === 'vitest' && options.inSourceTests == true),
+            export: true,
+            routing: options.routing,
+            js: options.js,
+            pascalCaseFiles: options.pascalCaseFiles,
+            inSourceTests: options.inSourceTests,
+            skipFormat: true,
+            globalCss: options.globalCss,
+        });
+        tasks.push(componentTask);
+    }
+    if (options.publishable || options.buildable) {
+        (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
+            json.name = options.importPath;
+            return json;
+        });
+    }
+    if (!options.skipPackageJson) {
+        const installReactTask = await (0, install_common_dependencies_1.installCommonDependencies)(host, options);
+        tasks.push(installReactTask);
+    }
+    const routeTask = (0, update_app_routes_1.updateAppRoutes)(host, options);
+    tasks.push(routeTask);
+    (0, set_defaults_1.setDefaults)(host, options);
+    (0, create_ts_config_1.extractTsConfigBase)(host);
+    if (!options.skipTsConfig) {
+        (0, js_1.addTsConfigPath)(host, options.importPath, [
+            (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
+        ]);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 exports.default = libraryGenerator;

package/src/generators/redux/redux.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reduxSchematic = exports.reduxGenerator = void 0;
-const tslib_1 = require("tslib");
 const path = require("path");
 const ast_utils_1 = require("../../utils/ast-utils");
 const versions_1 = require("../../utils/versions");
@@ -9,21 +8,22 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
-function reduxGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(host, schema);
-        generateReduxFiles(host, options);
-        addExportsToBarrel(host, options);
-        const installTask = addReduxPackageDependencies(host);
-        addStoreConfiguration(host, options);
-        updateReducerConfiguration(host, options);
-        yield (0, devkit_1.formatFiles)(host);
-        return installTask;
-    });
+async function reduxGenerator(host, schema) {
+    const options = normalizeOptions(host, schema);
+    generateReduxFiles(host, options);
+    addExportsToBarrel(host, options);
+    const installTask = addReduxPackageDependencies(host);
+    addStoreConfiguration(host, options);
+    updateReducerConfiguration(host, options);
+    await (0, devkit_1.formatFiles)(host);
+    return installTask;
 }
 exports.reduxGenerator = reduxGenerator;
 function generateReduxFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files'), options.filesPath, Object.assign(Object.assign({}, options), { tmpl: '' }));
+    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files'), options.filesPath, {
+        ...options,
+        tmpl: '',
+    });
     if (options.js) {
         (0, devkit_1.toJS)(host);
     }
@@ -77,7 +77,6 @@ function updateReducerConfiguration(host, options) {
     host.write(options.appMainFilePath, changes);
 }
 function normalizeOptions(host, options) {
-    var _a;
     let appProjectSourcePath;
     let appMainFilePath;
     const extraNames = (0, devkit_1.names)(options.name);
@@ -109,8 +108,18 @@ function normalizeOptions(host, options) {
             throw new Error(`Could not find ${appMainFilePath} during store configuration`);
         }
     }
-    return Object.assign(Object.assign(Object.assign({}, options), extraNames), { constantName: (0, devkit_1.names)(options.name).constantName.toUpperCase(), directory: (0, devkit_1.names)((_a = options.directory) !== null && _a !== void 0 ? _a : '').fileName, projectType, projectSourcePath: sourceRoot, projectModulePath: modulePath, appProjectSourcePath,
-        appMainFilePath, filesPath: (0, devkit_1.joinPathFragments)(sourceRoot, projectType === 'application' ? 'app' : 'lib') });
+    return {
+        ...options,
+        ...extraNames,
+        constantName: (0, devkit_1.names)(options.name).constantName.toUpperCase(),
+        directory: (0, devkit_1.names)(options.directory ?? '').fileName,
+        projectType,
+        projectSourcePath: sourceRoot,
+        projectModulePath: modulePath,
+        appProjectSourcePath,
+        appMainFilePath,
+        filesPath: (0, devkit_1.joinPathFragments)(sourceRoot, projectType === 'application' ? 'app' : 'lib'),
+    };
 }
 exports.default = reduxGenerator;
 exports.reduxSchematic = (0, devkit_1.convertNxGenerator)(reduxGenerator);

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

@@ -1,31 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsrForRemote = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-function setupSsrForRemote(tree, options, appName) {
-    var _a, _b, _c;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const project = (0, devkit_1.readProjectConfiguration)(tree, appName);
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/module-federation-ssr'), project.root, Object.assign(Object.assign({}, options), { appName, tmpl: '', browserBuildOutputPath: project.targets.build.options.outputPath, serverBuildOutputPath: project.targets.server.options.outputPath }));
-        // For hosts to use when running remotes in static mode.
-        const originalOutputPath = (_b = (_a = project.targets.build) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.outputPath;
-        project.targets['serve-static'] = {
-            dependsOn: ['build', 'server'],
-            executor: 'nx:run-commands',
-            defaultConfiguration: 'development',
-            options: {
-                command: `PORT=${(_c = options.devServerPort) !== null && _c !== void 0 ? _c : 4200} node ${(0, devkit_1.joinPathFragments)(originalOutputPath, 'server', 'main.js')}`,
-            },
-        };
-        (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            '@module-federation/node': versions_1.moduleFederationNodeVersion,
-        }, {});
-        tasks.push(installTask);
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function setupSsrForRemote(tree, options, appName) {
+    const tasks = [];
+    const project = (0, devkit_1.readProjectConfiguration)(tree, appName);
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/module-federation-ssr'), project.root, {
+        ...options,
+        appName,
+        tmpl: '',
+        browserBuildOutputPath: project.targets.build.options.outputPath,
+        serverBuildOutputPath: project.targets.server.options.outputPath,
     });
+    // For hosts to use when running remotes in static mode.
+    const originalOutputPath = project.targets.build?.options?.outputPath;
+    project.targets['serve-static'] = {
+        dependsOn: ['build', 'server'],
+        executor: 'nx:run-commands',
+        defaultConfiguration: 'development',
+        options: {
+            command: `PORT=${options.devServerPort ?? 4200} node ${(0, devkit_1.joinPathFragments)(originalOutputPath, 'server', 'main.js')}`,
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
+        '@module-federation/node': versions_1.moduleFederationNodeVersion,
+    }, {});
+    tasks.push(installTask);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.setupSsrForRemote = setupSsrForRemote;

package/src/generators/remote/remote.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remoteGeneratorInternal = exports.remoteGenerator = exports.addModuleFederationFiles = void 0;
-const tslib_1 = require("tslib");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("../application/lib/normalize-options");
@@ -11,51 +10,57 @@ const update_module_federation_project_1 = require("../../rules/update-module-fe
 const setup_ssr_1 = require("../setup-ssr/setup-ssr");
 const setup_ssr_for_remote_1 = require("./lib/setup-ssr-for-remote");
 function addModuleFederationFiles(host, options) {
-    const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { tmpl: '' });
+    const templateVariables = {
+        ...(0, devkit_1.names)(options.name),
+        ...options,
+        tmpl: '',
+    };
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `./files/module-federation`), options.appProjectRoot, templateVariables);
 }
 exports.addModuleFederationFiles = addModuleFederationFiles;
-function remoteGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield remoteGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function remoteGenerator(host, schema) {
+    return await remoteGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.remoteGenerator = remoteGenerator;
-function remoteGeneratorInternal(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:remote');
-        const initAppTask = yield (0, application_1.default)(host, Object.assign(Object.assign({}, options), { 
-            // Only webpack works with module federation for now.
-            bundler: 'webpack', skipFormat: true }));
-        tasks.push(initAppTask);
-        if (schema.host) {
-            (0, update_host_with_remote_1.updateHostWithRemote)(host, schema.host, options.projectName);
-        }
-        // Module federation requires bootstrap code to be dynamically imported.
-        // Renaming original entry file so we can use `import(./bootstrap)` in
-        // new entry file.
-        host.rename((0, path_1.join)(options.appProjectRoot, 'src/main.tsx'), (0, path_1.join)(options.appProjectRoot, 'src/bootstrap.tsx'));
-        addModuleFederationFiles(host, options);
-        (0, update_module_federation_project_1.updateModuleFederationProject)(host, options);
-        if (options.ssr) {
-            const setupSsrTask = yield (0, setup_ssr_1.default)(host, {
-                project: options.projectName,
-                serverPort: options.devServerPort,
-                skipFormat: true,
-            });
-            tasks.push(setupSsrTask);
-            const setupSsrForRemoteTask = yield (0, setup_ssr_for_remote_1.setupSsrForRemote)(host, options, options.projectName);
-            tasks.push(setupSsrForRemoteTask);
-            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) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function remoteGeneratorInternal(host, schema) {
+    const tasks = [];
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema, '@nx/react:remote');
+    const initAppTask = await (0, application_1.default)(host, {
+        ...options,
+        // Only webpack works with module federation for now.
+        bundler: 'webpack',
+        skipFormat: true,
     });
+    tasks.push(initAppTask);
+    if (schema.host) {
+        (0, update_host_with_remote_1.updateHostWithRemote)(host, schema.host, options.projectName);
+    }
+    // Module federation requires bootstrap code to be dynamically imported.
+    // Renaming original entry file so we can use `import(./bootstrap)` in
+    // new entry file.
+    host.rename((0, path_1.join)(options.appProjectRoot, 'src/main.tsx'), (0, path_1.join)(options.appProjectRoot, 'src/bootstrap.tsx'));
+    addModuleFederationFiles(host, options);
+    (0, update_module_federation_project_1.updateModuleFederationProject)(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 setupSsrForRemoteTask = await (0, setup_ssr_for_remote_1.setupSsrForRemote)(host, options, options.projectName);
+        tasks.push(setupSsrForRemoteTask);
+        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.remoteGeneratorInternal = remoteGeneratorInternal;
 exports.default = remoteGenerator;