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

package/src/generators/scam-directive/scam-directive.js

@@ -1,21 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scamDirectiveGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const directive_1 = require("../directive/directive");
 const export_scam_1 = require("../utils/export-scam");
 const lib_1 = require("./lib");
-function scamDirectiveGenerator(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, lib_1.validateOptions)(tree, rawOptions);
-        const { inlineScam } = rawOptions, directiveOptions = tslib_1.__rest(rawOptions, ["inlineScam"]);
-        yield (0, directive_1.directiveGenerator)(tree, Object.assign(Object.assign({}, directiveOptions), { skipImport: true, export: false, standalone: false, skipFormat: true }));
-        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
-        (0, lib_1.convertDirectiveToScam)(tree, options);
-        (0, export_scam_1.exportScam)(tree, options);
-        yield (0, devkit_1.formatFiles)(tree);
+async function scamDirectiveGenerator(tree, rawOptions) {
+    (0, lib_1.validateOptions)(tree, rawOptions);
+    const { inlineScam, ...directiveOptions } = rawOptions;
+    await (0, directive_1.directiveGenerator)(tree, {
+        ...directiveOptions,
+        skipImport: true,
+        export: false,
+        standalone: false,
+        skipFormat: true,
     });
+    const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
+    (0, lib_1.convertDirectiveToScam)(tree, options);
+    (0, export_scam_1.exportScam)(tree, options);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.scamDirectiveGenerator = scamDirectiveGenerator;
 exports.default = scamDirectiveGenerator;

package/src/generators/scam-pipe/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: 'pipe' }));
-    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: 'pipe',
+    });
+    return {
+        ...options,
+        export: options.export ?? true,
+        flat: options.flat ?? true,
+        inlineScam: options.inlineScam ?? true,
+        directory,
         fileName,
         filePath,
         name,
-        path });
+        path,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/scam-pipe/scam-pipe.js

@@ -1,21 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scamPipeGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const pipe_1 = require("../pipe/pipe");
 const export_scam_1 = require("../utils/export-scam");
 const lib_1 = require("./lib");
