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

package/src/migrations/update-15-9-0/update-file-server-executor.js

@@ -1,46 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
-function updateFileServerExecutor(tree) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const oldExecutor = '@nrwl/angular:file-server';
-        const newExecutor = '@nrwl/web:file-server';
-        let needsNrwlWeb = false;
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        if (nxJson.targetDefaults) {
-            let nxJsonChanged = false;
-            for (const [targetName, target] of Object.entries(nxJson.targetDefaults)) {
-                if (target.executor === oldExecutor) {
-                    nxJson.targetDefaults[targetName].executor = newExecutor;
-                    nxJsonChanged = true;
-                    needsNrwlWeb = true;
-                }
-            }
-            if (nxJsonChanged) {
-                (0, devkit_1.updateNxJson)(tree, nxJson);
+async function updateFileServerExecutor(tree) {
+    const oldExecutor = '@nrwl/angular:file-server';
+    const newExecutor = '@nrwl/web:file-server';
+    let needsNrwlWeb = false;
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (nxJson.targetDefaults) {
+        let nxJsonChanged = false;
+        for (const [targetName, target] of Object.entries(nxJson.targetDefaults)) {
+            if (target.executor === oldExecutor) {
+                nxJson.targetDefaults[targetName].executor = newExecutor;
+                nxJsonChanged = true;
+                needsNrwlWeb = true;
             }
         }
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [projectName, project] of projects.entries()) {
-            let projectChanged = false;
-            for (const [targetName, target] of Object.entries((_a = project.targets) !== null && _a !== void 0 ? _a : {})) {
-                if (target.executor === oldExecutor) {
-                    project.targets[targetName].executor = newExecutor;
-                    projectChanged = true;
-                    needsNrwlWeb = true;
-                }
-            }
-            if (projectChanged) {
-                (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+        if (nxJsonChanged) {
+            (0, devkit_1.updateNxJson)(tree, nxJson);
+        }
+    }
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [projectName, project] of projects.entries()) {
+        let projectChanged = false;
+        for (const [targetName, target] of Object.entries(project.targets ?? {})) {
+            if (target.executor === oldExecutor) {
+                project.targets[targetName].executor = newExecutor;
+                projectChanged = true;
+                needsNrwlWeb = true;
             }
         }
-        if (needsNrwlWeb) {
-            (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/web': versions_1.nxVersion });
+        if (projectChanged) {
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+    }
+    if (needsNrwlWeb) {
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/web': versions_1.nxVersion });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = updateFileServerExecutor;

package/src/migrations/update-15-9-0/update-testing-tsconfig.js

@@ -1,31 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTestingTsconfigForJest = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function updateTestingTsconfigForJest(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const graph = yield (0, devkit_1.createProjectGraphAsync)();
-        const projects = (0, devkit_1.getProjects)(tree);
-        (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/jest:jest', (options, projectName) => {
-            const projectConfig = projects.get(projectName);
-            if (!isJestPresetAngular(tree, options.jestConfig)) {
-                return;
-            }
-            const tsconfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.spec.json');
-            if (tree.exists(tsconfigPath)) {
-                (0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
-                    var _a, _b;
-                    var _c;
-                    (_a = json.compilerOptions) !== null && _a !== void 0 ? _a : (json.compilerOptions = {});
-                    (_b = (_c = json.compilerOptions).target) !== null && _b !== void 0 ? _b : (_c.target = 'es2016');
-                    return json;
-                }, { expectComments: true, allowTrailingComma: true });
-            }
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+async function updateTestingTsconfigForJest(tree) {
+    const graph = await (0, devkit_1.createProjectGraphAsync)();
+    const projects = (0, devkit_1.getProjects)(tree);
+    (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/jest:jest', (options, projectName) => {
+        const projectConfig = projects.get(projectName);
+        if (!isJestPresetAngular(tree, options.jestConfig)) {
+            return;
+        }
+        const tsconfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.spec.json');
+        if (tree.exists(tsconfigPath)) {
+            (0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
+                json.compilerOptions ??= {};
+                json.compilerOptions.target ??= 'es2016';
+                return json;
+            }, { expectComments: true, allowTrailingComma: true });
+        }
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.updateTestingTsconfigForJest = updateTestingTsconfigForJest;
 function isJestPresetAngular(tree, jestConfigPath) {

package/src/migrations/update-16-0-0/remove-karma-defaults.js

@@ -1,29 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const GENERATORS = ['application', 'library', 'host', 'remote'];
 const CANDIDATE_GENERATOR_COLLECTIONS = ['@nrwl/angular', '@nx/angular'];
-function removeKarmaDefaults(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        if (nxJson.generators) {
-            const updatedConfig = updateUnitTestRunner(nxJson.generators);
-            if (updatedConfig) {
-                (0, devkit_1.updateNxJson)(tree, nxJson);
-            }
+async function removeKarmaDefaults(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (nxJson.generators) {
+        const updatedConfig = updateUnitTestRunner(nxJson.generators);
+        if (updatedConfig) {
+            (0, devkit_1.updateNxJson)(tree, nxJson);
         }
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [projectName, projectConfig] of projects) {
-            if (projectConfig.generators) {
-                const updatedProject = updateUnitTestRunner(projectConfig.generators);
-                if (updatedProject) {
-                    (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-                }
+    }
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [projectName, projectConfig] of projects) {
+        if (projectConfig.generators) {
+            const updatedProject = updateUnitTestRunner(projectConfig.generators);
+            if (updatedProject) {
+                (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
             }
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = removeKarmaDefaults;
 function updateUnitTestRunner(generatorsConfig) {

package/src/migrations/update-16-0-0/remove-library-generator-simple-module-name-option.js

@@ -1,41 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function removeLibraryGeneratorSimpleModuleNameOption(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        // update global config
-        const nxJsonUpdated = replaceSimpleModuleNameInConfig(nxJson);
-        if (nxJsonUpdated) {
-            (0, devkit_1.updateNxJson)(tree, nxJson);
-        }
-        // update project configs
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [name, project] of projects) {
-            const projectUpdated = replaceSimpleModuleNameInConfig(project);
-            if (projectUpdated) {
-                (0, devkit_1.updateProjectConfiguration)(tree, name, project);
-            }
+async function removeLibraryGeneratorSimpleModuleNameOption(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    // update global config
+    const nxJsonUpdated = replaceSimpleModuleNameInConfig(nxJson);
+    if (nxJsonUpdated) {
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+    // update project configs
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [name, project] of projects) {
+        const projectUpdated = replaceSimpleModuleNameInConfig(project);
+        if (projectUpdated) {
+            (0, devkit_1.updateProjectConfiguration)(tree, name, project);
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = removeLibraryGeneratorSimpleModuleNameOption;
 function replaceSimpleModuleNameInConfig(configObject) {
-    var _a, _b, _c, _d, _e;
-    var _f, _g;
-    if (!(configObject === null || configObject === void 0 ? void 0 : configObject.generators)) {
+    if (!configObject?.generators) {
         return false;
     }
     let updated = false;
-    if ((_b = (_a = configObject.generators['@nrwl/angular']) === null || _a === void 0 ? void 0 : _a['library']) === null || _b === void 0 ? void 0 : _b.simpleModuleName) {
-        (_c = (_f = configObject.generators['@nrwl/angular']['library']).simpleName) !== null && _c !== void 0 ? _c : (_f.simpleName = configObject.generators['@nrwl/angular']['library'].simpleModuleName);
+    if (configObject.generators['@nrwl/angular']?.['library']?.simpleModuleName) {
+        configObject.generators['@nrwl/angular']['library'].simpleName ??=
+            configObject.generators['@nrwl/angular']['library'].simpleModuleName;
         delete configObject.generators['@nrwl/angular']['library'].simpleModuleName;
         updated = true;
     }
-    else if ((_d = configObject.generators['@nrwl/angular:library']) === null || _d === void 0 ? void 0 : _d.simpleModuleName) {
-        (_e = (_g = configObject.generators['@nrwl/angular:library']).simpleName) !== null && _e !== void 0 ? _e : (_g.simpleName = configObject.generators['@nrwl/angular:library'].simpleModuleName);
+    else if (configObject.generators['@nrwl/angular:library']?.simpleModuleName) {
+        configObject.generators['@nrwl/angular:library'].simpleName ??=
+            configObject.generators['@nrwl/angular:library'].simpleModuleName;
         delete configObject.generators['@nrwl/angular:library'].simpleModuleName;
         updated = true;
     }

package/src/migrations/update-16-0-0/remove-protractor-defaults.js

@@ -1,29 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const GENERATORS = ['application', 'host', 'remote'];
 const CANDIDATE_GENERATOR_COLLECTIONS = ['@nrwl/angular', '@nx/angular'];
-function removeProtractorDefaults(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        if (nxJson.generators) {
-            const updatedConfig = updateE2ETestRunner(nxJson.generators);
-            if (updatedConfig) {
-                (0, devkit_1.updateNxJson)(tree, nxJson);
-            }
+async function removeProtractorDefaults(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (nxJson.generators) {
+        const updatedConfig = updateE2ETestRunner(nxJson.generators);
+        if (updatedConfig) {
+            (0, devkit_1.updateNxJson)(tree, nxJson);
         }
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [projectName, projectConfig] of projects) {
-            if (projectConfig.generators) {
-                const updatedProject = updateE2ETestRunner(projectConfig.generators);
-                if (updatedProject) {
-                    (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-                }
+    }
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [projectName, projectConfig] of projects) {
+        if (projectConfig.generators) {
+            const updatedProject = updateE2ETestRunner(projectConfig.generators);
+            if (updatedProject) {
+                (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
             }
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = removeProtractorDefaults;
 function updateE2ETestRunner(generatorsConfig) {

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-function replacePackage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/angular', '@nx/angular');
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/angular', '@nx/angular');
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = replacePackage;

package/src/migrations/update-16-1-0/extract-standalone-config-from-bootstrap.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const path_1 = require("path");
@@ -83,49 +82,46 @@ ${bootstrapCallFileContents.slice(0, appConfigNode.getStart())}appConfig${bootst
     }
     return newBootstrapCallFileContents;
 }
-function extractStandaloneConfig(tree) {
-    var _a, _b, _c;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (!tsModule) {
-            tsModule = (0, ensure_typescript_1.ensureTypescript)();
+async function extractStandaloneConfig(tree) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    if (!tsquery) {
+        tsquery = require('@phenomnomnominal/tsquery').tsquery;
+    }
+    const projects = await (0, projects_1.getProjectsFilteredByDependencies)(tree, [
+        'npm:@angular/core',
+    ]);
+    const BOOTSTRAP_APPLICATION_CALL_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication])';
+    const BOOTSTRAP_APPLICATION_CALL_CONFIG_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication]) > ObjectLiteralExpression';
+    for (const { project } of projects) {
+        if (project.projectType !== 'application') {
+            continue;
         }
-        if (!tsquery) {
-            tsquery = require('@phenomnomnominal/tsquery').tsquery;
+        if (project.targets?.build?.options?.main === undefined) {
+            continue;
         }
-        const projects = yield (0, projects_1.getProjectsFilteredByDependencies)(tree, [
-            'npm:@angular/core',
-        ]);
-        const BOOTSTRAP_APPLICATION_CALL_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication])';
-        const BOOTSTRAP_APPLICATION_CALL_CONFIG_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication]) > ObjectLiteralExpression';
-        for (const { project } of projects) {
-            if (project.projectType !== 'application') {
-                continue;
-            }
-            if (((_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.main) === undefined) {
-                continue;
-            }
-            const { bootstrapCallFilePath, bootstrapCallFileContents } = getBootstrapCallFileInfo(tree, project, project.targets.build.options.main);
-            const bootstrapCallFileContentsAst = tsquery.ast(bootstrapCallFileContents);
-            const nodes = tsquery(bootstrapCallFileContentsAst, BOOTSTRAP_APPLICATION_CALL_SELECTOR, { visitAllChildren: true });
-            if (nodes.length === 0) {
-                continue;
-            }
-            const importTokenMap = getImportTokenMap(bootstrapCallFileContentsAst);
-            const bootstrapCallNode = nodes[0];
-            const appConfigNodes = tsquery(bootstrapCallNode, BOOTSTRAP_APPLICATION_CALL_CONFIG_SELECTOR, { visitAllChildren: true });
-            if (appConfigNodes.length === 0) {
-                continue;
-            }
-            const appConfigNode = appConfigNodes[0];
-            const appConfigText = appConfigNode.getText();
-            const appConfigFilePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.config.ts');
-            const { appConfigImports, importsToRemoveFromSource } = getImportsRequiredForAppConfig(importTokenMap, appConfigNode, bootstrapCallFilePath, appConfigFilePath);
-            const appConfigFileContents = getAppConfigFileContents(appConfigImports, appConfigText);
-            tree.write(appConfigFilePath, appConfigFileContents);
-            let newBootstrapCallFileContents = getBootstrapCallFileContents(bootstrapCallFileContents, appConfigNode, importsToRemoveFromSource);
-            tree.write(bootstrapCallFilePath, newBootstrapCallFileContents);
+        const { bootstrapCallFilePath, bootstrapCallFileContents } = getBootstrapCallFileInfo(tree, project, project.targets.build.options.main);
+        const bootstrapCallFileContentsAst = tsquery.ast(bootstrapCallFileContents);
+        const nodes = tsquery(bootstrapCallFileContentsAst, BOOTSTRAP_APPLICATION_CALL_SELECTOR, { visitAllChildren: true });
+        if (nodes.length === 0) {
+            continue;
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+        const importTokenMap = getImportTokenMap(bootstrapCallFileContentsAst);
+        const bootstrapCallNode = nodes[0];
+        const appConfigNodes = tsquery(bootstrapCallNode, BOOTSTRAP_APPLICATION_CALL_CONFIG_SELECTOR, { visitAllChildren: true });
+        if (appConfigNodes.length === 0) {
+            continue;
+        }
+        const appConfigNode = appConfigNodes[0];
+        const appConfigText = appConfigNode.getText();
+        const appConfigFilePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.config.ts');
+        const { appConfigImports, importsToRemoveFromSource } = getImportsRequiredForAppConfig(importTokenMap, appConfigNode, bootstrapCallFilePath, appConfigFilePath);
+        const appConfigFileContents = getAppConfigFileContents(appConfigImports, appConfigText);
+        tree.write(appConfigFilePath, appConfigFileContents);
+        let newBootstrapCallFileContents = getBootstrapCallFileContents(bootstrapCallFileContents, appConfigNode, importsToRemoveFromSource);
+        tree.write(bootstrapCallFilePath, newBootstrapCallFileContents);
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = extractStandaloneConfig;

package/src/migrations/update-16-1-0/remove-ngcc-invocation.js

@@ -1,26 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-            var _a, _b;
-            if (!((_b = (_a = json.scripts) === null || _a === void 0 ? void 0 : _a.postinstall) === null || _b === void 0 ? void 0 : _b.includes('ngcc '))) {
-                return json;
-            }
-            json.scripts.postinstall = json.scripts.postinstall
-                // special case when ngcc is at the start so we remove the && as well
-                .replace(/^(ngcc.*?&& *)(.*)/, '$2')
-                // everything else
-                .replace(/(.*?)((&& *)?ngcc.*?)((?=&)|$)(.*)/, '$1$5')
-                .trim();
-            if (json.scripts.postinstall === '') {
-                json.scripts.postinstall = undefined;
-            }
+async function default_1(tree) {
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (!json.scripts?.postinstall?.includes('ngcc ')) {
             return json;
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+        }
+        json.scripts.postinstall = json.scripts.postinstall
+            // special case when ngcc is at the start so we remove the && as well
+            .replace(/^(ngcc.*?&& *)(.*)/, '$2')
+            // everything else
+            .replace(/(.*?)((&& *)?ngcc.*?)((?=&)|$)(.*)/, '$1$5')
+            .trim();
+        if (json.scripts.postinstall === '') {
+            json.scripts.postinstall = undefined;
+        }
+        return json;
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;

package/src/migrations/update-16-1-0/remove-render-module-platform-server-exports.js

@@ -1,64 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const ts = require("typescript");
 const file_change_recorder_1 = require("../../utils/file-change-recorder");
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, devkit_1.visitNotIgnoredFiles)(tree, '/', (path) => {
-            if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
-                const content = tree.read(path, 'utf8');
-                if (content.includes('@angular/platform-server') &&
-                    content.includes('renderModule')) {
-                    const source = ts.createSourceFile(path, content.toString().replace(/^\uFEFF/, ''), ts.ScriptTarget.Latest, true);
-                    let recorder;
-                    let printer;
-                    ts.forEachChild(source, function analyze(node) {
-                        if (!(ts.isExportDeclaration(node) &&
-                            node.moduleSpecifier &&
-                            ts.isStringLiteral(node.moduleSpecifier) &&
-                            node.moduleSpecifier.text === '@angular/platform-server' &&
-                            node.exportClause &&
-                            ts.isNamedExports(node.exportClause))) {
-                            // Not a @angular/platform-server named export.
-                            return;
-                        }
-                        const exportClause = node.exportClause;
-                        const newElements = [];
-                        for (const element of exportClause.elements) {
-                            if (element.name.text !== 'renderModule') {
-                                newElements.push(element);
-                            }
-                        }
-                        if (newElements.length === exportClause.elements.length) {
-                            // No changes
-                            return;
-                        }
-                        recorder !== null && recorder !== void 0 ? recorder : (recorder = new file_change_recorder_1.FileChangeRecorder(tree, path));
-                        if (newElements.length) {
-                            // Update named exports as there are leftovers.
-                            const newExportClause = ts.factory.updateNamedExports(exportClause, newElements);
-                            printer !== null && printer !== void 0 ? printer : (printer = ts.createPrinter());
-                            const fix = printer.printNode(ts.EmitHint.Unspecified, newExportClause, source);
-                            const index = exportClause.getStart();
-                            const length = exportClause.getWidth();
-                            recorder.remove(index, index + length);
-                            recorder.insertLeft(index, fix);
-                        }
-                        else {
-                            // Delete export as no exports remain.
-                            recorder.remove(node.getStart(), node.getStart() + node.getWidth());
+async function default_1(tree) {
+    (0, devkit_1.visitNotIgnoredFiles)(tree, '/', (path) => {
+        if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
+            const content = tree.read(path, 'utf8');
+            if (content.includes('@angular/platform-server') &&
+                content.includes('renderModule')) {
+                const source = ts.createSourceFile(path, content.toString().replace(/^\uFEFF/, ''), ts.ScriptTarget.Latest, true);
+                let recorder;
+                let printer;
+                ts.forEachChild(source, function analyze(node) {
+                    if (!(ts.isExportDeclaration(node) &&
+                        node.moduleSpecifier &&
+                        ts.isStringLiteral(node.moduleSpecifier) &&
+                        node.moduleSpecifier.text === '@angular/platform-server' &&
+                        node.exportClause &&
+                        ts.isNamedExports(node.exportClause))) {
+                        // Not a @angular/platform-server named export.
+                        return;
+                    }
+                    const exportClause = node.exportClause;
+                    const newElements = [];
+                    for (const element of exportClause.elements) {
+                        if (element.name.text !== 'renderModule') {
+                            newElements.push(element);
                         }
-                        ts.forEachChild(node, analyze);
-                    });
-                    if (recorder) {
-                        recorder.applyChanges();
                     }
+                    if (newElements.length === exportClause.elements.length) {
+                        // No changes
+                        return;
+                    }
+                    recorder ??= new file_change_recorder_1.FileChangeRecorder(tree, path);
+                    if (newElements.length) {
+                        // Update named exports as there are leftovers.
+                        const newExportClause = ts.factory.updateNamedExports(exportClause, newElements);
+                        printer ??= ts.createPrinter();
+                        const fix = printer.printNode(ts.EmitHint.Unspecified, newExportClause, source);
+                        const index = exportClause.getStart();
+                        const length = exportClause.getWidth();
+                        recorder.remove(index, index + length);
+                        recorder.insertLeft(index, fix);
+                    }
+                    else {
+                        // Delete export as no exports remain.
+                        recorder.remove(node.getStart(), node.getStart() + node.getWidth());
+                    }
+                    ts.forEachChild(node, analyze);
+                });
+                if (recorder) {
+                    recorder.applyChanges();
                 }
             }
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+        }
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;

package/src/migrations/update-16-1-0/update-angular-cli.js

@@ -1,27 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularCliVersion = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~16.0.0';
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let shouldFormat = false;
-        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-            var _a, _b;
-            if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) {
-                json.devDependencies['@angular/cli'] = exports.angularCliVersion;
-                shouldFormat = true;
-            }
-            else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
-                json.dependencies['@angular/cli'] = exports.angularCliVersion;
-                shouldFormat = true;
-            }
-            return json;
-        });
-        if (shouldFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
+async function default_1(tree) {
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
         }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
     });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.default = default_1;