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

package/src/generators/ngrx-feature-store/ngrx-feature-store.js

@@ -1,29 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngrxFeatureStoreGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
-function ngrxFeatureStoreGenerator(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);
-        if (!options.minimal) {
-            (0, lib_1.generateFilesFromTemplates)(tree, options);
-        }
-        if (!options.skipImport) {
-            (0, lib_1.addImportsToModule)(tree, options);
-            (0, lib_1.addExportsToBarrel)(tree, options);
-        }
-        let packageInstallationTask = () => { };
-        if (!options.skipPackageJson) {
-            packageInstallationTask = (0, lib_1.addNgRxToPackageJson)(tree, options);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return packageInstallationTask;
-    });
+async function ngrxFeatureStoreGenerator(tree, schema) {
+    (0, lib_1.validateOptions)(tree, schema);
+    const options = (0, lib_1.normalizeOptions)(tree, schema);
+    if (!options.minimal) {
+        (0, lib_1.generateFilesFromTemplates)(tree, options);
+    }
+    if (!options.skipImport) {
+        (0, lib_1.addImportsToModule)(tree, options);
+        (0, lib_1.addExportsToBarrel)(tree, options);
+    }
+    let packageInstallationTask = () => { };
+    if (!options.skipPackageJson) {
+        packageInstallationTask = (0, lib_1.addNgRxToPackageJson)(tree, options);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return packageInstallationTask;
 }
 exports.ngrxFeatureStoreGenerator = ngrxFeatureStoreGenerator;
 exports.default = ngrxFeatureStoreGenerator;

package/src/generators/ngrx-root-store/lib/add-ngrx-to-package-json.js

@@ -5,21 +5,23 @@ const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
 function addNgRxToPackageJson(tree, options) {
-    var _a;
-    var _b;
     const jasmineMarblesVersion = (0, semver_1.gte)(options.rxjsVersion, '7.0.0')
         ? '~0.9.1'
         : '~0.8.3';
     const ngrxVersion = (0, version_utils_1.versions)(tree).ngrxVersion;
-    (_a = (_b = process.env).npm_config_legacy_peer_deps) !== null && _a !== void 0 ? _a : (_b.npm_config_legacy_peer_deps = 'true');
+    process.env.npm_config_legacy_peer_deps ??= 'true';
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {
         '@ngrx/store': ngrxVersion,
         '@ngrx/effects': ngrxVersion,
         '@ngrx/entity': ngrxVersion,
         '@ngrx/router-store': ngrxVersion,
         '@ngrx/component-store': ngrxVersion,
-    }, Object.assign(Object.assign({ '@ngrx/schematics': ngrxVersion }, (options.addDevTools
-        ? { '@ngrx/store-devtools': ngrxVersion }
-        : undefined)), { 'jasmine-marbles': jasmineMarblesVersion }));
+    }, {
+        '@ngrx/schematics': ngrxVersion,
+        ...(options.addDevTools
+            ? { '@ngrx/store-devtools': ngrxVersion }
+            : undefined),
+        'jasmine-marbles': jasmineMarblesVersion,
+    });
 }
 exports.addNgRxToPackageJson = addNgRxToPackageJson;

package/src/generators/ngrx-root-store/lib/normalize-options.js