-function scamPipeGenerator(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, lib_1.validateOptions)(tree, rawOptions);
-        const { inlineScam } = rawOptions, pipeOptions = tslib_1.__rest(rawOptions, ["inlineScam"]);
-        yield (0, pipe_1.pipeGenerator)(tree, Object.assign(Object.assign({}, pipeOptions), { skipImport: true, export: false, standalone: false, skipFormat: true }));
-        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
-        (0, lib_1.convertPipeToScam)(tree, options);
-        (0, export_scam_1.exportScam)(tree, options);
-        yield (0, devkit_1.formatFiles)(tree);
+async function scamPipeGenerator(tree, rawOptions) {
+    (0, lib_1.validateOptions)(tree, rawOptions);
+    const { inlineScam, ...pipeOptions } = rawOptions;
+    await (0, pipe_1.pipeGenerator)(tree, {
+        ...pipeOptions,
+        skipImport: true,
+        export: false,
+        standalone: false,
+        skipFormat: true,
     });
+    const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
+    (0, lib_1.convertPipeToScam)(tree, options);
+    (0, export_scam_1.exportScam)(tree, options);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.scamPipeGenerator = scamPipeGenerator;
 exports.default = scamPipeGenerator;

package/src/generators/scam-to-standalone/scam-to-standalone.js

@@ -1,37 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scamToStandalone = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 const version_utils_1 = require("../utils/version-utils");
 const semver_1 = require("semver");
-function scamToStandalone(tree, { component, project: projectName, skipFormat }) {
-    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')) {
-            throw new Error((0, devkit_1.stripIndents) `This generator is only supported with Angular >= 14.1.0. You are currently using ${installedAngularVersionInfo.version}.
+async function scamToStandalone(tree, { component, project: projectName, skipFormat }) {
+    const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0')) {
+        throw new Error((0, devkit_1.stripIndents) `This generator is only supported with Angular >= 14.1.0. You are currently using ${installedAngularVersionInfo.version}.
     You can resolve this error by migrating to Angular 14.1.0.`);
-        }
-        const projects = (0, devkit_1.getProjects)(tree);
-        let project = (0, lib_1.getTargetProject)(projectName, projects);
-        const normalizedComponentPath = (0, devkit_1.joinPathFragments)(project.root, component);
-        if (!tree.exists(normalizedComponentPath)) {
-            throw new Error(`The path provided to the component (${normalizedComponentPath}) does not exist. Please ensure the correct path has been provided.`);
-        }
-        const { componentFileContents, componentAST, componentName } = (0, lib_1.getComponentDataFromAST)(tree, normalizedComponentPath);
-        const isInlineScam = (0, lib_1.verifyIsInlineScam)(componentAST);
-        if (!isInlineScam) {
-            throw new Error('This generator currently only supports inline SCAMs. We could not find an accompanying NgModule within the component file, please ensure the SCAM provided is an inline scam.');
-        }
-        const { moduleNodes, exportsArray, importsArray, declarationsArray, providersArray, moduleName, } = (0, lib_1.getModuleMetadataFromAST)(componentAST, componentFileContents);
-        (0, lib_1.verifyModuleIsScam)(exportsArray, componentName, declarationsArray);
-        (0, lib_1.convertScamToStandalone)(componentAST, componentFileContents, importsArray, providersArray, moduleNodes, tree, normalizedComponentPath, componentName);
-        (0, lib_1.replaceModuleUsagesWithComponent)(tree, moduleName, componentName);
-        if (!skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-    });
+    }
+    const projects = (0, devkit_1.getProjects)(tree);
+    let project = (0, lib_1.getTargetProject)(projectName, projects);
+    const normalizedComponentPath = (0, devkit_1.joinPathFragments)(project.root, component);
+    if (!tree.exists(normalizedComponentPath)) {
+        throw new Error(`The path provided to the component (${normalizedComponentPath}) does not exist. Please ensure the correct path has been provided.`);
+    }
+    const { componentFileContents, componentAST, componentName } = (0, lib_1.getComponentDataFromAST)(tree, normalizedComponentPath);
+    const isInlineScam = (0, lib_1.verifyIsInlineScam)(componentAST);
+    if (!isInlineScam) {
+        throw new Error('This generator currently only supports inline SCAMs. We could not find an accompanying NgModule within the component file, please ensure the SCAM provided is an inline scam.');
+    }
+    const { moduleNodes, exportsArray, importsArray, declarationsArray, providersArray, moduleName, } = (0, lib_1.getModuleMetadataFromAST)(componentAST, componentFileContents);
+    (0, lib_1.verifyModuleIsScam)(exportsArray, componentName, declarationsArray);
+    (0, lib_1.convertScamToStandalone)(componentAST, componentFileContents, importsArray, providersArray, moduleNodes, tree, normalizedComponentPath, componentName);
+    (0, lib_1.replaceModuleUsagesWithComponent)(tree, moduleName, componentName);
+    if (!skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.scamToStandalone = scamToStandalone;
 exports.default = scamToStandalone;

package/src/generators/setup-mf/lib/add-cypress-workaround.js

@@ -14,7 +14,7 @@ function addCypressOnErrorWorkaround(tree, schema) {
     try {
         e2eProject = (0, devkit_1.readProjectConfiguration)(tree, e2eProjectName);
     }
-    catch (_a) {
+    catch {
         devkit_1.logger.warn((0, devkit_1.stripIndents) `Could not find an associated e2e project for ${schema.appName} with name ${e2eProjectName}.
     If there is an associated e2e project for this application, and it uses Cypress, you will need to add a workaround to allow Cypress to test correctly.
     An error will be thrown in the console when you serve the application, coming from styles.js. It is an error that can be safely ignored and will not reach production due to how production builds of Angular are created.

package/src/generators/setup-mf/lib/add-remote-to-host.js

@@ -55,7 +55,10 @@ function addRemoteToStaticHost(tree, options, hostProject) {
 }
 function addRemoteToDynamicHost(tree, options, pathToMfManifest) {
     (0, devkit_1.updateJson)(tree, pathToMfManifest, (manifest) => {
-        return Object.assign(Object.assign({}, manifest), { [options.appName]: `http://localhost:${options.port}` });
+        return {
+            ...manifest,
+            [options.appName]: `http://localhost:${options.port}`,
+        };
     });
 }
 // TODO(colum): future work: allow dev to pass to path to routing module

package/src/generators/setup-mf/lib/change-build-target.js

@@ -5,12 +5,18 @@ const devkit_1 = require("@nx/devkit");
 function changeBuildTarget(host, options) {
     const appConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
     appConfig.targets.build.executor = '@nx/angular:webpack-browser';
-    appConfig.targets.build.options = Object.assign(Object.assign({}, appConfig.targets.build.options), { customWebpackConfig: {
+    appConfig.targets.build.options = {
+        ...appConfig.targets.build.options,
+        customWebpackConfig: {
             path: `${appConfig.root}/webpack.config.js`,
-        } });
-    appConfig.targets.build.configurations.production = Object.assign(Object.assign({}, appConfig.targets.build.configurations.production), { customWebpackConfig: {
+        },
+    };
+    appConfig.targets.build.configurations.production = {
+        ...appConfig.targets.build.configurations.production,
+        customWebpackConfig: {
             path: `${appConfig.root}/webpack.prod.config.js`,
-        } });
+        },
+    };
     (0, devkit_1.updateProjectConfiguration)(host, options.appName, appConfig);
 }
 exports.changeBuildTarget = changeBuildTarget;

package/src/generators/setup-mf/lib/generate-config.js

@@ -13,7 +13,7 @@ function generateWebpackConfig(tree, options, appRoot, remotesWithPorts) {
         tmpl: '',
         type: options.mfType,
         name: options.appName,
-        remotes: remotesWithPorts !== null && remotesWithPorts !== void 0 ? remotesWithPorts : [],
+        remotes: remotesWithPorts ?? [],
         projectRoot: appRoot,
         standalone: options.standalone,
     });

package/src/generators/setup-mf/lib/get-remotes-with-ports.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRemotesWithPorts = void 0;
 const devkit_1 = require("@nx/devkit");
 function getRemotesWithPorts(host, options) {
-    var _a, _b, _c;
     // If type is host and remotes supplied, check remotes exist
     const remotesWithPort = [];
     if (options.mfType === 'host' &&
@@ -13,7 +12,7 @@ function getRemotesWithPorts(host, options) {
             const remoteConfig = (0, devkit_1.readProjectConfiguration)(host, remote);
             remotesWithPort.push({
                 remoteName: remote,
-                port: (_c = (_b = (_a = remoteConfig.targets['serve']) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.port) !== null && _c !== void 0 ? _c : 4200,
+                port: remoteConfig.targets['serve']?.options?.port ?? 4200,
             });
         }
     }

package/src/generators/setup-mf/lib/normalize-options.js

@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const project_1 = require("../../utils/project");
 function normalizeOptions(tree, options) {
-    var _a, _b;
-    return Object.assign(Object.assign({}, options), { federationType: (_a = options.federationType) !== null && _a !== void 0 ? _a : 'static', prefix: (_b = options.prefix) !== null && _b !== void 0 ? _b : (0, project_1.getProjectPrefix)(tree, options.appName) });
+    return {
+        ...options,
+        federationType: options.federationType ?? 'static',
+        prefix: options.prefix ?? (0, project_1.getProjectPrefix)(tree, options.appName),
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/setup-mf/lib/set-tsconfig-target.js

@@ -5,6 +5,12 @@ const devkit_1 = require("@nx/devkit");
 function updateTsConfigTarget(tree, schema) {
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, schema.appName);
     // tsconfig.app.json
-    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(root, `tsconfig.app.json`), (json) => (Object.assign(Object.assign({}, json), { compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { target: 'ES2020' }) })));
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(root, `tsconfig.app.json`), (json) => ({
+        ...json,
+        compilerOptions: {
+            ...json.compilerOptions,
+            target: 'ES2020',
+        },
+    }));
 }
 exports.updateTsConfigTarget = updateTsConfigTarget;

package/src/generators/setup-mf/lib/setup-host-if-dynamic.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupHostIfDynamic = void 0;
 const devkit_1 = require("@nx/devkit");
 function setupHostIfDynamic(tree, options) {
-    var _a;
     if (options.federationType === 'static') {
         return;
     }
@@ -16,7 +15,7 @@ function setupHostIfDynamic(tree, options) {
     if (tree.exists(pathToProdWebpackConfig)) {
         tree.delete(pathToProdWebpackConfig);
     }
-    (_a = project.targets.build.configurations.production) === null || _a === void 0 ? true : delete _a.customWebpackConfig;
+    delete project.targets.build.configurations.production?.customWebpackConfig;
     (0, devkit_1.updateProjectConfiguration)(tree, options.appName, project);
 }
 exports.setupHostIfDynamic = setupHostIfDynamic;

package/src/generators/setup-mf/lib/setup-serve-target.js

@@ -3,11 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupServeTarget = void 0;
 const devkit_1 = require("@nx/devkit");
 function setupServeTarget(host, options) {
-    var _a, _b;
     const appConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
-    appConfig.targets['serve'] = Object.assign(Object.assign({}, appConfig.targets['serve']), { executor: options.mfType === 'host'
+    appConfig.targets['serve'] = {
+        ...appConfig.targets['serve'],
+        executor: options.mfType === 'host'
             ? '@nx/angular:module-federation-dev-server'
-            : '@nx/angular:webpack-dev-server', options: Object.assign(Object.assign({}, appConfig.targets['serve'].options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : undefined, publicHost: `http://localhost:${(_b = options.port) !== null && _b !== void 0 ? _b : 4200}` }) });
+            : '@nx/angular:webpack-dev-server',
+        options: {
+            ...appConfig.targets['serve'].options,
+            port: options.port ?? undefined,
+            publicHost: `http://localhost:${options.port ?? 4200}`,
+        },
+    };
     if (options.mfType === 'remote') {
         appConfig.targets['serve-static'] = {
             executor: '@nx/web:file-server',

package/src/generators/setup-mf/setup-mf.js

@@ -1,46 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupMf = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 const version_utils_1 = require("../utils/version-utils");
 const versions_1 = require("../../utils/versions");
 const semver_1 = require("semver");
-function setupMf(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const installedAngularInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-        if ((0, semver_1.lt)(installedAngularInfo.version, '14.1.0') && rawOptions.standalone) {
-            throw new Error(`The --standalone flag is not supported in your current version of Angular (${installedAngularInfo.version}). Please update to a version of Angular that supports Standalone Components (>= 14.1.0).`);
-        }
-        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
-        let installTask = () => { };
-        if (options.mfType === 'remote') {
-            (0, lib_1.addRemoteToHost)(tree, options);
-            (0, lib_1.addRemoteEntry)(tree, options, projectConfig.root);
-            (0, lib_1.removeDeadCodeFromRemote)(tree, options);
-            installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/web': versions_1.nxVersion });
-        }
-        const remotesWithPorts = (0, lib_1.getRemotesWithPorts)(tree, options);
-        (0, lib_1.generateWebpackConfig)(tree, options, projectConfig.root, remotesWithPorts);
-        (0, lib_1.changeBuildTarget)(tree, options);
-        (0, lib_1.updateTsConfigTarget)(tree, options);
-        (0, lib_1.setupServeTarget)(tree, options);
-        (0, lib_1.fixBootstrap)(tree, projectConfig.root, options);
-        if (options.mfType === 'host') {
-            (0, lib_1.setupHostIfDynamic)(tree, options);
-            (0, lib_1.updateHostAppRoutes)(tree, options);
-        }
-        if (!options.skipE2E) {
-            (0, lib_1.addCypressOnErrorWorkaround)(tree, options);
-        }
-        // format files
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return installTask;
-    });
+async function setupMf(tree, rawOptions) {
+    const installedAngularInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if ((0, semver_1.lt)(installedAngularInfo.version, '14.1.0') && rawOptions.standalone) {
+        throw new Error(`The --standalone flag is not supported in your current version of Angular (${installedAngularInfo.version}). Please update to a version of Angular that supports Standalone Components (>= 14.1.0).`);
+    }
+    const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
+    let installTask = () => { };
+    if (options.mfType === 'remote') {
+        (0, lib_1.addRemoteToHost)(tree, options);
+        (0, lib_1.addRemoteEntry)(tree, options, projectConfig.root);
+        (0, lib_1.removeDeadCodeFromRemote)(tree, options);
+        installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/web': versions_1.nxVersion });
+    }
+    const remotesWithPorts = (0, lib_1.getRemotesWithPorts)(tree, options);
+    (0, lib_1.generateWebpackConfig)(tree, options, projectConfig.root, remotesWithPorts);
+    (0, lib_1.changeBuildTarget)(tree, options);
+    (0, lib_1.updateTsConfigTarget)(tree, options);
+    (0, lib_1.setupServeTarget)(tree, options);
+    (0, lib_1.fixBootstrap)(tree, projectConfig.root, options);
+    if (options.mfType === 'host') {
+        (0, lib_1.setupHostIfDynamic)(tree, options);
+        (0, lib_1.updateHostAppRoutes)(tree, options);
+    }
+    if (!options.skipE2E) {
+        (0, lib_1.addCypressOnErrorWorkaround)(tree, options);
+    }
+    // format files
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return installTask;
 }
 exports.setupMf = setupMf;
 exports.default = setupMf;

package/src/generators/setup-ssr/lib/generate-files.js

@@ -10,18 +10,21 @@ function generateSSRFiles(tree, schema) {
     const projectRoot = projectConfig.root;
     const browserBundleOutputPath = projectConfig.targets.build.options.outputPath;
     const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(pathToFiles, 'base'), projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(pathToFiles, 'base'), projectRoot, {
+        ...schema,
+        tpl: '',
+    });
     if (schema.standalone) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, Object.assign(Object.assign({}, schema), { browserBundleOutputPath, tpl: '' }));
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
     }
     else {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, Object.assign(Object.assign({}, schema), { browserBundleOutputPath, tpl: '' }));
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
         const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
         if (angularMajorVersion < 15) {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'v14'), projectRoot, Object.assign(Object.assign({}, schema), { browserBundleOutputPath, tpl: '' }));
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'v14'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
         }
         if ((0, semver_1.lt)(angularVersion, '15.2.0')) {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, Object.assign(Object.assign({}, schema), { browserBundleOutputPath, tpl: '' }));
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
         }
     }
 }

