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

package/src/utils/async-iterable/tap-async-iteratable.js

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tapAsyncIterable = void 0;
-const tslib_1 = require("tslib");
 const map_async_iteratable_1 = require("./map-async-iteratable");
-function tapAsyncIterable(data, fn) {
-    return tslib_1.__asyncGenerator(this, arguments, function* tapAsyncIterable_1() {
-        return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, map_async_iteratable_1.mapAsyncIterable)(data, (x) => {
-            fn(x);
-            return x;
-        })))));
+async function* tapAsyncIterable(data, fn) {
+    return yield* (0, map_async_iteratable_1.mapAsyncIterable)(data, (x) => {
+        fn(x);
+        return x;
     });
 }
 exports.tapAsyncIterable = tapAsyncIterable;

package/src/utils/convert-nx-executor.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertNxExecutor = void 0;
-const tslib_1 = require("tslib");
 const nx_1 = require("../../nx");
 const { Workspaces, readNxJsonFromDisk, retrieveProjectConfigurationsWithAngularProjects, } = (0, nx_1.requireNx)();
 /**
@@ -17,11 +16,11 @@ function convertNxExecutor(executor) {
             ? readNxJsonFromDisk(builderContext.workspaceRoot)
             : // TODO(v18): remove readNxJson. This is to be backwards compatible with Nx 16.5 and below.
                 workspaces.readNxJson();
-        const promise = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const promise = async () => {
             const projectsConfigurations = retrieveProjectConfigurationsWithAngularProjects
                 ? {
                     version: 2,
-                    projects: yield retrieveProjectConfigurationsWithAngularProjects(builderContext.workspaceRoot, nxJsonConfiguration).then((p) => p.projectNodes),
+                    projects: await retrieveProjectConfigurationsWithAngularProjects(builderContext.workspaceRoot, nxJsonConfiguration).then((p) => p.projectNodes),
                 }
                 : // TODO(v18): remove retrieveProjectConfigurations. This is to be backwards compatible with Nx 16.5 and below.
                     workspaces.readProjectsConfigurations({
@@ -41,7 +40,7 @@ function convertNxExecutor(executor) {
                 isVerbose: false,
             };
             return executor(options, context);
-        });
+        };
         return toObservable(promise());
     };
     return require('@angular-devkit/architect').createBuilder(builderFunction);

package/src/utils/get-workspace-layout.js

@@ -15,12 +15,13 @@ const { readNxJson } = (0, nx_1.requireNx)();
  * @param tree - file system tree
  */
 function getWorkspaceLayout(tree) {
-    var _a, _b, _c, _d;
     const nxJson = readNxJson(tree);
     return {
-        appsDir: (_b = (_a = nxJson === null || nxJson === void 0 ? void 0 : nxJson.workspaceLayout) === null || _a === void 0 ? void 0 : _a.appsDir) !== null && _b !== void 0 ? _b : inOrderOfPreference(tree, ['apps', 'packages'], '.'),
-        libsDir: (_d = (_c = nxJson === null || nxJson === void 0 ? void 0 : nxJson.workspaceLayout) === null || _c === void 0 ? void 0 : _c.libsDir) !== null && _d !== void 0 ? _d : inOrderOfPreference(tree, ['libs', 'packages'], '.'),
-        npmScope: nxJson === null || nxJson === void 0 ? void 0 : nxJson.npmScope,
+        appsDir: nxJson?.workspaceLayout?.appsDir ??
+            inOrderOfPreference(tree, ['apps', 'packages'], '.'),
+        libsDir: nxJson?.workspaceLayout?.libsDir ??
+            inOrderOfPreference(tree, ['libs', 'packages'], '.'),
+        npmScope: nxJson?.npmScope,
         standaloneAsDefault: true,
     };
 }

package/src/utils/invoke-nx-generator.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertNxGenerator = void 0;
-const tslib_1 = require("tslib");
 const path_1 = require("path");
 const nx_1 = require("../../nx");
 let { logger, stripIndent } = (0, nx_1.requireNx)();
 // TODO: Remove this in Nx 18 when Nx 16.7.0 is no longer supported
