@nx/jest 16.0.0-beta.1

package/src/migrations/update-14-0-0/update-jest-config-ext.js

@@ -0,0 +1,115 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateJestConfigExt = 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");
+const path_1 = require("path");
+const allowedExt = ['.ts', '.js'];
+function updateTsConfig(tree, tsConfigPath) {
+    try {
+        (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
+            json.exclude = Array.from(new Set([...(json.exclude || []), 'jest.config.ts']));
+            return json;
+        }, {
+            allowTrailingComma: true,
+            disallowComments: false,
+        });
+    }
+    catch (e) {
+        devkit_1.logger.warn((0, devkit_1.stripIndents) `Nx Unable to update ${tsConfigPath}. Please manually ignore the jest.config.ts file.`);
+    }
+}
+function addEsLintIgnoreComments(tree, filePath) {
+    if (tree.exists(filePath)) {
+        const contents = tree.read(filePath, 'utf-8');
+        if (!contents.startsWith('/* eslint-disable */')) {
+            tree.write(filePath, `/* eslint-disable */
+${contents}`);
+        }
+    }
+}
+function isJestConfigValid(tree, options) {
+    const configExt = (0, path_1.extname)(options.jestConfig);
+    if (!tree.exists(options.jestConfig) || !allowedExt.includes(configExt)) {
+        devkit_1.logger.debug(`unable to update file because it doesn't exist or is not a js or ts file. Config: ${options.jestConfig}. Exists?: ${tree.exists(options.jestConfig)}`);
+        return false;
+    }
+    return true;
+}
+function updateTsconfigSpec(tree, projectConfig, path, options = {
+    isNextWithProjectParse: false,
+    tsConfigPath: '',
+}) {
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, path), (json) => {
+        json.include = Array.from(new Set([...(json.include || []), 'jest.config.ts']));
+        if (options.isNextWithProjectParse) {
+            const tsConfig = (0, devkit_1.readJson)(tree, options.tsConfigPath);
+            const tsConfigExclude = (tsConfig.exclude || []).filter((e) => e !== 'jest.config.ts');
+            json.exclude = Array.from(new Set([...(json.exclude || []), ...tsConfigExclude]));
+        }
+        return json;
+    });
+}
+function isNextWithProjectLint(projectConfig, esLintJson) {
+    var _a, _b, _c, _d;
+    const esLintOverrides = (_a = esLintJson === null || esLintJson === void 0 ? void 0 : esLintJson.overrides) === null || _a === void 0 ? void 0 : _a.find((o) => ['*.ts', '*.tsx', '*.js', '*.jsx'].every((ext) => o.files.includes(ext)));
+    // check if it's a next app and has a parserOptions.project set in the eslint overrides
+    return !!(((_c = (_b = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _b === void 0 ? void 0 : _b['build']) === null || _c === void 0 ? void 0 : _c.executor) === '@nrwl/next:build' &&
+        ((_d = esLintOverrides === null || esLintOverrides === void 0 ? void 0 : esLintOverrides.parserOptions) === null || _d === void 0 ? void 0 : _d.project));
+}
+function updateJestConfigExt(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (tree.exists('jest.config.js')) {
+            tree.rename('jest.config.js', 'jest.config.ts');
+        }
+        const projects = (0, devkit_1.getProjects)(tree);
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/jest:jest', (options, projectName, target, configuration) => {
+            const projectConfig = projects.get(projectName);
+            if (!options.jestConfig || !isJestConfigValid(tree, options)) {
+                return;
+            }
+            addEsLintIgnoreComments(tree, options.jestConfig);
+            const newJestConfigPath = options.jestConfig.replace('.js', '.ts');
+            tree.rename(options.jestConfig, newJestConfigPath);
+            const rootFiles = tree.children(projectConfig.root);
+            for (const fileName of rootFiles) {
+                if (fileName === 'tsconfig.json') {
+                    const filePath = (0, devkit_1.joinPathFragments)(projectConfig.root, fileName);
+                    const tsConfig = (0, devkit_1.readJson)(tree, filePath, {
+                        allowTrailingComma: true,
+                        disallowComments: false,
+                    });
+                    if (tsConfig.references) {
+                        for (const { path } of tsConfig.references) {
+                            // skip as editor.json should include everything anyway.
+                            if (path.endsWith('tsconfig.editor.json')) {
+                                continue;
+                            }
+                            if (path.endsWith('tsconfig.spec.json')) {
+                                const eslintPath = (0, devkit_1.joinPathFragments)(projectConfig.root, '.eslintrc.json');
+                                updateTsconfigSpec(tree, projectConfig, path, {
+                                    isNextWithProjectParse: tree.exists(eslintPath)
+                                        ? isNextWithProjectLint(projectConfig, (0, devkit_1.readJson)(tree, eslintPath))
+                                        : false,
+                                    tsConfigPath: filePath,
+                                });
+                                continue;
+                            }
+                            updateTsConfig(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, path));
+                        }
+                    }
+                    else {
+                        updateTsConfig(tree, filePath);
+                    }
+                }
+            }
+            projectConfig.targets[target].options.jestConfig = newJestConfigPath;
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+        });
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.updateJestConfigExt = updateJestConfigExt;
+exports.default = updateJestConfigExt;
+//# sourceMappingURL=update-jest-config-ext.js.map

