@nx/angular 16.8.0-beta.4 → 16.8.0-beta.6

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfiguration = void 0;
-const tslib_1 = require("tslib");
 const cypress_1 = require("@nx/cypress");
 const config_1 = require("@nx/cypress/src/utils/config");
 const find_target_options_1 = require("@nx/cypress/src/utils/find-target-options");
@@ -15,74 +14,72 @@ const module_info_1 = require("../utils/storybook-ast/module-info");
  * This is for cypress built in component testing, if you want to test with
  * storybook + cypress then use the componentCypressGenerator instead.
  */
-function cypressComponentConfiguration(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        const installTask = yield (0, cypress_1.componentConfigurationGenerator)(tree, {
-            project: options.project,
-            skipFormat: true,
-        });
-        yield updateProjectConfig(tree, options);
-        yield addFiles(tree, projectConfig, options);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return () => {
-            installTask();
-        };
+async function cypressComponentConfiguration(tree, options) {
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const installTask = await (0, cypress_1.componentConfigurationGenerator)(tree, {
+        project: options.project,
+        skipFormat: true,
     });
+    await updateProjectConfig(tree, options);
+    await addFiles(tree, projectConfig, options);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return () => {
+        installTask();
+    };
 }
 exports.cypressComponentConfiguration = cypressComponentConfiguration;
-function addFiles(tree, projectConfig, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const cyConfigFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
-        const updatedCyConfig = yield (0, config_1.addDefaultCTConfig)(tree.read(cyConfigFile, 'utf-8'));
-        tree.write(cyConfigFile, `import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';\n${updatedCyConfig}`);
-        const componentFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
-        const updatedCmpContents = yield (0, config_1.addMountDefinition)(tree.read(componentFile, 'utf-8'));
-        tree.write(componentFile, `import { mount } from 'cypress/angular';\n${updatedCmpContents}`);
-        if (options.generateTests) {
-            const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.project);
-            const componentInfo = [];
-            for (const entryPoint of entryPoints) {
-                const moduleFilePaths = (0, module_info_1.getModuleFilePaths)(tree, entryPoint);
-                componentInfo.push(...(0, component_info_1.getComponentsInfo)(tree, entryPoint, moduleFilePaths, options.project), ...(0, component_info_1.getStandaloneComponentsInfo)(tree, entryPoint));
-            }
-            for (const info of componentInfo) {
-                if (info === undefined) {
-                    continue;
-                }
-                const componentDirFromProjectRoot = (0, path_1.relative)(projectConfig.root, (0, devkit_1.joinPathFragments)(info.moduleFolderPath, info.path));
-                (0, component_test_1.componentTestGenerator)(tree, {
-                    project: options.project,
-                    componentName: info.name,
-                    componentDir: componentDirFromProjectRoot,
-                    componentFileName: info.componentFileName,
-                    skipFormat: true,
-                });
-            }
+async function addFiles(tree, projectConfig, options) {
+    const cyConfigFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
+    const updatedCyConfig = await (0, config_1.addDefaultCTConfig)(tree.read(cyConfigFile, 'utf-8'));
+    tree.write(cyConfigFile, `import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';\n${updatedCyConfig}`);
+    const componentFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
+    const updatedCmpContents = await (0, config_1.addMountDefinition)(tree.read(componentFile, 'utf-8'));
+    tree.write(componentFile, `import { mount } from 'cypress/angular';\n${updatedCmpContents}`);
+    if (options.generateTests) {
+        const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.project);
+        const componentInfo = [];
+        for (const entryPoint of entryPoints) {
+            const moduleFilePaths = (0, module_info_1.getModuleFilePaths)(tree, entryPoint);
+            componentInfo.push(...(0, component_info_1.getComponentsInfo)(tree, entryPoint, moduleFilePaths, options.project), ...(0, component_info_1.getStandaloneComponentsInfo)(tree, entryPoint));
         }
-    });
-}
-function updateProjectConfig(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let found = { target: options.buildTarget, config: undefined };
-        if (!options.buildTarget) {
-            found = yield (0, find_target_options_1.findBuildConfig)(tree, {
+        for (const info of componentInfo) {
+            if (info === undefined) {
+                continue;
+            }
+            const componentDirFromProjectRoot = (0, path_1.relative)(projectConfig.root, (0, devkit_1.joinPathFragments)(info.moduleFolderPath, info.path));
+            (0, component_test_1.componentTestGenerator)(tree, {
                 project: options.project,
-                buildTarget: options.buildTarget,
-                validExecutorNames: new Set([
-                    '@nx/angular:webpack-browser',
-                    '@nrwl/angular:webpack-browser',
-                    '@angular-devkit/build-angular:browser',
-                ]),
+                componentName: info.name,
+                componentDir: componentDirFromProjectRoot,
+                componentFileName: info.componentFileName,
+                skipFormat: true,
             });
-            assertValidConfig(found === null || found === void 0 ? void 0 : found.config);
         }
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        projectConfig.targets['component-test'].options = Object.assign(Object.assign({}, projectConfig.targets['component-test'].options), { skipServe: true, devServerTarget: found.target });
-        (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
-    });
+    }
+}
+async function updateProjectConfig(tree, options) {
+    let found = { target: options.buildTarget, config: undefined };
+    if (!options.buildTarget) {
+        found = await (0, find_target_options_1.findBuildConfig)(tree, {
+            project: options.project,
+            buildTarget: options.buildTarget,
+            validExecutorNames: new Set([
+                '@nx/angular:webpack-browser',
+                '@nrwl/angular:webpack-browser',
+                '@angular-devkit/build-angular:browser',
+            ]),
+        });
+        assertValidConfig(found?.config);
+    }
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    projectConfig.targets['component-test'].options = {
+        ...projectConfig.targets['component-test'].options,
+        skipServe: true,
+        devServerTarget: found.target,
+    };
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
 }
 function assertValidConfig(config) {
     if (!config) {

package/src/generators/directive/directive.js

@@ -1,34 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.directiveGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const utils_1 = require("../utils");
 const lib_1 = require("./lib");
-function directiveGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, lib_1.validateOptions)(tree, schema);
-        const options = (0, lib_1.normalizeOptions)(tree, schema);
-        const directiveNames = (0, devkit_1.names)(options.name);
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {
-            selector: options.selector,
-            directiveClassName: directiveNames.className,
-            directiveFileName: directiveNames.fileName,
-            standalone: options.standalone,
-            tpl: '',
-        });
-        if (options.skipTests) {
-            const pathToSpecFile = (0, devkit_1.joinPathFragments)(options.directory, `${directiveNames.fileName}.directive.spec.ts`);
-            tree.delete(pathToSpecFile);
-        }
-        if (!options.skipImport && !options.standalone) {
-            const modulePath = (0, utils_1.findModule)(tree, options.path, options.module);
-            (0, utils_1.addToNgModule)(tree, options.path, modulePath, directiveNames.fileName, `${directiveNames.className}Directive`, `${directiveNames.fileName}.directive`, 'declarations', options.flat, options.export);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
+async function directiveGenerator(tree, schema) {
+    (0, lib_1.validateOptions)(tree, schema);
+    const options = (0, lib_1.normalizeOptions)(tree, schema);
+    const directiveNames = (0, devkit_1.names)(options.name);
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {
+        selector: options.selector,
+        directiveClassName: directiveNames.className,
+        directiveFileName: directiveNames.fileName,
+        standalone: options.standalone,
+        tpl: '',
     });
+    if (options.skipTests) {
+        const pathToSpecFile = (0, devkit_1.joinPathFragments)(options.directory, `${directiveNames.fileName}.directive.spec.ts`);
+        tree.delete(pathToSpecFile);
+    }
+    if (!options.skipImport && !options.standalone) {
+        const modulePath = (0, utils_1.findModule)(tree, options.path, options.module);
+        (0, utils_1.addToNgModule)(tree, options.path, modulePath, directiveNames.fileName, `${directiveNames.className}Directive`, `${directiveNames.fileName}.directive`, 'declarations', options.flat, options.export);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.directiveGenerator = directiveGenerator;
 exports.default = directiveGenerator;

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

@@ -5,13 +5,19 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("../../utils/path");
 const selector_1 = require("../../utils/selector");
 function normalizeOptions(tree, options) {
-    var _a;
-    const { directory, name, path } = (0, path_1.normalizeNameAndPaths)(tree, Object.assign(Object.assign({}, options), { type: 'directive' }));
+    const { directory, name, path } = (0, path_1.normalizeNameAndPaths)(tree, {
+        ...options,
+        type: 'directive',
+    });
     const { prefix } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const selector = (_a = options.selector) !== null && _a !== void 0 ? _a : (0, selector_1.buildSelector)(tree, name, options.prefix, prefix, 'propertyName');
-    return Object.assign(Object.assign({}, options), { directory,
+    const selector = options.selector ??
+        (0, selector_1.buildSelector)(tree, name, options.prefix, prefix, 'propertyName');
+    return {
+        ...options,
+        directory,
         name,
         path,
-        selector });
+        selector,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/host/host.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hostInternal = exports.host = 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 semver_1 = require("semver");
@@ -11,79 +10,90 @@ const remote_1 = require("../remote/remote");
 const setup_mf_1 = require("../setup-mf/setup-mf");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
-function host(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield hostInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, options));
+async function host(tree, options) {
+    return await hostInternal(tree, {
+        projectNameAndRootFormat: 'derived',
+        ...options,
     });
 }
 exports.host = host;
-function hostInternal(tree, options) {
-    var _a;
-    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') && options.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 hostInternal(tree, options) {
+    const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') && options.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.`);
-        }
-        const projects = (0, devkit_1.getProjects)(tree);
-        const remotesToGenerate = [];
-        const remotesToIntegrate = [];
-        if (options.remotes && options.remotes.length > 0) {
-            options.remotes.forEach((remote) => {
-                if (!projects.has(remote)) {
-                    remotesToGenerate.push(remote);
-                }
-                else {
-                    remotesToIntegrate.push(remote);
-                }
-            });
-        }
-        const { projectName: hostProjectName, projectNameAndRootFormat } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
-            name: options.name,
-            projectType: 'application',
-            directory: options.directory,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
-            callingGenerator: '@nx/angular:host',
+    }
+    const projects = (0, devkit_1.getProjects)(tree);
+    const remotesToGenerate = [];
+    const remotesToIntegrate = [];
+    if (options.remotes && options.remotes.length > 0) {
+        options.remotes.forEach((remote) => {
+            if (!projects.has(remote)) {
+                remotesToGenerate.push(remote);
+            }
+            else {
+                remotesToIntegrate.push(remote);
+            }
         });
-        options.projectNameAndRootFormat = projectNameAndRootFormat;
-        const appInstallTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { standalone: (_a = options.standalone) !== null && _a !== void 0 ? _a : false, routing: true, port: 4200, skipFormat: true }));
-        const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;
-        yield (0, setup_mf_1.setupMf)(tree, {
-            appName: hostProjectName,
-            mfType: 'host',
-            routing: true,
-            port: 4200,
-            remotes: remotesToIntegrate !== null && remotesToIntegrate !== void 0 ? remotesToIntegrate : [],
-            federationType: options.dynamic ? 'dynamic' : 'static',
-            skipPackageJson: options.skipPackageJson,
+    }
+    const { projectName: hostProjectName, projectNameAndRootFormat } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+        name: options.name,
+        projectType: 'application',
+        directory: options.directory,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        callingGenerator: '@nx/angular:host',
+    });
+    options.projectNameAndRootFormat = projectNameAndRootFormat;
+    const appInstallTask = await (0, application_1.default)(tree, {
+        ...options,
+        standalone: options.standalone ?? false,
+        routing: true,
+        port: 4200,
+        skipFormat: true,
+    });
+    const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;
+    await (0, setup_mf_1.setupMf)(tree, {
+        appName: hostProjectName,
+        mfType: 'host',
+        routing: true,
+        port: 4200,
+        remotes: remotesToIntegrate ?? [],
+        federationType: options.dynamic ? 'dynamic' : 'static',
+        skipPackageJson: options.skipPackageJson,
+        skipFormat: true,
+        skipE2E,
+        e2eProjectName: skipE2E ? undefined : `${hostProjectName}-e2e`,
+        prefix: options.prefix,
+    });
+    let installTasks = [appInstallTask];
+    if (options.ssr) {
+        let ssrInstallTask = await (0, lib_1.addSsr)(tree, options, hostProjectName);
+        installTasks.push(ssrInstallTask);
+    }
+    for (const remote of remotesToGenerate) {
+        let remoteDirectory = options.directory;
+        if (options.projectNameAndRootFormat === 'as-provided' &&
+            options.directory) {
+            /**
+             * With the `as-provided` format, the provided directory would be the root
+             * of the host application. Append the remote name to the host parent
+             * directory to get the remote directory.
+             */
+            remoteDirectory = (0, devkit_1.joinPathFragments)(options.directory, '..', remote);
+        }
+        await (0, remote_1.default)(tree, {
+            ...options,
+            name: remote,
+            directory: remoteDirectory,
+            host: hostProjectName,
             skipFormat: true,
-            skipE2E,
-            e2eProjectName: skipE2E ? undefined : `${hostProjectName}-e2e`,
-            prefix: options.prefix,
+            standalone: options.standalone,
         });
-        let installTasks = [appInstallTask];
-        if (options.ssr) {
-            let ssrInstallTask = yield (0, lib_1.addSsr)(tree, options, hostProjectName);
-            installTasks.push(ssrInstallTask);
-        }
-        for (const remote of remotesToGenerate) {
-            let remoteDirectory = options.directory;
-            if (options.projectNameAndRootFormat === 'as-provided' &&
-                options.directory) {
-                /**
-                 * With the `as-provided` format, the provided directory would be the root
-                 * of the host application. Append the remote name to the host parent
-                 * directory to get the remote directory.
-                 */
-                remoteDirectory = (0, devkit_1.joinPathFragments)(options.directory, '..', remote);
-            }
-            yield (0, remote_1.default)(tree, Object.assign(Object.assign({}, options), { name: remote, directory: remoteDirectory, host: hostProjectName, skipFormat: true, standalone: options.standalone }));
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return (0, devkit_1.runTasksInSerial)(...installTasks);
-    });
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...installTasks);
 }
 exports.hostInternal = hostInternal;
 exports.default = host;