-stripIndent = stripIndent !== null && stripIndent !== void 0 ? stripIndent : require('nx/src/utils/logger').stripIndent;
+stripIndent = stripIndent ?? require('nx/src/utils/logger').stripIndent;
 class RunCallbackTask {
     constructor(callback) {
         this.callback = callback;
@@ -24,9 +23,9 @@ function createRunCallbackTask() {
     return {
         name: 'RunCallback',
         create: () => {
-            return Promise.resolve(({ callback }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                yield callback();
-            }));
+            return Promise.resolve(async ({ callback }) => {
+                await callback();
+            });
         },
     };
 }
@@ -43,7 +42,7 @@ exports.convertNxGenerator = convertNxGenerator;
  * Create a Rule to invoke an Nx Generator
  */
 function invokeNxGenerator(generator, options, skipWritingConfigInOldFormat) {
-    return (tree, context) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+    return async (tree, context) => {
         if (context.engine.workflow) {
             const engineHost = context.engine.workflow.engineHost;
             engineHost.registerTaskExecutor(createRunCallbackTask());
@@ -52,7 +51,7 @@ function invokeNxGenerator(generator, options, skipWritingConfigInOldFormat) {
             ? context.engine.workflow.engineHost.paths[1]
             : tree.root.path;
         const adapterTree = new DevkitTreeFromAngularDevkitTree(tree, root, skipWritingConfigInOldFormat);
-        const result = yield generator(adapterTree, options);
+        const result = await generator(adapterTree, options);
         if (!result) {
             return adapterTree['tree'];
         }
@@ -61,7 +60,7 @@ function invokeNxGenerator(generator, options, skipWritingConfigInOldFormat) {
                 context.addTask(new RunCallbackTask(result));
             }
         }
-    });
+    };
 }
 const actionToFileChangeMap = {
     c: 'CREATE',
@@ -86,7 +85,7 @@ class DevkitTreeFromAngularDevkitTree {
                 this._root = '/virtual';
             }
         }