@@ -6,12 +6,11 @@ const semver_1 = require("@nx/devkit/src/utils/semver");
 const versions_1 = require("../../../utils/versions");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 function normalizeOptions(tree, options) {
-    var _a;
     let rxjsVersion;
     try {
         rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
     }
-    catch (_b) {
+    catch {
         rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
     }
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -30,7 +29,12 @@ function normalizeOptions(tree, options) {
         : tree.exists(appConfigPath)
             ? appConfigPath
             : appMainPath;
-    options.directory = (_a = options.directory) !== null && _a !== void 0 ? _a : '+state';
-    return Object.assign(Object.assign({}, options), { parent, directory: (0, devkit_1.names)(options.directory).fileName, rxjsVersion });
+    options.directory = options.directory ?? '+state';
+    return {
+        ...options,
+        parent,
+        directory: (0, devkit_1.names)(options.directory).fileName,
+        rxjsVersion,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/ngrx-root-store/lib/validate-options.js

@@ -7,7 +7,6 @@ const version_utils_2 = require("../../../utils/version-utils");
 const semver_1 = require("semver");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 function validateOptions(tree, options) {
-    var _a, _b;
     if (!(0, devkit_1.getProjects)(tree).has(options.project)) {
         throw new Error(`Could not find project '${options.project}'. Please ensure the project name is correct and exists.`);
     }
@@ -20,7 +19,8 @@ function validateOptions(tree, options) {
     }
     const angularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const intendedNgRxVersionForAngularMajor = (0, version_utils_2.getPkgVersionForAngularMajorVersion)('ngrxVersion', angularVersionInfo.major);
-    const ngrxMajorVersion = (_b = (_a = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@ngrx/store')) === null || _a === void 0 ? void 0 : _a.major) !== null && _b !== void 0 ? _b : (0, semver_1.major)((0, semver_1.coerce)(intendedNgRxVersionForAngularMajor));
+    const ngrxMajorVersion = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@ngrx/store')?.major ??
+        (0, semver_1.major)((0, semver_1.coerce)(intendedNgRxVersionForAngularMajor));
     const isStandalone = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
     if ((0, semver_1.lt)(angularVersionInfo.version, '14.1.0') || ngrxMajorVersion < 15) {
         if (isStandalone) {

package/src/generators/ngrx-root-store/ngrx-root-store.js

@@ -1,39 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngrxRootStoreGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 const ngrx_feature_store_1 = require("../ngrx-feature-store/ngrx-feature-store");
-function ngrxRootStoreGenerator(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);
-        if (!options.skipImport) {
-            (0, lib_1.addImportsToModule)(tree, options);
-        }
-        if (!options.minimal) {
-            yield (0, ngrx_feature_store_1.default)(tree, {
-                name: options.name,
-                parent: options.parent,
-                directory: options.directory,
-                minimal: false,
-                facade: options.facade,
-                barrels: false,
-                skipImport: false,
-                skipPackageJson: true,
-                skipFormat: true,
-            });
-        }
-        let packageInstallationTask = () => { };
-        if (!options.skipPackageJson) {
-            packageInstallationTask = (0, lib_1.addNgRxToPackageJson)(tree, options);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return packageInstallationTask;
-    });
+async function ngrxRootStoreGenerator(tree, schema) {
+    (0, lib_1.validateOptions)(tree, schema);
+    const options = (0, lib_1.normalizeOptions)(tree, schema);
+    if (!options.skipImport) {
+        (0, lib_1.addImportsToModule)(tree, options);
+    }
+    if (!options.minimal) {
+        await (0, ngrx_feature_store_1.default)(tree, {
+            name: options.name,
+            parent: options.parent,
+            directory: options.directory,
+            minimal: false,
+            facade: options.facade,
+            barrels: false,
+            skipImport: false,
+            skipPackageJson: true,
+            skipFormat: true,
+        });
+    }
+    let packageInstallationTask = () => { };
+    if (!options.skipPackageJson) {
+        packageInstallationTask = (0, lib_1.addNgRxToPackageJson)(tree, options);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return packageInstallationTask;
 }
 exports.ngrxRootStoreGenerator = ngrxRootStoreGenerator;
 exports.default = ngrxRootStoreGenerator;

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

@@ -3,9 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const path_1 = require("../../utils/path");
 function normalizeOptions(tree, options) {
-    const { directory, name, path } = (0, path_1.normalizeNameAndPaths)(tree, Object.assign(Object.assign({}, options), { type: 'pipe' }));
-    return Object.assign(Object.assign({}, options), { directory,
+    const { directory, name, path } = (0, path_1.normalizeNameAndPaths)(tree, {
+        ...options,
+        type: 'pipe',
+    });
+    return {
+        ...options,
+        directory,
         name,
-        path });
+        path,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/pipe/pipe.js

@@ -1,34 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pipeGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const utils_1 = require("../utils");
 const lib_1 = require("./lib");
-function pipeGenerator(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, lib_1.validateOptions)(tree, rawOptions);
-        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
-        const pipeNames = (0, devkit_1.names)(options.name);
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {
-            pipeClassName: pipeNames.className,
-            pipeFileName: pipeNames.fileName,
-            pipePropertyName: pipeNames.propertyName,
-            standalone: options.standalone,
-            tpl: '',
-        });
-        if (options.skipTests) {
-            const pathToSpecFile = (0, devkit_1.joinPathFragments)(options.directory, `${pipeNames.fileName}.pipe.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, pipeNames.fileName, `${pipeNames.className}Pipe`, `${pipeNames.fileName}.pipe`, 'declarations', options.flat, options.export);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
+async function pipeGenerator(tree, rawOptions) {
+    (0, lib_1.validateOptions)(tree, rawOptions);
+    const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
+    const pipeNames = (0, devkit_1.names)(options.name);
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {
+        pipeClassName: pipeNames.className,
+        pipeFileName: pipeNames.fileName,
+        pipePropertyName: pipeNames.propertyName,
+        standalone: options.standalone,
+        tpl: '',
     });
+    if (options.skipTests) {
+        const pathToSpecFile = (0, devkit_1.joinPathFragments)(options.directory, `${pipeNames.fileName}.pipe.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, pipeNames.fileName, `${pipeNames.className}Pipe`, `${pipeNames.fileName}.pipe`, 'declarations', options.flat, options.export);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.pipeGenerator = pipeGenerator;
 exports.default = pipeGenerator;

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

@@ -1,60 +1,59 @@
 "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");
-function addSsr(tree, { appName, port, standalone, }) {
-    var _a;
-    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,
-        });
-        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');
-        const serverBundleOutput = (0, devkit_1.joinPathFragments)(project.targets.build.options.outputPath, 'server');
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/base'), project.root, {
+async function addSsr(tree, { appName, port, standalone, }) {
+    let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
+    await (0, setup_ssr_1.default)(tree, {
+        project: appName,
+        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');
+    const serverBundleOutput = (0, devkit_1.joinPathFragments)(project.targets.build.options.outputPath, 'server');
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/base'), project.root, {
+        appName,
+        browserBundleOutput,
+        serverBundleOutput,
+        standalone,
+        tmpl: '',
+    });
+    if (standalone) {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/standalone'), project.root, {
             appName,
-            browserBundleOutput,
-            serverBundleOutput,
             standalone,
             tmpl: '',
         });
-        if (standalone) {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/standalone'), project.root, {
-                appName,
-                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'].options = Object.assign(Object.assign({}, ((_a = project.targets['serve-ssr'].options) !== null && _a !== void 0 ? _a : {})), { port });
-        project.targets['static-server'] = {
-            dependsOn: ['build', 'server'],
-            executor: 'nx:run-commands',
-            options: {
-                command: `PORT=${port} node ${(0, devkit_1.joinPathFragments)(project.targets.server.options.outputPath, 'main.js')}`,
-            },
-        };
-        (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;
+    }
+    // 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'].options = {
+        ...(project.targets['serve-ssr'].options ?? {}),
+        port,
+    };
+    project.targets['static-server'] = {
+        dependsOn: ['build', 'server'],
+        executor: 'nx:run-commands',
+        options: {
+            command: `PORT=${port} node ${(0, devkit_1.joinPathFragments)(project.targets.server.options.outputPath, 'main.js')}`,
+        },
+    };
+    (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;

package/src/generators/remote/lib/find-next-available-port.js

@@ -4,12 +4,11 @@ exports.findNextAvailablePort = void 0;
 const devkit_1 = require("@nx/devkit");
 const get_mf_projects_1 = require("../../../utils/get-mf-projects");
 function findNextAvailablePort(tree) {
-    var _a, _b, _c;
     const mfProjects = (0, get_mf_projects_1.getMFProjects)(tree);
     const ports = new Set([4200]);
     for (const mfProject of mfProjects) {
         const { targets } = (0, devkit_1.readProjectConfiguration)(tree, mfProject);
-        const port = (_c = (_b = (_a = targets === null || targets === void 0 ? void 0 : targets.serve) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.port) !== null && _c !== void 0 ? _c : 4200;
+        const port = targets?.serve?.options?.port ?? 4200;
         ports.add(port);
     }
     const nextAvailablePort = Math.max(...ports) + 1;

package/src/generators/remote/remote.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remoteInternal = exports.remote = 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");
@@ -10,62 +9,66 @@ const application_1 = require("../application/application");
 const setup_mf_1 = require("../setup-mf/setup-mf");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
-function remote(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield remoteInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, options));
+async function remote(tree, options) {
+    return await remoteInternal(tree, {
+        projectNameAndRootFormat: 'derived',
+        ...options,
     });
 }
 exports.remote = remote;
-function remoteInternal(tree, options) {
-    var _a, _b;
-    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 remoteInternal(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);
-        if (options.host && !projects.has(options.host)) {
-            throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
-        }
-        const { projectName: remoteProjectName, 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:remote',
-        });
-        options.projectNameAndRootFormat = projectNameAndRootFormat;
-        const port = (_a = options.port) !== null && _a !== void 0 ? _a : (0, lib_1.findNextAvailablePort)(tree);
-        const appInstallTask = yield (0, application_1.applicationGenerator)(tree, Object.assign(Object.assign({}, options), { standalone: (_b = options.standalone) !== null && _b !== void 0 ? _b : false, routing: true, port, skipFormat: true }));
-        const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;
-        yield (0, setup_mf_1.setupMf)(tree, {
+    }
+    const projects = (0, devkit_1.getProjects)(tree);
+    if (options.host && !projects.has(options.host)) {
+        throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
+    }
+    const { projectName: remoteProjectName, 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:remote',
+    });
+    options.projectNameAndRootFormat = projectNameAndRootFormat;
+    const port = options.port ?? (0, lib_1.findNextAvailablePort)(tree);
+    const appInstallTask = await (0, application_1.applicationGenerator)(tree, {
+        ...options,
+        standalone: options.standalone ?? false,
+        routing: true,
+        port,
+        skipFormat: true,
+    });
+    const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;
+    await (0, setup_mf_1.setupMf)(tree, {
+        appName: remoteProjectName,
+        mfType: 'remote',
+        routing: true,
+        host: options.host,
+        port,
+        skipPackageJson: options.skipPackageJson,
+        skipFormat: true,
+        skipE2E,
+        e2eProjectName: skipE2E ? undefined : `${remoteProjectName}-e2e`,
+        standalone: options.standalone,
+        prefix: options.prefix,
+    });
+    let installTasks = [appInstallTask];
+    if (options.ssr) {
+        let ssrInstallTask = await (0, lib_1.addSsr)(tree, {
             appName: remoteProjectName,
-            mfType: 'remote',
-            routing: true,
-            host: options.host,
             port,
-            skipPackageJson: options.skipPackageJson,
-            skipFormat: true,
-            skipE2E,
-            e2eProjectName: skipE2E ? undefined : `${remoteProjectName}-e2e`,
             standalone: options.standalone,
-            prefix: options.prefix,
         });
-        let installTasks = [appInstallTask];
-        if (options.ssr) {
-            let ssrInstallTask = yield (0, lib_1.addSsr)(tree, {
-                appName: remoteProjectName,
-                port,
-                standalone: options.standalone,
-            });
-            installTasks.push(ssrInstallTask);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return (0, devkit_1.runTasksInSerial)(...installTasks);
-    });
+        installTasks.push(ssrInstallTask);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...installTasks);
 }
 exports.remoteInternal = remoteInternal;
 exports.default = remote;

package/src/generators/scam/lib/convert-component-to-scam.js

@@ -6,12 +6,11 @@ const js_1 = require("@nx/js");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
 function convertComponentToScam(tree, options) {
-    var _a;
     if (!tree.exists(options.filePath)) {
         throw new Error(`Couldn't find component at path ${options.filePath} to add SCAM setup.`);
     }
     const componentNames = (0, devkit_1.names)(options.name);
-    const typeNames = (0, devkit_1.names)((_a = options.type) !== null && _a !== void 0 ? _a : 'component');
+    const typeNames = (0, devkit_1.names)(options.type ?? 'component');
     const componentClassName = `${componentNames.className}${typeNames.className}`;
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();

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

@@ -3,11 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const path_1 = require("../../utils/path");
 function normalizeOptions(tree, options) {
-    var _a, _b, _c;
-    const { directory, fileName, filePath, name } = (0, path_1.normalizeNameAndPaths)(tree, Object.assign(Object.assign({}, options), { type: (_a = options.type) !== null && _a !== void 0 ? _a : 'component' }));
-    return Object.assign(Object.assign({}, options), { export: (_b = options.export) !== null && _b !== void 0 ? _b : true, inlineScam: (_c = options.inlineScam) !== null && _c !== void 0 ? _c : true, directory,
+    const { directory, fileName, filePath, name } = (0, path_1.normalizeNameAndPaths)(tree, {
+        ...options,
+        type: options.type ?? 'component',
+    });
+    return {
+        ...options,
+        export: options.export ?? true,
+        inlineScam: options.inlineScam ?? true,
+        directory,
         fileName,
         filePath,
-        name });
+        name,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/scam/scam.js

@@ -1,23 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scamGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const component_1 = require("../component/component");
 const export_scam_1 = require("../utils/export-scam");
 const lib_1 = require("./lib");
-function scamGenerator(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, lib_1.validateOptions)(tree, rawOptions);
-        const { inlineScam } = rawOptions, generatorOptions = tslib_1.__rest(rawOptions, ["inlineScam"]);
-        yield (0, component_1.componentGenerator)(tree, Object.assign(Object.assign({}, generatorOptions), { skipImport: true, export: false, standalone: false, skipFormat: true }));
-        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
-        (0, lib_1.convertComponentToScam)(tree, options);
-        (0, export_scam_1.exportScam)(tree, options);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
+async function scamGenerator(tree, rawOptions) {
+    (0, lib_1.validateOptions)(tree, rawOptions);
+    const { inlineScam, ...generatorOptions } = rawOptions;
+    await (0, component_1.componentGenerator)(tree, {
+        ...generatorOptions,
+        skipImport: true,
+        export: false,
+        standalone: false,
+        skipFormat: true,
     });
+    const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
+    (0, lib_1.convertComponentToScam)(tree, options);
+    (0, export_scam_1.exportScam)(tree, options);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.scamGenerator = scamGenerator;
 exports.default = scamGenerator;

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

@@ -3,12 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const path_1 = require("../../utils/path");
 function normalizeOptions(tree, options) {
-    var _a, _b, _c;
-    const { directory, fileName, filePath, name, path } = (0, path_1.normalizeNameAndPaths)(tree, Object.assign(Object.assign({}, options), { type: 'directive' }));
-    return Object.assign(Object.assign({}, options), { export: (_a = options.export) !== null && _a !== void 0 ? _a : true, flat: (_b = options.flat) !== null && _b !== void 0 ? _b : true, inlineScam: (_c = options.inlineScam) !== null && _c !== void 0 ? _c : true, directory,
+    const { directory, fileName, filePath, name, path } = (0, path_1.normalizeNameAndPaths)(tree, {
+        ...options,
+        type: 'directive',
+    });
+    return {
+        ...options,
+        export: options.export ?? true,
+        flat: options.flat ?? true,
+        inlineScam: options.inlineScam ?? true,
+        directory,
         fileName,
         filePath,
         path,
-        name });
+        name,
+    };
 }
 exports.normalizeOptions = normalizeOptions;