package/src/generators/setup-ssr/lib/normalize-options.js

@@ -3,19 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 function normalizeOptions(tree, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const isStandaloneApp = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
     return {
         project: options.project,
-        appId: (_a = options.appId) !== null && _a !== void 0 ? _a : 'serverApp',
-        main: (_b = options.main) !== null && _b !== void 0 ? _b : 'main.server.ts',
-        serverFileName: (_c = options.serverFileName) !== null && _c !== void 0 ? _c : 'server.ts',
-        serverPort: (_d = options.serverPort) !== null && _d !== void 0 ? _d : 4000,
-        rootModuleFileName: (_e = options.rootModuleFileName) !== null && _e !== void 0 ? _e : 'app.server.module.ts',
-        rootModuleClassName: (_f = options.rootModuleClassName) !== null && _f !== void 0 ? _f : 'AppServerModule',
-        skipFormat: (_g = options.skipFormat) !== null && _g !== void 0 ? _g : false,
-        standalone: (_h = options.standalone) !== null && _h !== void 0 ? _h : isStandaloneApp,
-        hydration: (_j = options.hydration) !== null && _j !== void 0 ? _j : false,
+        appId: options.appId ?? 'serverApp',
+        main: options.main ?? 'main.server.ts',
+        serverFileName: options.serverFileName ?? 'server.ts',
+        serverPort: options.serverPort ?? 4000,
+        rootModuleFileName: options.rootModuleFileName ?? 'app.server.module.ts',
+        rootModuleClassName: options.rootModuleClassName ?? 'AppServerModule',
+        skipFormat: options.skipFormat ?? false,
+        standalone: options.standalone ?? isStandaloneApp,
+        hydration: options.hydration ?? false,
     };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/setup-ssr/lib/update-project-config.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectConfig = void 0;
 const devkit_1 = require("@nx/devkit");
 function updateProjectConfig(tree, schema) {
-    var _a;
     let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
     const buildTarget = projectConfig.targets.build;
     const baseOutputPath = buildTarget.options.outputPath;
@@ -18,7 +17,12 @@ function updateProjectConfig(tree, schema) {
     projectConfig.targets.server = {
         dependsOn: ['build'],
         executor: '@angular-devkit/build-angular:server',
-        options: Object.assign({ outputPath: (0, devkit_1.joinPathFragments)(baseOutputPath, 'server'), main: (0, devkit_1.joinPathFragments)(projectConfig.root, schema.serverFileName), tsConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.server.json') }, (buildTarget.options ? getServerOptions(buildTarget.options) : {})),
+        options: {
+            outputPath: (0, devkit_1.joinPathFragments)(baseOutputPath, 'server'),
+            main: (0, devkit_1.joinPathFragments)(projectConfig.root, schema.serverFileName),
+            tsConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.server.json'),
+            ...(buildTarget.options ? getServerOptions(buildTarget.options) : {}),
+        },
         configurations,
         defaultConfiguration: 'production',
     };
@@ -55,7 +59,7 @@ function updateProjectConfig(tree, schema) {
     };
     (0, devkit_1.updateProjectConfiguration)(tree, schema.project, projectConfig);
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    if (((_a = nxJson.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a.default) &&
+    if (nxJson.tasksRunnerOptions?.default &&
         !nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('server')) {
         nxJson.tasksRunnerOptions.default.options.cacheableOperations = [
             ...nxJson.tasksRunnerOptions.default.options.cacheableOperations,
@@ -67,20 +71,20 @@ function updateProjectConfig(tree, schema) {
 exports.updateProjectConfig = updateProjectConfig;
 function getServerOptions(options = {}) {
     return {
-        buildOptimizer: options === null || options === void 0 ? void 0 : options.buildOptimizer,
-        outputHashing: (options === null || options === void 0 ? void 0 : options.outputHashing) === 'all'
+        buildOptimizer: options?.buildOptimizer,
+        outputHashing: options?.outputHashing === 'all'
             ? 'media'
-            : options === null || options === void 0 ? void 0 : options.outputHashing,
-        fileReplacements: options === null || options === void 0 ? void 0 : options.fileReplacements,
-        optimization: (options === null || options === void 0 ? void 0 : options.optimization) === undefined ? undefined : !!(options === null || options === void 0 ? void 0 : options.optimization),
-        sourceMap: options === null || options === void 0 ? void 0 : options.sourceMap,
-        stylePreprocessorOptions: options === null || options === void 0 ? void 0 : options.stylePreprocessorOptions,
-        resourcesOutputPath: options === null || options === void 0 ? void 0 : options.resourcesOutputPath,
-        deployUrl: options === null || options === void 0 ? void 0 : options.deployUrl,
-        i18nMissingTranslation: options === null || options === void 0 ? void 0 : options.i18nMissingTranslation,
-        preserveSymlinks: options === null || options === void 0 ? void 0 : options.preserveSymlinks,
-        extractLicenses: options === null || options === void 0 ? void 0 : options.extractLicenses,
-        inlineStyleLanguage: options === null || options === void 0 ? void 0 : options.inlineStyleLanguage,
-        vendorChunk: options === null || options === void 0 ? void 0 : options.vendorChunk,
+            : options?.outputHashing,
+        fileReplacements: options?.fileReplacements,
+        optimization: options?.optimization === undefined ? undefined : !!options?.optimization,
+        sourceMap: options?.sourceMap,
+        stylePreprocessorOptions: options?.stylePreprocessorOptions,
+        resourcesOutputPath: options?.resourcesOutputPath,
+        deployUrl: options?.deployUrl,
+        i18nMissingTranslation: options?.i18nMissingTranslation,
+        preserveSymlinks: options?.preserveSymlinks,
+        extractLicenses: options?.extractLicenses,
+        inlineStyleLanguage: options?.inlineStyleLanguage,
+        vendorChunk: options?.vendorChunk,
     };
 }

package/src/generators/setup-ssr/setup-ssr.js

@@ -1,37 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsr = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
-function setupSsr(tree, schema) {
-    var _a, _b, _c, _d, _e, _f;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, lib_1.validateOptions)(tree, schema);
-        const options = (0, lib_1.normalizeOptions)(tree, schema);
-        (0, lib_1.updateProjectConfig)(tree, options);
-        (0, lib_1.generateSSRFiles)(tree, options);
-        if (!options.standalone) {
-            (0, lib_1.updateAppModule)(tree, options);
-        }
-        if (options.hydration) {
-            (0, lib_1.addHydration)(tree, options);
-        }
-        const pkgVersions = (0, version_utils_1.versions)(tree);
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            '@nguniversal/express-engine': (_b = (_a = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/express-engine')) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : pkgVersions.ngUniversalVersion,
-            '@angular/platform-server': (_d = (_c = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@angular/platform-server')) === null || _c === void 0 ? void 0 : _c.version) !== null && _d !== void 0 ? _d : pkgVersions.angularVersion,
-        }, {
-            '@nguniversal/builders': (_f = (_e = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/builders')) === null || _e === void 0 ? void 0 : _e.version) !== null && _f !== void 0 ? _f : pkgVersions.ngUniversalVersion,
-        });
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return () => {
-            (0, devkit_1.installPackagesTask)(tree);
-        };
+async function setupSsr(tree, schema) {
+    (0, lib_1.validateOptions)(tree, schema);
+    const options = (0, lib_1.normalizeOptions)(tree, schema);
+    (0, lib_1.updateProjectConfig)(tree, options);
+    (0, lib_1.generateSSRFiles)(tree, options);
+    if (!options.standalone) {
+        (0, lib_1.updateAppModule)(tree, options);
+    }
+    if (options.hydration) {
+        (0, lib_1.addHydration)(tree, options);
+    }
+    const pkgVersions = (0, version_utils_1.versions)(tree);
+    (0, devkit_1.addDependenciesToPackageJson)(tree, {
+        '@nguniversal/express-engine': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/express-engine')
+            ?.version ?? pkgVersions.ngUniversalVersion,
+        '@angular/platform-server': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@angular/platform-server')
+            ?.version ?? pkgVersions.angularVersion,
+    }, {
+        '@nguniversal/builders': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/builders')
+            ?.version ?? pkgVersions.ngUniversalVersion,
     });
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return () => {
+        (0, devkit_1.installPackagesTask)(tree);
+    };
 }
 exports.setupSsr = setupSsr;
 exports.default = setupSsr;

package/src/generators/setup-tailwind/lib/add-tailwind-config-path-to-project.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addTailwindConfigPathToProject = void 0;
 const devkit_1 = require("@nx/devkit");
 function addTailwindConfigPathToProject(tree, options, project) {
-    var _a, _b;
-    const buildTarget = (_a = project.targets) === null || _a === void 0 ? void 0 : _a[options.buildTarget];
+    const buildTarget = project.targets?.[options.buildTarget];
     if (!buildTarget) {
         throw new Error((0, devkit_1.stripIndents) `The target "${options.buildTarget}" was not found for project "${options.project}".
       If you are using a different build target, please provide it using the "--buildTarget" option.
@@ -22,12 +21,15 @@ function addTailwindConfigPathToProject(tree, options, project) {
             .map((e) => `"${e}"`)
             .join(', ')}.`);
     }
-    if (((_b = buildTarget.options) === null || _b === void 0 ? void 0 : _b.tailwindConfig) &&
+    if (buildTarget.options?.tailwindConfig &&
         tree.exists(buildTarget.options.tailwindConfig)) {
         throw new Error((0, devkit_1.stripIndents) `The "${buildTarget.options.tailwindConfig}" file is already configured for the project "${options.project}". Are you sure this is the right project to set up Tailwind?
       If you are sure, you can remove the configuration and re-run the generator.`);
     }
-    buildTarget.options = Object.assign(Object.assign({}, buildTarget.options), { tailwindConfig: (0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js') });
+    buildTarget.options = {
+        ...buildTarget.options,
+        tailwindConfig: (0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js'),
+    };
     (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
 }
 exports.addTailwindConfigPathToProject = addTailwindConfigPathToProject;