package/src/generators/host/lib/add-ssr.js

@@ -1,45 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addSsr = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const setup_ssr_1 = require("../../setup-ssr/setup-ssr");
 const versions_1 = require("../../../utils/versions");
 const path_1 = require("path");
-function addSsr(tree, options, appName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
-        yield (0, setup_ssr_1.default)(tree, {
-            project: appName,
-            standalone: options.standalone,
-        });
-        tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.server.ts'));
-        tree.write((0, devkit_1.joinPathFragments)(project.root, 'server.ts'), "import('./src/main.server');");
-        const browserBundleOutput = (0, devkit_1.joinPathFragments)(project.targets.build.options.outputPath, 'browser');
-        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files'), project.root, {
-            appName,
-            browserBundleOutput,
-            standalone: options.standalone,
-            tmpl: '',
-        });
-        // update project.json
-        project = (0, devkit_1.readProjectConfiguration)(tree, appName);
-        project.targets.server.executor = '@nx/angular:webpack-server';
-        project.targets.server.options.customWebpackConfig = {
-            path: (0, devkit_1.joinPathFragments)(project.root, 'webpack.server.config.js'),
-        };
-        project.targets['serve-ssr'].executor =
-            '@nx/angular:module-federation-dev-ssr';
-        (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            cors: versions_1.corsVersion,
-            express: versions_1.expressVersion,
-            '@module-federation/node': versions_1.moduleFederationNodeVersion,
-        }, {
-            '@types/cors': versions_1.typesCorsVersion,
-            '@types/express': versions_1.typesExpressVersion,
-        });
-        return installTask;
+async function addSsr(tree, options, appName) {
+    let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
+    await (0, setup_ssr_1.default)(tree, {
+        project: appName,
+        standalone: options.standalone,
     });
+    tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.server.ts'));
+    tree.write((0, devkit_1.joinPathFragments)(project.root, 'server.ts'), "import('./src/main.server');");
+    const browserBundleOutput = (0, devkit_1.joinPathFragments)(project.targets.build.options.outputPath, 'browser');
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files'), project.root, {
+        appName,
+        browserBundleOutput,
+        standalone: options.standalone,
+        tmpl: '',
+    });
+    // update project.json
+    project = (0, devkit_1.readProjectConfiguration)(tree, appName);
+    project.targets.server.executor = '@nx/angular:webpack-server';
+    project.targets.server.options.customWebpackConfig = {
+        path: (0, devkit_1.joinPathFragments)(project.root, 'webpack.server.config.js'),
+    };
+    project.targets['serve-ssr'].executor =
+        '@nx/angular:module-federation-dev-ssr';
+    (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
+        cors: versions_1.corsVersion,
+        express: versions_1.expressVersion,
+        '@module-federation/node': versions_1.moduleFederationNodeVersion,
+    }, {
+        '@types/cors': versions_1.typesCorsVersion,
+        '@types/express': versions_1.typesExpressVersion,
+    });
+    return installTask;
 }
 exports.addSsr = addSsr;