-        catch (_a) { }
+        catch { }
     }
     get root() {
         return this._root;
@@ -153,7 +152,7 @@ class DevkitTreeFromAngularDevkitTree {
         this.tree.rename(from, to);
     }
     write(filePath, content, options) {
-        if (options === null || options === void 0 ? void 0 : options.mode) {
+        if (options?.mode) {
             this.warnUnsupportedFilePermissionsChange(filePath, options.mode);
         }
         if (this.tree.exists(filePath)) {

package/src/utils/module-federation/dependencies.js

@@ -14,12 +14,11 @@ function collectDependencies(projectGraph, name, dependencies = {
     workspaceLibraries: new Map(),
     npmPackages: new Set(),
 }, seen = new Set()) {
-    var _a;
     if (seen.has(name)) {
         return dependencies;
     }
     seen.add(name);
-    ((_a = projectGraph.dependencies[name]) !== null && _a !== void 0 ? _a : []).forEach((dependency) => {
+    (projectGraph.dependencies[name] ?? []).forEach((dependency) => {
         if (dependency.target.startsWith('npm:')) {
             dependencies.npmPackages.add(dependency.target.replace('npm:', ''));
         }

package/src/utils/module-federation/secondary-entry-points.js

@@ -7,7 +7,8 @@ const nx_1 = require("../../../nx");
 let { readJsonFile, joinPathFragments, workspaceRoot, readModulePackageJson } = (0, nx_1.requireNx)();
 // TODO: Remove this in Nx 18 when Nx 16.7.0 is no longer supported
 readModulePackageJson =
-    readModulePackageJson !== null && readModulePackageJson !== void 0 ? readModulePackageJson : require('nx/src/utils/package-json').readModulePackageJson;
+    readModulePackageJson ??
+        require('nx/src/utils/package-json').readModulePackageJson;
 function collectWorkspaceLibrarySecondaryEntryPoints(library, tsconfigPathAliases) {
     const libraryRoot = (0, path_1.join)(workspaceRoot, library.root);
     const needsSecondaryEntryPointsCollected = (0, fs_1.existsSync)((0, path_1.join)(libraryRoot, 'ng-package.json'));
@@ -15,10 +16,10 @@ function collectWorkspaceLibrarySecondaryEntryPoints(library, tsconfigPathAliase
     if (needsSecondaryEntryPointsCollected) {
         const tsConfigAliasesForLibWithSecondaryEntryPoints = Object.entries(tsconfigPathAliases).reduce((acc, [tsKey, tsPaths]) => {
             if (!tsKey.startsWith(library.importKey)) {
-                return Object.assign({}, acc);
+                return { ...acc };
             }
             if (tsPaths.some((path) => path.startsWith(`${library.root}/`))) {
-                acc = Object.assign(Object.assign({}, acc), { [tsKey]: tsPaths });
+                acc = { ...acc, [tsKey]: tsPaths };
             }
             return acc;
         }, {});
@@ -60,7 +61,7 @@ function recursivelyCollectSecondaryEntryPointsFromDirectory(pkgName, pkgVersion
                     collectedPackages.push({ name, version: pkgVersion });
                 }
             }
-            catch (_a) { }
+            catch { }
         }
         else if (mainEntryPointExports) {
             // if the package.json doesn't exist, check if the directory is
@@ -87,7 +88,7 @@ function collectPackageSecondaryEntryPoints(pkgName, pkgVersion, collectedPackag
         ({ path: packageJsonPath, packageJson } = readModulePackageJson(pkgName));
         pathToPackage = (0, path_1.dirname)(packageJsonPath);
     }
-    catch (_a) {
+    catch {
         // the package.json might not resolve if the package has the "exports"
         // entry and is not exporting the package.json file, fall back to trying
         // to find it from the top-level node_modules

package/src/utils/module-federation/share.js

@@ -14,9 +14,7 @@ const { workspaceRoot, logger } = (0, nx_1.requireNx)();
  * @param libraries - The Nx Workspace Libraries to share
  * @param tsConfigPath - The path to TS Config File that contains the Path Mappings for the Libraries
  */
-function shareWorkspaceLibraries(libraries, tsConfigPath) {
-    var _a;
-    if (tsConfigPath === void 0) { tsConfigPath = (_a = process.env.NX_TSCONFIG_PATH) !== null && _a !== void 0 ? _a : (0, typescript_1.getRootTsConfigPath)(); }
+function shareWorkspaceLibraries(libraries, tsConfigPath = process.env.NX_TSCONFIG_PATH ?? (0, typescript_1.getRootTsConfigPath)()) {
     if (!libraries) {
         return getEmptySharedLibrariesConfig();
     }
@@ -43,8 +41,11 @@ function shareWorkspaceLibraries(libraries, tsConfigPath) {
     }
     const webpack = require('webpack');
     return {
-        getAliases: () => pathMappings.reduce((aliases, library) => (Object.assign(Object.assign({}, aliases), { [library.name]: library.path })), {}),
-        getLibraries: (eager) => pathMappings.reduce((libraries, library) => (Object.assign(Object.assign({}, libraries), { [library.name]: { requiredVersion: false, eager } })), {}),
+        getAliases: () => pathMappings.reduce((aliases, library) => ({ ...aliases, [library.name]: library.path }), {}),
+        getLibraries: (eager) => pathMappings.reduce((libraries, library) => ({
+            ...libraries,
+            [library.name]: { requiredVersion: false, eager },
+        }), {}),
         getReplacementPlugin: () => new webpack.NormalModuleReplacementPlugin(/./, (req) => {
             if (!req.request.startsWith('.')) {
                 return;
@@ -89,8 +90,7 @@ function sharePackages(packages) {
     const pkgJson = (0, package_json_1.readRootPackageJson)();
     const allPackages = [];
     packages.forEach((pkg) => {
-        var _a, _b, _c;
-        const pkgVersion = (_b = (_a = pkgJson.dependencies) === null || _a === void 0 ? void 0 : _a[pkg]) !== null && _b !== void 0 ? _b : (_c = pkgJson.devDependencies) === null || _c === void 0 ? void 0 : _c[pkg];
+        const pkgVersion = pkgJson.dependencies?.[pkg] ?? pkgJson.devDependencies?.[pkg];
         allPackages.push({ name: pkg, version: pkgVersion });
         (0, secondary_entry_points_1.collectPackageSecondaryEntryPoints)(pkg, pkgVersion, allPackages);
     });
@@ -157,13 +157,13 @@ function applyAdditionalShared(sharedConfig, additionalShared, projectGraph) {
 }
 exports.applyAdditionalShared = applyAdditionalShared;
 function addStringDependencyToSharedConfig(sharedConfig, dependency, projectGraph) {
-    var _a, _b, _c, _d;
     if (projectGraph.nodes[dependency]) {
         sharedConfig[dependency] = { requiredVersion: false };
     }
-    else if ((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[`npm:${dependency}`]) {
+    else if (projectGraph.externalNodes?.[`npm:${dependency}`]) {
         const pkgJson = (0, package_json_1.readRootPackageJson)();
-        const config = getNpmPackageSharedConfig(dependency, (_c = (_b = pkgJson.dependencies) === null || _b === void 0 ? void 0 : _b[dependency]) !== null && _c !== void 0 ? _c : (_d = pkgJson.devDependencies) === null || _d === void 0 ? void 0 : _d[dependency]);
+        const config = getNpmPackageSharedConfig(dependency, pkgJson.dependencies?.[dependency] ??
+            pkgJson.devDependencies?.[dependency]);
         if (!config) {
             return;
         }

package/src/utils/module-federation/typescript.js

@@ -7,15 +7,13 @@ const nx_1 = require("../../../nx");
 const { workspaceRoot } = (0, nx_1.requireNx)();
 let tsConfig;
 let tsPathMappings;
-function readTsPathMappings(tsConfigPath) {
-    var _a, _b, _c;
-    if (tsConfigPath === void 0) { tsConfigPath = (_a = process.env.NX_TSCONFIG_PATH) !== null && _a !== void 0 ? _a : getRootTsConfigPath(); }
+function readTsPathMappings(tsConfigPath = process.env.NX_TSCONFIG_PATH ?? getRootTsConfigPath()) {
     if (tsPathMappings) {
         return tsPathMappings;
     }
-    tsConfig !== null && tsConfig !== void 0 ? tsConfig : (tsConfig = readTsConfiguration(tsConfigPath));
+    tsConfig ??= readTsConfiguration(tsConfigPath);
     tsPathMappings = {};
-    Object.entries((_c = (_b = tsConfig.options) === null || _b === void 0 ? void 0 : _b.paths) !== null && _c !== void 0 ? _c : {}).forEach(([alias, paths]) => {
+    Object.entries(tsConfig.options?.paths ?? {}).forEach(([alias, paths]) => {
         tsPathMappings[alias] = paths.map((path) => path.replace(/^\.\//, ''));
     });
     return tsPathMappings;

package/src/utils/package-json.js

@@ -23,23 +23,21 @@ function filterExistingDependencies(dependencies, existingAltDependencies) {
     if (!existingAltDependencies) {
         return dependencies;
     }
-    return Object.keys(dependencies !== null && dependencies !== void 0 ? dependencies : {})
+    return Object.keys(dependencies ?? {})
         .filter((d) => !existingAltDependencies[d])
-        .reduce((acc, d) => (Object.assign(Object.assign({}, acc), { [d]: dependencies[d] })), {});
+        .reduce((acc, d) => ({ ...acc, [d]: dependencies[d] }), {});
 }
 function cleanSemver(version) {
-    var _a;
-    return (_a = (0, semver_1.clean)(version)) !== null && _a !== void 0 ? _a : (0, semver_1.coerce)(version);
+    return (0, semver_1.clean)(version) ?? (0, semver_1.coerce)(version);
 }
 function isIncomingVersionGreater(incomingVersion, existingVersion) {
-    var _a, _b, _c, _d;
     // if version is in the format of "latest", "next" or similar - keep it, otherwise try to parse it
     const incomingVersionCompareBy = incomingVersion in NON_SEMVER_TAGS
         ? incomingVersion
-        : (_b = (_a = cleanSemver(incomingVersion)) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : UNIDENTIFIED_VERSION;
+        : cleanSemver(incomingVersion)?.toString() ?? UNIDENTIFIED_VERSION;
     const existingVersionCompareBy = existingVersion in NON_SEMVER_TAGS
         ? existingVersion
-        : (_d = (_c = cleanSemver(existingVersion)) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : UNIDENTIFIED_VERSION;
+        : cleanSemver(existingVersion)?.toString() ?? UNIDENTIFIED_VERSION;
     if (incomingVersionCompareBy in NON_SEMVER_TAGS &&
         existingVersionCompareBy in NON_SEMVER_TAGS) {
         return (NON_SEMVER_TAGS[incomingVersionCompareBy] >
@@ -61,7 +59,7 @@ function updateExistingAltDependenciesVersion(dependencies, existingAltDependenc
         const existingVersion = existingAltDependencies[d];
         return isIncomingVersionGreater(incomingVersion, existingVersion);
     })
-        .reduce((acc, d) => (Object.assign(Object.assign({}, acc), { [d]: dependencies[d] })), {});
+        .reduce((acc, d) => ({ ...acc, [d]: dependencies[d] }), {});
 }
 function updateExistingDependenciesVersion(dependencies, existingDependencies = {}) {
     return Object.keys(dependencies)
@@ -73,7 +71,7 @@ function updateExistingDependenciesVersion(dependencies, existingDependencies =
         const existingVersion = existingDependencies[d];
         return isIncomingVersionGreater(incomingVersion, existingVersion);
     })
-        .reduce((acc, d) => (Object.assign(Object.assign({}, acc), { [d]: dependencies[d] })), {});
+        .reduce((acc, d) => ({ ...acc, [d]: dependencies[d] }), {});
 }
 /**
  * Add Dependencies and Dev Dependencies to package.json
@@ -100,14 +98,26 @@ function addDependenciesToPackageJson(tree, dependencies, devDependencies, packa
     // - dependencies of the same type that are not present
     // - dependencies of the same type that have greater version
     // - specified dependencies of the other type that have greater version and are already installed as current type
-    filteredDependencies = Object.assign(Object.assign({}, updateExistingDependenciesVersion(filteredDependencies, currentPackageJson.dependencies)), updateExistingAltDependenciesVersion(devDependencies, currentPackageJson.dependencies));
-    filteredDevDependencies = Object.assign(Object.assign({}, updateExistingDependenciesVersion(filteredDevDependencies, currentPackageJson.devDependencies)), updateExistingAltDependenciesVersion(dependencies, currentPackageJson.devDependencies));
+    filteredDependencies = {
+        ...updateExistingDependenciesVersion(filteredDependencies, currentPackageJson.dependencies),
+        ...updateExistingAltDependenciesVersion(devDependencies, currentPackageJson.dependencies),
+    };
+    filteredDevDependencies = {
+        ...updateExistingDependenciesVersion(filteredDevDependencies, currentPackageJson.devDependencies),
+        ...updateExistingAltDependenciesVersion(dependencies, currentPackageJson.devDependencies),
+    };
     filteredDependencies = removeLowerVersions(filteredDependencies, currentPackageJson.dependencies);
     filteredDevDependencies = removeLowerVersions(filteredDevDependencies, currentPackageJson.devDependencies);
     if (requiresAddingOfPackages(currentPackageJson, filteredDependencies, filteredDevDependencies)) {
         updateJson(tree, packageJsonPath, (json) => {
-            json.dependencies = Object.assign(Object.assign({}, (json.dependencies || {})), filteredDependencies);
-            json.devDependencies = Object.assign(Object.assign({}, (json.devDependencies || {})), filteredDevDependencies);
+            json.dependencies = {
+                ...(json.dependencies || {}),
+                ...filteredDependencies,
+            };
+            json.devDependencies = {
+                ...(json.devDependencies || {}),
+                ...filteredDevDependencies,
+            };
             json.dependencies = sortObjectByKeys(json.dependencies);
             json.devDependencies = sortObjectByKeys(json.devDependencies);
             return json;
@@ -124,11 +134,11 @@ exports.addDependenciesToPackageJson = addDependenciesToPackageJson;
  **/
 function removeLowerVersions(incomingDeps, existingDeps) {
     return Object.keys(incomingDeps).reduce((acc, d) => {
-        if ((existingDeps === null || existingDeps === void 0 ? void 0 : existingDeps[d]) &&
+        if (existingDeps?.[d] &&
             !isIncomingVersionGreater(incomingDeps[d], existingDeps[d])) {
             return acc;
         }
-        return Object.assign(Object.assign({}, acc), { [d]: incomingDeps[d] });
+        return { ...acc, [d]: incomingDeps[d] };
     }, {});
 }
 /**
@@ -171,7 +181,10 @@ function sortObjectByKeys(obj) {
     return Object.keys(obj)
         .sort()
         .reduce((result, key) => {
-        return Object.assign(Object.assign({}, result), { [key]: obj[key] });
+        return {
+            ...result,
+            [key]: obj[key],
+        };
     }, {});
 }
 /**
@@ -232,7 +245,6 @@ function requiresRemovingOfPackages(packageJsonFile, deps, devDeps) {
 }
 const packageMapCache = new Map();
 function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion, _) {
-    var _a;
     let pkg;
     let requiredVersion;
     if (typeof pkgOrTree === 'string') {
@@ -263,7 +275,7 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
     if (process.env.NX_DRY_RUN && process.env.NX_DRY_RUN !== 'false') {
         throw new Error('NOTE: This generator does not support --dry-run. If you are running this in Nx Console, it should execute fine once you hit the "Run" button.\n');
     }
-    const { dir: tempDir } = (_a = createTempNpmDirectory === null || createTempNpmDirectory === void 0 ? void 0 : createTempNpmDirectory()) !== null && _a !== void 0 ? _a : {
+    const { dir: tempDir } = createTempNpmDirectory?.() ?? {
         dir: (0, tmp_1.dirSync)().name,
     };
     console.log(`Fetching ${pkg}...`);

package/src/utils/replace-package.js

@@ -21,12 +21,11 @@ function replacePackageInDependencies(tree, oldPackageName, newPackageName) {
         }
         try {
             updateJson(tree, path, (packageJson) => {
-                var _a, _b, _c, _d;
                 for (const deps of [
-                    (_a = packageJson.dependencies) !== null && _a !== void 0 ? _a : {},
-                    (_b = packageJson.devDependencies) !== null && _b !== void 0 ? _b : {},
-                    (_c = packageJson.peerDependencies) !== null && _c !== void 0 ? _c : {},
-                    (_d = packageJson.optionalDependencies) !== null && _d !== void 0 ? _d : {},
+                    packageJson.dependencies ?? {},
+                    packageJson.devDependencies ?? {},
+                    packageJson.peerDependencies ?? {},
+                    packageJson.optionalDependencies ?? {},
                 ]) {
                     if (oldPackageName in deps) {
                         deps[newPackageName] = deps[oldPackageName];
@@ -42,11 +41,10 @@ function replacePackageInDependencies(tree, oldPackageName, newPackageName) {
     });
 }
 function replacePackageInProjectConfigurations(tree, oldPackageName, newPackageName) {
-    var _a, _b;
     const projects = getProjects(tree);
     for (const [projectName, projectConfiguration] of projects) {
         let needsUpdate = false;
-        for (const [targetName, targetConfig] of Object.entries((_a = projectConfiguration.targets) !== null && _a !== void 0 ? _a : {})) {
+        for (const [targetName, targetConfig] of Object.entries(projectConfiguration.targets ?? {})) {
             if (!targetConfig.executor) {
                 continue;
             }
@@ -57,7 +55,7 @@ function replacePackageInProjectConfigurations(tree, oldPackageName, newPackageN
                     newPackageName + ':' + executorName;
             }
         }
-        for (const [collection, collectionDefaults] of Object.entries((_b = projectConfiguration.generators) !== null && _b !== void 0 ? _b : {})) {
+        for (const [collection, collectionDefaults] of Object.entries(projectConfiguration.generators ?? {})) {
             if (collection === oldPackageName) {
                 needsUpdate = true;
                 projectConfiguration.generators[newPackageName] = collectionDefaults;
@@ -70,13 +68,12 @@ function replacePackageInProjectConfigurations(tree, oldPackageName, newPackageN
     }
 }
 function replacePackageInNxJson(tree, oldPackageName, newPackageName) {
-    var _a, _b;
     if (!tree.exists('nx.json')) {
         return;
     }
     const nxJson = readNxJson(tree);
     let needsUpdate = false;
-    for (const [targetName, targetConfig] of Object.entries((_a = nxJson.targetDefaults) !== null && _a !== void 0 ? _a : {})) {
+    for (const [targetName, targetConfig] of Object.entries(nxJson.targetDefaults ?? {})) {
         if (!targetConfig.executor) {
             continue;
         }
@@ -87,7 +84,7 @@ function replacePackageInNxJson(tree, oldPackageName, newPackageName) {
                 newPackageName + ':' + executorName;
         }
     }
-    for (const [collection, collectionDefaults] of Object.entries((_b = nxJson.generators) !== null && _b !== void 0 ? _b : {})) {
+    for (const [collection, collectionDefaults] of Object.entries(nxJson.generators ?? {})) {
         if (collection === oldPackageName) {
             needsUpdate = true;
             nxJson.generators[newPackageName] = collectionDefaults;
@@ -119,7 +116,7 @@ function replaceMentions(tree, oldPackageName, newPackageName) {
             }
             tree.write(path, contents.replace(new RegExp(oldPackageName, 'g'), newPackageName));
         }
-        catch (_a) {
+        catch {
             // Its **probably** ok, contents can be null if the file is too large or
             // there was an access exception.
             logger.warn(`An error was thrown when trying to update ${path}. If you believe the migration should have updated it, be sure to review the file and open an issue.`);