package/src/migrations/update-14-0-0/update-jest-config-ext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-jest-config-ext.js","sourceRoot":"","sources":["../../../../../../packages/jest/src/migrations/update-14-0-0/update-jest-config-ext.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-14-1-5/update-exports-jest-config.d.ts

@@ -0,0 +1,7 @@
+import type { Tree } from '@nx/devkit';
+export declare function updateExportsJestConfig(tree: Tree): import("@nx/devkit").GeneratorCallback;
+export declare function updateRootFiles(tree: Tree): {
+    didUpdateRootPreset: boolean;
+};
+export declare function updateToDefaultExport(tree: Tree, filePath: string): void;
+export default updateExportsJestConfig;

package/src/migrations/update-14-1-5/update-exports-jest-config.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateToDefaultExport = exports.updateRootFiles = exports.updateExportsJestConfig = void 0;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const versions_1 = require("../../utils/versions");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+function updateExportsJestConfig(tree) {
+    const { didUpdateRootPreset } = updateRootFiles(tree);
+    let shouldInstallTsNode = false;
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/jest:jest', (options) => {
+        if (options.jestConfig && tree.exists(options.jestConfig)) {
+            if (options.jestConfig.endsWith('.ts')) {
+                updateToDefaultExport(tree, options.jestConfig);
+                shouldInstallTsNode = true;
+            }
+            const updatedImport = updateNxPresetImport(tree.read(options.jestConfig, 'utf-8'));
+            tree.write(options.jestConfig, updatedImport);
+            // jest.preset.ts => jest.preset.js
+            if (didUpdateRootPreset) {
+                const projectConfig = tree.read(options.jestConfig, 'utf-8');
+                const updatedConfig = projectConfig.replace(/(preset:\s*['"][.\/]*)(jest\.preset\.ts)(['"])/g, '$1jest.preset.js$3');
+                tree.write(options.jestConfig, updatedConfig);
+            }
+        }
+    });
+    return shouldInstallTsNode
+        ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { 'ts-node': versions_1.tsNodeVersion })
+        : () => { };
+}
+exports.updateExportsJestConfig = updateExportsJestConfig;
+function updateRootFiles(tree) {
+    let didUpdateRootPreset = false;
+    if (tree.exists('jest.config.ts')) {
+        updateToDefaultExport(tree, 'jest.config.ts');
+    }
+    if (tree.exists('jest.preset.ts')) {
+        // fix those who ran v14 migration where this was renamed.
+        tree.rename('jest.preset.ts', 'jest.preset.js');
+        didUpdateRootPreset = true;
+    }
+    if (tree.exists('jest.preset.js')) {
+        const newContents = updateNxPresetImport(tree.read('jest.preset.js', 'utf-8'));
+        tree.write('jest.preset.js', newContents);
+    }
+    return {
+        didUpdateRootPreset,
+    };
+}
+exports.updateRootFiles = updateRootFiles;
+function updateNxPresetImport(fileContents) {
+    return fileContents.replace(/require\(['"]@nrwl\/jest\/preset['"]\)[;\s]*?[\n\r]/g, `require('@nrwl/jest/preset').default;
+`);
+}
+function updateToDefaultExport(tree, filePath) {
+    const newConfig = tsquery_1.tsquery.replace(tree.read(filePath, 'utf-8'), 'ExpressionStatement BinaryExpression', (node) => {
+        if (node.left.getText() === 'module.exports') {
+            return `export default ${node.right.getText()}`;
+        }
+        return node.getText();
+    });
+    tree.write(filePath, newConfig);
+}
+exports.updateToDefaultExport = updateToDefaultExport;
+exports.default = updateExportsJestConfig;
+//# sourceMappingURL=update-exports-jest-config.js.map

package/src/migrations/update-14-1-5/update-exports-jest-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-exports-jest-config.js","sourceRoot":"","sources":["../../../../../../packages/jest/src/migrations/update-14-1-5/update-exports-jest-config.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-14-6-0/update-configs-jest-28.d.ts

@@ -0,0 +1,5 @@
+import { Tree } from '@nx/devkit';
+export declare function updateConfigsJest28(tree: Tree): import("@nx/devkit").GeneratorCallback;
+export declare function updateJestConfig(config: string): string;
+export declare function checkDeps(tree: Tree): Record<string, string>;
+export default updateConfigsJest28;

package/src/migrations/update-14-6-0/update-configs-jest-28.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkDeps = exports.updateJestConfig = exports.updateConfigsJest28 = void 0;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const typescript_1 = require("typescript");
+const find_root_jest_files_1 = require("../../utils/config/find-root-jest-files");
+const jestVersion = '28.1.1';
+const JASMINE_TEST_RUNNER = /(testRunner:\s*['"`])(jest-jasmine2)(['"`])/g;
+const JSDOM_TEST_ENV = /(testEnvironment:\s*['"`])(jsdom)(['"`])/g;
+function updateConfigsJest28(tree) {
+    let devDeps = checkDeps(tree);
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/jest:jest', (options) => {
+        if (options.jestConfig && tree.exists(options.jestConfig)) {
+            const updatedConfig = updateJestConfig(tree.read(options.jestConfig, 'utf-8'));
+            tree.write(options.jestConfig, updatedConfig);
+            const projectConfigCheck = testFileForDep(updatedConfig);
+            devDeps = Object.assign(Object.assign({}, devDeps), projectConfigCheck);
+        }
+    });
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDeps);
+}
+exports.updateConfigsJest28 = updateConfigsJest28;
+function updateJestConfig(config) {
+    let content = tsquery_1.tsquery.replace(config, 'PropertyAssignment:has(Identifier[name="testURL"])', (node) => {
+        var _a;
+        const value = (_a = node === null || node === void 0 ? void 0 : node.initializer) === null || _a === void 0 ? void 0 : _a.getText();
+        return `testEnvironmentOptions: {url: ${value}}`;
+    });
+    content = tsquery_1.tsquery.replace(content, 'PropertyAssignment > Identifier[name="extraGlobals"]', () => {
+        return 'sandboxInjectedGlobals';
+    });
+    return tsquery_1.tsquery.replace(content, 'PropertyAssignment:has(Identifier[name="timers"])', (node) => {
+        // must guard against non string properties as that means it's already been manually migrated
+        if ((node === null || node === void 0 ? void 0 : node.initializer) && (0, typescript_1.isStringLiteralLike)(node.initializer)) {
+            const value = node === null || node === void 0 ? void 0 : node.initializer.getText().trim();
+            // use .includes to ignore the different quotes (' " `)
+            if (value.includes('fake') || value.includes('modern')) {
+                return `fakeTimers: { enableGlobally: true }`;
+            }
+            if (value.includes('real')) {
+                return `fakeTimers: { enableGlobally: false }`;
+            }
+            if (value.includes('legacy')) {
+                return `fakeTimers: { enableGlobally: true, legacyFakeTimers: true }`;
+            }
+        }
+    });
+}
+exports.updateJestConfig = updateJestConfig;
+function checkDeps(tree) {
+    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+    let devDeps = {};
+    if (packageJson.devDependencies['jest-preset-angular']) {
+        devDeps['jest-environment-jsdom'] = jestVersion;
+    }
+    const rootJestConfig = (0, find_root_jest_files_1.findRootJestConfig)(tree);
+    if (rootJestConfig) {
+        const rootConfigCheck = testFileForDep(tree.read(rootJestConfig, 'utf-8'));
+        devDeps = Object.assign(Object.assign({}, devDeps), rootConfigCheck);
+    }
+    const rootJestPreset = (0, find_root_jest_files_1.findRootJestPreset)(tree);
+    if (rootJestPreset) {
+        const rootPresetCheck = testFileForDep(tree.read(rootJestPreset, 'utf-8'));
+        devDeps = Object.assign(Object.assign({}, devDeps), rootPresetCheck);
+    }
+    return devDeps;
+}
+exports.checkDeps = checkDeps;
+function testFileForDep(config) {
+    const deps = {};
+    if (JASMINE_TEST_RUNNER.test(config)) {
+        deps['jest-jasmine2'] = jestVersion;
+    }
+    if (JSDOM_TEST_ENV.test(config)) {
+        deps['jest-environment-jsdom'] = jestVersion;
+    }
+    return deps;
+}
+exports.default = updateConfigsJest28;
+//# sourceMappingURL=update-configs-jest-28.js.map

package/src/migrations/update-14-6-0/update-configs-jest-28.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-configs-jest-28.js","sourceRoot":"","sources":["../../../../../../packages/jest/src/migrations/update-14-6-0/update-configs-jest-28.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-14-6-0/update-tests-jest-28.d.ts

@@ -0,0 +1,24 @@
+import { Tree } from '@nx/devkit';
+export declare function updateTestsJest28(tree: Tree): void;
+/**
+ * jest.useFakeTimers('modern') -> jest.useFakeTimers()
+ * jest.useFakeTimers('legacy') -> jest.useFakeTimers({legacyFakeTimers: true})
+ * if legacyFakeTimers is true in config, then
+ * jest.useFakeTimers('modern') -> jest.useRealTimers({legacyFakeTimers: false})
+ */
+export declare function updateJestTimers(fileContents: string, legacyFakeTimersInConfig: boolean): string;
+/**
+ * this only applies to tests using @jest/globals
+ * jest.fn<Promise<string>, []>() -> jest.fn<() => Promise<string>>()
+ * jest.fn<number, string[]>() -> jest.fn<() => number>()
+ * jest.fn<ReturnType<typeof add>, Parameters<typeof add>>(); -> jest.fn<typeof add>()
+ */
+export declare function updateJestFnMocks(fileContents: string): string;
+/**
+ * import expect from 'expect' -> import { expect } from 'expect'
+ * const expect = require('expect') -> const { expect } = require('expect')
+ * import { mocked } from 'ts-jest/utils' => import { mocked } from 'jest-mock';
+ * const { mocked } = require('ts-jest/utils'); => const { mocked } = require('jest-mock');
+ */
+export declare function updateJestImports(content: string): string;
+export default updateTestsJest28;

package/src/migrations/update-14-6-0/update-tests-jest-28.js

@@ -0,0 +1,158 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateJestImports = exports.updateJestFnMocks = exports.updateJestTimers = exports.updateTestsJest28 = void 0;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const ts = require("typescript");
+function updateTestsJest28(tree) {
+    const testFilePatterns = /.*.(spec|test)\.(ts|js)x?/g;
+    const legacyTimers = /(timers:\s*['"`]legacy['"`])|(legacyFakeTimers:\s*true)/g;
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/jest:jest', (options, projectName) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        const isUsingLegacyTimers = options.jestConfig &&
+            tree.exists(options.jestConfig) &&
+            legacyTimers.test(tree.read(options.jestConfig, 'utf-8'));
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.root, (filePath) => {
+            if (!filePath.match(testFilePatterns)) {
+                return;
+            }
+            let fileContent = tree.read(filePath, 'utf-8');
+            fileContent = updateJestTimers(fileContent, isUsingLegacyTimers);
+            if (fileContent.includes('@jest/globals')) {
+                fileContent = updateJestFnMocks(fileContent);
+            }
+            fileContent = updateJestImports(fileContent);
+            tree.write(filePath, fileContent);
+        });
+    });
+}
+exports.updateTestsJest28 = updateTestsJest28;
+/**
+ * jest.useFakeTimers('modern') -> jest.useFakeTimers()
+ * jest.useFakeTimers('legacy') -> jest.useFakeTimers({legacyFakeTimers: true})
+ * if legacyFakeTimers is true in config, then
+ * jest.useFakeTimers('modern') -> jest.useRealTimers({legacyFakeTimers: false})
+ */
+function updateJestTimers(fileContents, legacyFakeTimersInConfig) {
+    return tsquery_1.tsquery.replace(fileContents, 'CallExpression', (node) => {
+        if (!(node === null || node === void 0 ? void 0 : node.getText().startsWith('jest.useFakeTimers'))) {
+            return;
+        }
+        const timerType = node.getText();
+        // will be modern or legacy with quotes
+        // just make sure it's included to ignore different quote types
+        if (timerType.includes('legacy')) {
+            return 'jest.useFakeTimers({ legacyFakeTimers: true })';
+        }
+        if (legacyFakeTimersInConfig) {
+            // using modern but have config set to legacy
+            return 'jest.useRealTimers({ legacyFakeTimers: false })';
+        }
+        // have to include space otherwise empty string will not remove the string literal
+        return 'jest.useFakeTimers()';
+    });
+}
+exports.updateJestTimers = updateJestTimers;
+/**
+ * make sure using jest.fn<T>
+ */
+function isTypedJestFnMock(node) {
+    return ts.isCallExpression(node) && node.getText().startsWith('jest.fn<');
+}
+/**
+ * has 2 args where the second is a tuple or array
+ * i.e.
+ * jest.fn<Promise<string>, []>()
+ * jest.fn<number, MyType[]>()
+ * jest.fn<number, [string, number, SomeType]>()
+ */
+function isValid2Args(node) {
+    var _a, _b;
+    const r = (node === null || node === void 0 ? void 0 : node.typeArguments.length) === 2 &&
+        (((_a = node.typeArguments[1]) === null || _a === void 0 ? void 0 : _a.kind) === ts.SyntaxKind.TupleType ||
+            ((_b = node.typeArguments[1]) === null || _b === void 0 ? void 0 : _b.kind) === ts.SyntaxKind.ArrayType);
+    return r;
+}
+/**
+ * has 1 arg where the type is NOT a FunctionType
+ * if it's a function type then it's already using the correct syntax
+ * i.e.
+ * jest.fn<string>()
+ * jest.fn<() => Promise<string>>() is already valid, don't change it.
+ */
+function isValid1Arg(node) {
+    var _a, _b;
+    const r = (node === null || node === void 0 ? void 0 : node.typeArguments.length) === 1 &&
+        ((_a = node.typeArguments[0]) === null || _a === void 0 ? void 0 : _a.kind) !== ts.SyntaxKind.FunctionType &&
+        ((_b = node.typeArguments[0]) === null || _b === void 0 ? void 0 : _b.kind) !== ts.SyntaxKind.TypeQuery;
+    return r;
+}
+/**
+ * has a type reference as a type args
+ * jest.fn<ReturnType<typeof add>, Parameters<typeof add>>();
+ */
+function isValidTypeRef(node) {
+    var _a, _b;
+    const r = node.typeArguments[0].kind === ts.SyntaxKind.TypeReference &&
+        !!((_b = (_a = node.typeArguments) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.typeArguments);
+    return r;
+}
+/**
+ * has valid type args. prevent converting an already converted jest.fn<T>()
+ */
+function isValidType(node) {
+    var _a, _b, _c;
+    const r = (node === null || node === void 0 ? void 0 : node.typeArguments.length) === 1 &&
+        (((_a = node.typeArguments[0]) === null || _a === void 0 ? void 0 : _a.kind) === ts.SyntaxKind.FunctionType ||
+            ((_b = node.typeArguments[0]) === null || _b === void 0 ? void 0 : _b.kind) === ts.SyntaxKind.TypeReference ||
+            ((_c = node.typeArguments[0]) === null || _c === void 0 ? void 0 : _c.kind) === ts.SyntaxKind.TypeQuery ||
+            node.parent.getText().includes('/** TODO:')); // has already been marked by a previous run.
+    return r;
+}
+/**
+ * this only applies to tests using @jest/globals
+ * jest.fn<Promise<string>, []>() -> jest.fn<() => Promise<string>>()
+ * jest.fn<number, string[]>() -> jest.fn<() => number>()
+ * jest.fn<ReturnType<typeof add>, Parameters<typeof add>>(); -> jest.fn<typeof add>()
+ */
+function updateJestFnMocks(fileContents) {
+    return tsquery_1.tsquery.replace(fileContents, 'CallExpression', (node) => {
+        if (!isTypedJestFnMock(node) || isValidType(node)) {
+            return;
+        }
+        if (isValid2Args(node) || isValid1Arg(node)) {
+            return `${node.getText().split('<')[0]}<() => ${node.typeArguments[0].getText()}>()`;
+        }
+        if (isValidTypeRef(node)) {
+            const innerType = node.typeArguments[0]
+                .typeArguments;
+            return `${node.getText().split('<')[0]}<${innerType[0].getText()}>()`;
+        }
+        return `/** TODO: Update jest.fn<T>() type args for Jest v28 https://jestjs.io/docs/upgrading-to-jest28#jestfn */ ${node.getText()}`;
+    });
+}
+exports.updateJestFnMocks = updateJestFnMocks;
+/**
+ * import expect from 'expect' -> import { expect } from 'expect'
+ * const expect = require('expect') -> const { expect } = require('expect')
+ * import { mocked } from 'ts-jest/utils' => import { mocked } from 'jest-mock';
+ * const { mocked } = require('ts-jest/utils'); => const { mocked } = require('jest-mock');
+ */
+function updateJestImports(content) {
+    const mockUpdatedImports = tsquery_1.tsquery.replace(content, ':matches(ImportDeclaration:has(Identifier[name="mocked"]) StringLiteral[value="ts-jest/utils"], VariableStatement:has(Identifier[name="mocked"]) StringLiteral[value="ts-jest/utils"])', () => {
+        return "'jest-mock'";
+    });
+    return tsquery_1.tsquery.replace(mockUpdatedImports, ':matches(ImportDeclaration:has(StringLiteral[value="expect"]), VariableDeclaration:has(StringLiteral[value="expect"]))', (node) => {
+        if (ts.isImportDeclaration(node)) {
+            return `import { expect } from 'expect';`;
+        }
+        if (ts.isVariableDeclaration(node)) {
+            return `{ expect } = require('expect')`; // this query doesn't capture the ; so we don't need to add it in the replace.
+        }
+        return;
+    });
+}
+exports.updateJestImports = updateJestImports;
+exports.default = updateTestsJest28;
+//# sourceMappingURL=update-tests-jest-28.js.map

package/src/migrations/update-14-6-0/update-tests-jest-28.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-tests-jest-28.js","sourceRoot":"","sources":["../../../../../../packages/jest/src/migrations/update-14-6-0/update-tests-jest-28.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-15-0-0/add-jest-inputs.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

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

@@ -0,0 +1,47 @@
+"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 jestTargets = getJestTargetNames(tree);
+        const hasProductionFileset = !!((_a = nxJson.namedInputs) === null || _a === void 0 ? void 0 : _a.production);
+        if (jestTargets.size > 0 && hasProductionFileset) {
+            const productionFileset = new Set(nxJson.namedInputs.production);
+            for (const exclusion of [
+                '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',
+                '!{projectRoot}/tsconfig.spec.json',
+                '!{projectRoot}/jest.config.[jt]s',
+            ]) {
+                productionFileset.add(exclusion);
+            }
+            nxJson.namedInputs.production = Array.from(productionFileset);
+        }
+        for (const targetName of jestTargets) {
+            (_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('jest.preset.js')
+                    ? ['{workspaceRoot}/jest.preset.js']
+                    : []),
+            ]);
+        }
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = default_1;
+function getJestTargetNames(tree) {
+    const jestTargetNames = new Set();
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/jest:jest', (_, __, target) => {
+        jestTargetNames.add(target);
+    });
+    return jestTargetNames;
+}
+//# sourceMappingURL=add-jest-inputs.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"add-jest-inputs.js","sourceRoot":"","sources":["../../../../../../packages/jest/src/migrations/update-15-0-0/add-jest-inputs.ts"],"names":[],"mappings":";;;AAAA,uCAAyE;AACzE,6FAA0F;AAE1F,mBAA+B,IAAU;;;;QACvC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAEhC,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,oBAAoB,GAAG,CAAC,CAAC,CAAA,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,CAAA,CAAC;QAE9D,IAAI,WAAW,CAAC,IAAI,GAAG,CAAC,IAAI,oBAAoB,EAAE;YAChD,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YACjE,KAAK,MAAM,SAAS,IAAI;gBACtB,uDAAuD;gBACvD,mCAAmC;gBACnC,kCAAkC;aACnC,EAAE;gBACD,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;aAClC;YACD,MAAM,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SAC/D;QAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,EAAE,EAAC;YAC7B,MAAM,kBAAkB,GAAG,aAAC,MAAM,CAAC,cAAc,EAAC,UAAU,wCAAV,UAAU,IAAM,EAAE,EAAC,CAAC;YAEtE,MAAA,kBAAkB,CAAC,MAAM,oCAAzB,kBAAkB,CAAC,MAAM,GAAK;gBAC5B,SAAS;gBACT,oBAAoB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;gBACjD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;oBAC/B,CAAC,CAAC,CAAC,gCAAgC,CAAC;oBACpC,CAAC,CAAC,EAAE,CAAC;aACR,EAAC;SACH;QAED,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE3B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAlCD,4BAkCC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAC1C,IAAA,+CAAsB,EAAC,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;QAChE,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IACH,OAAO,eAAe,CAAC;AACzB,CAAC"}

package/src/migrations/update-15-8-0/update-configs-jest-29.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export declare function updateConfigsJest29(tree: Tree): Promise<void>;
+export default updateConfigsJest29;