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

package/src/migrations/update-14-2-0/update-ngcc-target.js

@@ -1,21 +1,17 @@
 "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* () {
-        let shouldFormat = false;
-        (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 ')) {
-                json.scripts.postinstall = json.scripts.postinstall.replace(/(.*)(ngcc --properties es2015 )(.*)/, '$1ngcc --properties es2020 $3');
-                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.scripts?.postinstall?.includes('ngcc ')) {
+            json.scripts.postinstall = json.scripts.postinstall.replace(/(.*)(ngcc --properties es2015 )(.*)/, '$1ngcc --properties es2020 $3');
+            shouldFormat = true;
         }
+        return json;
     });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.default = default_1;

package/src/migrations/update-14-2-0/update-router-initial-navigation.js

@@ -1,36 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const typescript_1 = require("typescript");
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const printer = (0, typescript_1.createPrinter)();
-        const projects = yield getProjectsWithAngularRouter(tree);
-        for (const project of projects) {
-            (0, devkit_1.visitNotIgnoredFiles)(tree, project.root, (filePath) => {
-                // we are only interested in .ts files
-                if (!filePath.endsWith('.ts')) {
-                    return;
-                }
-                const content = tree.read(filePath, 'utf-8');
-                const ast = tsquery_1.tsquery.ast(content);
-                const routerModuleForRootCall = getRouterModuleForRootCall(ast);
-                if (!routerModuleForRootCall) {
-                    return;
-                }
-                const initialNavigationAssignment = getInitialNavigationAssignment(routerModuleForRootCall.arguments[1]);
-                if (!initialNavigationAssignment) {
-                    return;
-                }
-                const updatedInitialNavigationAssignment = printer.printNode(typescript_1.EmitHint.Unspecified, typescript_1.factory.updatePropertyAssignment(initialNavigationAssignment, initialNavigationAssignment.name, typescript_1.factory.createIdentifier(`'enabledBlocking'`)), initialNavigationAssignment.getSourceFile());
-                const updatedContent = `${content.slice(0, initialNavigationAssignment.getStart())}${updatedInitialNavigationAssignment}${content.slice(initialNavigationAssignment.getEnd())}`;
-                tree.write(filePath, updatedContent);
-            });
-        }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function default_1(tree) {
+    const printer = (0, typescript_1.createPrinter)();
+    const projects = await getProjectsWithAngularRouter(tree);
+    for (const project of projects) {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, project.root, (filePath) => {
+            // we are only interested in .ts files
+            if (!filePath.endsWith('.ts')) {
+                return;
+            }
+            const content = tree.read(filePath, 'utf-8');
+            const ast = tsquery_1.tsquery.ast(content);
+            const routerModuleForRootCall = getRouterModuleForRootCall(ast);
+            if (!routerModuleForRootCall) {
+                return;
+            }
+            const initialNavigationAssignment = getInitialNavigationAssignment(routerModuleForRootCall.arguments[1]);
+            if (!initialNavigationAssignment) {
+                return;
+            }
+            const updatedInitialNavigationAssignment = printer.printNode(typescript_1.EmitHint.Unspecified, typescript_1.factory.updatePropertyAssignment(initialNavigationAssignment, initialNavigationAssignment.name, typescript_1.factory.createIdentifier(`'enabledBlocking'`)), initialNavigationAssignment.getSourceFile());
+            const updatedContent = `${content.slice(0, initialNavigationAssignment.getStart())}${updatedInitialNavigationAssignment}${content.slice(initialNavigationAssignment.getEnd())}`;
+            tree.write(filePath, updatedContent);
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;
 function getInitialNavigationAssignment(extraOptionsLiteral) {
@@ -44,17 +41,12 @@ function getInitialNavigationAssignment(extraOptionsLiteral) {
     }
     return null;
 }
-function getProjectsWithAngularRouter(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
-        return Object.entries(projectGraph.dependencies)
-            .filter(([node, dep]) => dep.some(({ target }) => {
-            var _a;
-            return target === 'npm:@angular/router' &&
-                !((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[node]);
-        }))
-            .map(([projectName]) => (0, devkit_1.readProjectConfiguration)(tree, projectName));
-    });
+async function getProjectsWithAngularRouter(tree) {
+    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    return Object.entries(projectGraph.dependencies)
+        .filter(([node, dep]) => dep.some(({ target }) => target === 'npm:@angular/router' &&
+        !projectGraph.externalNodes?.[node]))
+        .map(([projectName]) => (0, devkit_1.readProjectConfiguration)(tree, projectName));
 }
 function getRouterModuleForRootCall(sourceFile) {
     // narrow down call expressions

package/src/migrations/update-14-2-0/update-tsconfig-target.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 devkit_2 = require("@nx/devkit");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
@@ -16,62 +15,56 @@ const executors = [
     '@nrwl/angular:package',
 ];
 const skipTargets = ['es2020', 'es2021', 'es2022', 'esnext'];
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tsConfigPaths = yield collectTsConfigPaths(tree);
-        for (const tsConfigPath of tsConfigPaths) {
-            (0, devkit_2.updateJson)(tree, tsConfigPath, (json) => {
-                var _a, _b, _c;
-                if (!((_a = json.compilerOptions) === null || _a === void 0 ? void 0 : _a.target) ||
-                    (((_b = json.compilerOptions) === null || _b === void 0 ? void 0 : _b.target) &&
-                        !skipTargets.includes(json.compilerOptions.target.toLowerCase()))) {
-                    (_c = json.compilerOptions) !== null && _c !== void 0 ? _c : (json.compilerOptions = {});
-                    json.compilerOptions.target = 'es2020';
-                }
-                return json;
-            }, {
-                allowTrailingComma: true,
-                disallowComments: false,
-            });
-        }
-        yield (0, devkit_2.formatFiles)(tree);
-    });
+async function default_1(tree) {
+    const tsConfigPaths = await collectTsConfigPaths(tree);
+    for (const tsConfigPath of tsConfigPaths) {
+        (0, devkit_2.updateJson)(tree, tsConfigPath, (json) => {
+            if (!json.compilerOptions?.target ||
+                (json.compilerOptions?.target &&
+                    !skipTargets.includes(json.compilerOptions.target.toLowerCase()))) {
+                json.compilerOptions ??= {};
+                json.compilerOptions.target = 'es2020';
+            }
+            return json;
+        }, {
+            allowTrailingComma: true,
+            disallowComments: false,
+        });
+    }
+    await (0, devkit_2.formatFiles)(tree);
 }
 exports.default = default_1;
-function collectTsConfigPaths(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const uniqueTsConfigs = new Set([]);
-        const projectGraph = yield (0, devkit_2.createProjectGraphAsync)();
-        const angularProjects = Object.entries(projectGraph.dependencies)
-            .filter(([node, dep]) => dep.some(({ target }) => { var _a; return target === 'npm:@angular/core' && !((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[node]); }))
-            .map(([projectName]) => ({
-            projectName,
-            project: (0, devkit_2.readProjectConfiguration)(tree, projectName),
-        }));
-        for (const { projectName, project } of angularProjects) {
-            const tsConfigPath = (0, devkit_2.joinPathFragments)(project.root, 'tsconfig.json');
-            if (tree.exists(tsConfigPath)) {
-                uniqueTsConfigs.add(tsConfigPath);
-                const targetTsConfigPaths = getProjectTsConfigPaths(tree, project, projectName, false);
-                targetTsConfigPaths.forEach((tsConfigPath) => {
-                    var _a;
-                    const tsConfig = (0, devkit_1.readJson)(tree, tsConfigPath, {
-                        allowTrailingComma: true,
-                        disallowComments: false,
-                    });
-                    if ((_a = tsConfig.compilerOptions) === null || _a === void 0 ? void 0 : _a.target) {
-                        uniqueTsConfigs.add(tsConfigPath);
-                    }
+async function collectTsConfigPaths(tree) {
+    const uniqueTsConfigs = new Set([]);
+    const projectGraph = await (0, devkit_2.createProjectGraphAsync)();
+    const angularProjects = Object.entries(projectGraph.dependencies)
+        .filter(([node, dep]) => dep.some(({ target }) => target === 'npm:@angular/core' && !projectGraph.externalNodes?.[node]))
+        .map(([projectName]) => ({
+        projectName,
+        project: (0, devkit_2.readProjectConfiguration)(tree, projectName),
+    }));
+    for (const { projectName, project } of angularProjects) {
+        const tsConfigPath = (0, devkit_2.joinPathFragments)(project.root, 'tsconfig.json');
+        if (tree.exists(tsConfigPath)) {
+            uniqueTsConfigs.add(tsConfigPath);
+            const targetTsConfigPaths = getProjectTsConfigPaths(tree, project, projectName, false);
+            targetTsConfigPaths.forEach((tsConfigPath) => {
+                const tsConfig = (0, devkit_1.readJson)(tree, tsConfigPath, {
+                    allowTrailingComma: true,
+                    disallowComments: false,
                 });
-                continue;
-            }
-            const tsConfigPaths = getProjectTsConfigPaths(tree, project, projectName);
-            for (const tsConfigPath of tsConfigPaths) {
-                uniqueTsConfigs.add(tsConfigPath);
-            }
+                if (tsConfig.compilerOptions?.target) {
+                    uniqueTsConfigs.add(tsConfigPath);
+                }
+            });
+            continue;
         }
-        return Array.from(uniqueTsConfigs);
-    });
+        const tsConfigPaths = getProjectTsConfigPaths(tree, project, projectName);
+        for (const tsConfigPath of tsConfigPaths) {
+            uniqueTsConfigs.add(tsConfigPath);
+        }
+    }
+    return Array.from(uniqueTsConfigs);
 }
 function getProjectTsConfigPaths(tree, project, projectName, shouldWarn = true) {
     const tsConfigPaths = new Set();
@@ -149,12 +142,11 @@ function getTsConfigFromJestConfig(tree, jestConfigPath, targetName, projectName
     return tsConfigPath;
 }
 function getPathValuesFromTarget(target, option) {
-    var _a, _b;
     const values = [];
-    if ((_a = target.options) === null || _a === void 0 ? void 0 : _a[option]) {
+    if (target.options?.[option]) {
         values.push(target.options[option]);
     }
-    Object.values((_b = target.configurations) !== null && _b !== void 0 ? _b : {}).forEach((options) => {
+    Object.values(target.configurations ?? {}).forEach((options) => {
         if (options[option]) {
             values.push(options[option]);
         }

package/src/migrations/update-14-5-0/migrate-mfe-to-mf.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renameSetupMfeGeneratorUsages = exports.replaceExportedMFETypes = exports.replaceNrwlAngularMfImport = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
@@ -73,22 +72,20 @@ function renameSetupMfeGeneratorUsages(fileContents) {
     return fileContents;
 }
 exports.renameSetupMfeGeneratorUsages = renameSetupMfeGeneratorUsages;
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, devkit_1.visitNotIgnoredFiles)(tree, '/', (path) => {
-            const pathExtName = (0, path_1.extname)(path);
-            if (pathExtName !== '.ts' && pathExtName !== '.js') {
-                return;
-            }
-            let fileContents = tree.read(path, 'utf-8');
-            fileContents = replaceNrwlAngularMfImport(fileContents);
-            if (pathExtName === '.ts') {
-                // Only TS files can import types and interfaces
-                fileContents = replaceExportedMFETypes(fileContents);
-                fileContents = renameSetupMfeGeneratorUsages(fileContents);
-            }
-            tree.write(path, fileContents);
-        });
+async function default_1(tree) {
+    (0, devkit_1.visitNotIgnoredFiles)(tree, '/', (path) => {
+        const pathExtName = (0, path_1.extname)(path);
+        if (pathExtName !== '.ts' && pathExtName !== '.js') {
+            return;
+        }
+        let fileContents = tree.read(path, 'utf-8');
+        fileContents = replaceNrwlAngularMfImport(fileContents);
+        if (pathExtName === '.ts') {
+            // Only TS files can import types and interfaces
+            fileContents = replaceExportedMFETypes(fileContents);
+            fileContents = renameSetupMfeGeneratorUsages(fileContents);
+        }
+        tree.write(path, fileContents);
     });
 }
 exports.default = default_1;

package/src/migrations/update-14-5-2/update-angular-cli.js

@@ -1,26 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const angularCliVersion = '~14.1.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'] = angularCliVersion;
-                shouldFormat = true;
-            }
-            else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
-                json.dependencies['@angular/cli'] = 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'] = angularCliVersion;
+            shouldFormat = true;
         }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
     });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.default = default_1;

package/src/migrations/update-14-6-0/update-angular-cli.js

@@ -1,26 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const angularCliVersion = '~14.2.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'] = angularCliVersion;
-                shouldFormat = true;
-            }
-            else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
-                json.dependencies['@angular/cli'] = 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'] = angularCliVersion;
+            shouldFormat = true;
         }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
     });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.default = default_1;

package/src/migrations/update-15-0-0/add-karma-inputs.js

@@ -1,40 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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 default_1(tree) {
-    var _a, _b, _c, _d;
-    var _e;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        const karmaTargets = getKarmaTargetNames(tree);
-        const hasProductionFileset = !!((_a = nxJson.namedInputs) === null || _a === void 0 ? void 0 : _a.production);
-        if (karmaTargets.size > 0 && hasProductionFileset) {
-            const productionFileset = new Set(nxJson.namedInputs.production);
-            for (const exclusion of [
-                '!{projectRoot}/**/*.spec.[jt]s',
-                '!{projectRoot}/tsconfig.spec.json',
-                '!{projectRoot}/karma.conf.js',
-            ]) {
-                productionFileset.add(exclusion);
-            }
-            nxJson.namedInputs.production = Array.from(productionFileset);
+async function default_1(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const karmaTargets = getKarmaTargetNames(tree);
+    const hasProductionFileset = !!nxJson.namedInputs?.production;
+    if (karmaTargets.size > 0 && hasProductionFileset) {
+        const productionFileset = new Set(nxJson.namedInputs.production);
+        for (const exclusion of [
+            '!{projectRoot}/**/*.spec.[jt]s',
+            '!{projectRoot}/tsconfig.spec.json',
+            '!{projectRoot}/karma.conf.js',
+        ]) {
+            productionFileset.add(exclusion);
         }
-        for (const targetName of karmaTargets) {
-            (_b = nxJson.targetDefaults) !== null && _b !== void 0 ? _b : (nxJson.targetDefaults = {});
-            const jestTargetDefaults = ((_c = (_e = nxJson.targetDefaults)[targetName]) !== null && _c !== void 0 ? _c : (_e[targetName] = {}));
-            (_d = jestTargetDefaults.inputs) !== null && _d !== void 0 ? _d : (jestTargetDefaults.inputs = [
-                'default',
-                hasProductionFileset ? '^production' : '^default',
-                ...(tree.exists('karma.conf.js')
-                    ? ['{workspaceRoot}/karma.conf.js']
-                    : []),
-            ]);
-        }
-        (0, devkit_1.updateNxJson)(tree, nxJson);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+        nxJson.namedInputs.production = Array.from(productionFileset);
+    }
+    for (const targetName of karmaTargets) {
+        nxJson.targetDefaults ??= {};
+        const jestTargetDefaults = (nxJson.targetDefaults[targetName] ??= {});
+        jestTargetDefaults.inputs ??= [
+            'default',
+            hasProductionFileset ? '^production' : '^default',
+            ...(tree.exists('karma.conf.js')
+                ? ['{workspaceRoot}/karma.conf.js']
+                : []),
+        ];
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;
 function getKarmaTargetNames(tree) {

package/src/migrations/update-15-0-0/switch-to-jasmine-marbles.js

@@ -1,83 +1,78 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const versions_1 = require("../../utils/versions");
 const semver_1 = require("@nx/devkit/src/utils/semver");
 const semver_2 = require("semver");
-function switchToJasmineMarbles(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const usesJasmineMarbles = yield replaceJasmineMarbleUsagesInFiles(tree);
-        addJasmineMarblesDevDependencyIfUsed(tree, usesJasmineMarbles);
-    });
+async function switchToJasmineMarbles(tree) {
+    const usesJasmineMarbles = await replaceJasmineMarbleUsagesInFiles(tree);
+    addJasmineMarblesDevDependencyIfUsed(tree, usesJasmineMarbles);
 }
 exports.default = switchToJasmineMarbles;
-function replaceJasmineMarbleUsagesInFiles(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let usesJasmineMarbles = false;
-        const projectGraph = yield (() => {
-            try {
-                return (0, devkit_1.readCachedProjectGraph)();
+async function replaceJasmineMarbleUsagesInFiles(tree) {
+    let usesJasmineMarbles = false;
+    const projectGraph = await (() => {
+        try {
+            return (0, devkit_1.readCachedProjectGraph)();
+        }
+        catch {
+            return (0, devkit_1.createProjectGraphAsync)();
+        }
+    })();
+    const dirsToTraverse = Object.entries(projectGraph.dependencies)
+        .filter(([node, dep]) => dep.some(({ target }) => target === 'npm:@nrwl/angular' && !projectGraph.externalNodes?.[node]))
+        .map(([projectName]) => (0, devkit_1.readProjectConfiguration)(tree, projectName).root);
+    for (const dir of dirsToTraverse) {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, dir, (path) => {
+            if ((0, path_1.extname)(path) !== '.ts') {
+                return;
             }
-            catch (_a) {
-                return (0, devkit_1.createProjectGraphAsync)();
+            const fileContents = tree.read(path, 'utf-8');
+            if (!fileContents.includes('@nrwl/angular/testing')) {
+                return;
             }
-        })();
-        const dirsToTraverse = Object.entries(projectGraph.dependencies)
-            .filter(([node, dep]) => dep.some(({ target }) => { var _a; return target === 'npm:@nrwl/angular' && !((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[node]); }))
-            .map(([projectName]) => (0, devkit_1.readProjectConfiguration)(tree, projectName).root);
-        for (const dir of dirsToTraverse) {
-            (0, devkit_1.visitNotIgnoredFiles)(tree, dir, (path) => {
-                if ((0, path_1.extname)(path) !== '.ts') {
-                    return;
-                }
-                const fileContents = tree.read(path, 'utf-8');
-                if (!fileContents.includes('@nrwl/angular/testing')) {
-                    return;
-                }
-                const NRWL_ANGULAR_TESTING_IMPORT_SELECTOR = 'ImportDeclaration:has(StringLiteral[value="@nrwl/angular/testing"])';
-                const ast = tsquery_1.tsquery.ast(fileContents);
-                const nrwlAngularTestingImportNodes = (0, tsquery_1.tsquery)(ast, NRWL_ANGULAR_TESTING_IMPORT_SELECTOR, { visitAllChildren: true });
-                if (!nrwlAngularTestingImportNodes ||
-                    nrwlAngularTestingImportNodes.length === 0) {
-                    return;
-                }
-                const jasmineMarblesExportsRegex = new RegExp(/(hot|cold|getTestScheduler|time)/);
-                if (!jasmineMarblesExportsRegex.test(nrwlAngularTestingImportNodes[0].getText())) {
-                    return;
-                }
-                const IMPORT_SPECIFIERS_SELECTOR = 'NamedImports > ImportSpecifier';
-                const importSpecifierNodes = (0, tsquery_1.tsquery)(nrwlAngularTestingImportNodes[0], IMPORT_SPECIFIERS_SELECTOR, { visitAllChildren: true });
-                if (!importSpecifierNodes || importSpecifierNodes.length === 0) {
-                    return;
-                }
-                const validNrwlTestingImports = [];
-                const validJasmineMarbleImports = [];
-                for (const node of importSpecifierNodes) {
-                    const importSymbol = node.getText();
-                    if (jasmineMarblesExportsRegex.test(importSymbol)) {
-                        validJasmineMarbleImports.push(importSymbol);
-                    }
-                    else {
-                        validNrwlTestingImports.push(importSymbol);
-                    }
+            const NRWL_ANGULAR_TESTING_IMPORT_SELECTOR = 'ImportDeclaration:has(StringLiteral[value="@nrwl/angular/testing"])';
+            const ast = tsquery_1.tsquery.ast(fileContents);
+            const nrwlAngularTestingImportNodes = (0, tsquery_1.tsquery)(ast, NRWL_ANGULAR_TESTING_IMPORT_SELECTOR, { visitAllChildren: true });
+            if (!nrwlAngularTestingImportNodes ||
+                nrwlAngularTestingImportNodes.length === 0) {
+                return;
+            }
+            const jasmineMarblesExportsRegex = new RegExp(/(hot|cold|getTestScheduler|time)/);
+            if (!jasmineMarblesExportsRegex.test(nrwlAngularTestingImportNodes[0].getText())) {
+                return;
+            }
+            const IMPORT_SPECIFIERS_SELECTOR = 'NamedImports > ImportSpecifier';
+            const importSpecifierNodes = (0, tsquery_1.tsquery)(nrwlAngularTestingImportNodes[0], IMPORT_SPECIFIERS_SELECTOR, { visitAllChildren: true });
+            if (!importSpecifierNodes || importSpecifierNodes.length === 0) {
+                return;
+            }
+            const validNrwlTestingImports = [];
+            const validJasmineMarbleImports = [];
+            for (const node of importSpecifierNodes) {
+                const importSymbol = node.getText();
+                if (jasmineMarblesExportsRegex.test(importSymbol)) {
+                    validJasmineMarbleImports.push(importSymbol);
                 }
-                if (!usesJasmineMarbles && validJasmineMarbleImports.length > 0) {
-                    usesJasmineMarbles = true;
+                else {
+                    validNrwlTestingImports.push(importSymbol);
                 }
-                const newFileContents = `${fileContents.slice(0, nrwlAngularTestingImportNodes[0].getStart())}${validNrwlTestingImports.length > 0
-                    ? `import {${validNrwlTestingImports.join(',')}} from '@nrwl/angular/testing';`
-                    : ''}
+            }
+            if (!usesJasmineMarbles && validJasmineMarbleImports.length > 0) {
+                usesJasmineMarbles = true;
+            }
+            const newFileContents = `${fileContents.slice(0, nrwlAngularTestingImportNodes[0].getStart())}${validNrwlTestingImports.length > 0
+                ? `import {${validNrwlTestingImports.join(',')}} from '@nrwl/angular/testing';`
+                : ''}
     ${validJasmineMarbleImports.length > 0
-                    ? `import {${validJasmineMarbleImports.join(',')}} from 'jasmine-marbles';${fileContents.slice(nrwlAngularTestingImportNodes[0].getEnd(), -1)}`
-                    : ''}`;
-                tree.write(path, newFileContents);
-            });
-        }
-        return usesJasmineMarbles;
-    });
+                ? `import {${validJasmineMarbleImports.join(',')}} from 'jasmine-marbles';${fileContents.slice(nrwlAngularTestingImportNodes[0].getEnd(), -1)}`
+                : ''}`;
+            tree.write(path, newFileContents);
+        });
+    }
+    return usesJasmineMarbles;
 }
 function addJasmineMarblesDevDependencyIfUsed(tree, usesJasmineMarbles) {
     if (!usesJasmineMarbles) {
@@ -95,13 +90,12 @@ function addJasmineMarblesDevDependencyIfUsed(tree, usesJasmineMarbles) {
     });
 }
 function getJasmineMarblesVersion(tree) {
-    var _a;
     let rxjsVersion;
     try {
         const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', (_a = dependencies === null || dependencies === void 0 ? void 0 : dependencies.rxjs) !== null && _a !== void 0 ? _a : devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies.rxjs);
+        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', dependencies?.rxjs ?? devDependencies?.rxjs);
     }
-    catch (_b) {
+    catch {
         rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
     }
     return (0, semver_2.gte)(rxjsVersion, '7.0.0') ? versions_1.jasmineMarblesVersion : '~0.8.3';