@nx/jest 19.0.0-beta.1 → 19.0.0-beta.10

package/migrations.json

@@ -1,23 +1,5 @@
 {
   "generators": {
-    "add-jest-inputs": {
-      "version": "15.0.0-beta.0",
-      "cli": "nx",
-      "description": "Stop hashing jest spec files and config files for build targets and dependent tasks",
-      "factory": "./src/migrations/update-15-0-0/add-jest-inputs"
-    },
-    "update-configs-jest-29": {
-      "version": "15.8.0-beta.0",
-      "cli": "nx",
-      "description": "Update jest configs to support jest 29 changes (https://jestjs.io/docs/upgrading-to-jest29)",
-      "factory": "./src/migrations/update-15-8-0/update-configs-jest-29"
-    },
-    "update-tests-jest-29": {
-      "version": "15.8.0-beta.0",
-      "cli": "nx",
-      "description": "Update jest test files to support jest 29 changes (https://jestjs.io/docs/upgrading-to-jest29)",
-      "factory": "./src/migrations/update-15-8-0/update-tests-jest-29"
-    },
     "update-16-0-0-add-nx-packages": {
       "cli": "nx",
       "version": "16.0.0-beta.1",
@@ -37,52 +19,6 @@
     }
   },
   "packageJsonUpdates": {
-    "15.0.1-beta.3": {
-      "version": "15.0.1-beta.3",
-      "packages": {
-        "jest-environment-jsdom": {
-          "version": "~28.1.1",
-          "addToPackageJson": "devDependencies"
-        }
-      }
-    },
-    "15.8.0": {
-      "version": "15.8.0-beta.0",
-      "packages": {
-        "jest": {
-          "version": "~29.4.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@types/jest": {
-          "version": "~29.4.0",
-          "alwaysAddToPackageJson": false
-        },
-        "expect": {
-          "version": "~29.4.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@jest/globals": {
-          "version": "~29.4.1",
-          "alwaysAddToPackageJson": false
-        },
-        "jest-jasmine2": {
-          "version": "~29.4.1",
-          "alwaysAddToPackageJson": false
-        },
-        "jest-environment-jsdom": {
-          "version": "~29.4.1",
-          "alwaysAddToPackageJson": false
-        },
-        "ts-jest": {
-          "version": "~29.0.5",
-          "alwaysAddToPackageJson": false
-        },
-        "babel-jest": {
-          "version": "~29.4.1",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "16.0.0": {
       "version": "16.0.0-beta.4",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "19.0.0-beta.1",
+  "version": "19.0.0-beta.10",
   "private": false,
   "description": "The Nx Plugin for Jest contains executors and generators allowing your workspace to use the powerful Jest testing capabilities.",
   "repository": {
@@ -36,8 +36,8 @@
   "dependencies": {
     "@jest/reporters": "^29.4.1",
     "@jest/test-result": "^29.4.1",
-    "@nx/devkit": "19.0.0-beta.1",
-    "@nx/js": "19.0.0-beta.1",
+    "@nx/devkit": "19.0.0-beta.10",
+    "@nx/js": "19.0.0-beta.10",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "chalk": "^4.1.0",
     "identity-obj-proxy": "3.0.0",
@@ -48,7 +48,7 @@
     "resolve.exports": "1.1.0",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "@nrwl/jest": "19.0.0-beta.1"
+    "@nrwl/jest": "19.0.0-beta.10"
   },
   "publishConfig": {
     "access": "public"

package/src/plugins/plugin.js

@@ -8,6 +8,7 @@ const fs_1 = require("fs");
 const jest_config_1 = require("jest-config");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
+const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const package_json_workspaces_1 = require("nx/src/plugins/package-json-workspaces");
 const globs_1 = require("nx/src/utils/globs");
 const minimatch_1 = require("minimatch");
@@ -67,19 +68,10 @@ exports.createNodes = [
         };
     },
 ];
-const jestValidatePath = (0, path_1.dirname)(require.resolve('jest-validate/package.json', {
-    paths: [(0, path_1.dirname)(require.resolve('jest-config'))],
-}));
 async function buildJestTargets(configFilePath, projectRoot, options, context) {
     const absConfigFilePath = (0, path_1.resolve)(context.workspaceRoot, configFilePath);
     if (require.cache[absConfigFilePath]) {
-        for (const k of Object.keys(require.cache)) {
-            // Only delete the cache outside of jest-validate
-            // jest-validate has a Symbol which is important for jest config validation which breaks if the require cache is broken
-            if ((0, path_1.relative)(jestValidatePath, k).startsWith('../')) {
-                delete require.cache[k];
-            }
-        }
+        (0, config_utils_1.clearRequireCache)();
     }
     const config = await (0, jest_config_1.readConfig)({
         _: [],
@@ -139,7 +131,7 @@ async function buildJestTargets(configFilePath, projectRoot, options, context) {
             };
             targetGroup.push(options.ciTargetName);
             for (const testPath of testPaths) {
-                const relativePath = (0, path_1.normalize)((0, path_1.relative)((0, path_1.join)(context.workspaceRoot, projectRoot), testPath));
+                const relativePath = (0, devkit_1.normalizePath)((0, path_1.relative)((0, path_1.join)(context.workspaceRoot, projectRoot), testPath));
                 const targetName = `${options.ciTargetName}--${relativePath}`;
                 dependsOn.push(targetName);
                 targets[targetName] = {

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

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

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

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-async function default_1(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const jestTargets = getJestTargetNames(tree);
-    const hasProductionFileset = !!nxJson.namedInputs?.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) {
-        nxJson.targetDefaults ??= {};
-        const jestTargetDefaults = (nxJson.targetDefaults[targetName] ??= {});
-        jestTargetDefaults.inputs ??= [
-            'default',
-            hasProductionFileset ? '^production' : '^default',
-            ...(tree.exists('jest.preset.js')
-                ? ['{workspaceRoot}/jest.preset.js']
-                : []),
-        ];
-    }
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-    await (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;
-}

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

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

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

@@ -1,146 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateConfigsJest29 = void 0;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-const ast_utils_1 = require("../../utils/ast-utils");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
-const ts = require("typescript");
-const find_root_jest_files_1 = require("../../utils/config/find-root-jest-files");
-async function updateConfigsJest29(tree) {
-    const rootPreset = (0, find_root_jest_files_1.findRootJestPreset)(tree);
-    const targetsWithJest = new Set();
-    // have to use graph so the negative configuration targets are expanded
-    const graph = await (0, devkit_1.createProjectGraphAsync)();
-    (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/jest:jest', (options, projectName, targetName) => {
-        if (options.jestConfig && tree.exists(options.jestConfig)) {
-            targetsWithJest.add(targetName);
-            // if the default root preset exists or if the project doesn't have a 'preset' configured
-            //  -> update snapshot config
-            if (!rootPreset || !hasPresetConfigured(tree, options.jestConfig)) {
-                addSnapshotOptionsToConfig(tree, options.jestConfig, `From within the project directory, run "nx test --update-snapshot"`);
-            }
-            updateTsJestOptions(tree, options.jestConfig);
-            updateNgJestOptions(tree, options.jestConfig);
-        }
-    });
-    if (rootPreset && tree.exists(rootPreset)) {
-        const cmd = `"nx affected --targets=${Array.from(targetsWithJest).join(',')} --update-snapshot"`;
-        addSnapshotOptionsToConfig(tree, rootPreset, cmd);
-        updateTsJestOptions(tree, rootPreset);
-        updateNgJestOptions(tree, rootPreset);
-    }
-    await (0, devkit_1.formatFiles)(tree);
-    devkit_1.logger.info((0, devkit_1.stripIndents) `NX Jest Snapshot format changed in v29.
-By default Nx kept the older style to prevent breaking of existing tests with snapshots.
-It's recommend you update to the latest format.
-You can do this in your project's jest config file.
-Remove the snapshotFormat property and re-run tests with the --update-snapshot flag.
-More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format`);
-}
-exports.updateConfigsJest29 = updateConfigsJest29;
-function addSnapshotOptionsToConfig(tree, configPath, updateSnapshotExample) {
-    const config = tree.read(configPath, 'utf-8');
-    const hasSnapshotOptions = tsquery_1.tsquery.query(config, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="snapshotFormat"])`);
-    if (hasSnapshotOptions.length > 0) {
-        return;
-    }
-    const updatedConfig = tsquery_1.tsquery.replace(config, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression`, (node) => {
-        return `{
-${node.properties.map((p) => getNodeWithComments(config, p)).join(',\n')},
-/* TODO: Update to latest Jest snapshotFormat
- * By default Nx has kept the older style of Jest Snapshot formats
- * to prevent breaking of any existing tests with snapshots.
- * It's recommend you update to the latest format.
- * You can do this by removing snapshotFormat property
- * and running tests with --update-snapshot flag.
- * Example: ${updateSnapshotExample}
- * More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format
- */
-snapshotFormat: { escapeString: true, printBasicPrototype: true }
-}`;
-    }, { visitAllChildren: false });
-    tree.write(configPath, updatedConfig);
-}
-function hasPresetConfigured(tree, configPath) {
-    const contents = tree.read(configPath, 'utf-8');
-    return (tsquery_1.tsquery.query(contents, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="preset"])`)?.length > 0);
-}
-function updateTsJestOptions(tree, configPath) {
-    // query for the globals property, if they don't have one then there's nothing to modify.
-    const contents = tree.read(configPath, 'utf-8');
-    let tsJestGlobalsConfig;
-    const noTsJestGlobals = tsquery_1.tsquery.replace(contents, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="globals"])`, (node) => {
-        if (tsJestGlobalsConfig) {
-            devkit_1.logger.warn((0, devkit_1.stripIndents) `Found more than one "globals" object in the jest config, ${configPath}
-          Will use the first one`);
-            return;
-        }
-        tsJestGlobalsConfig = getGlobalTsJestConfig(node);
-        return getGlobalConfigWithoutTsJest(node);
-    });
-    if (!tsJestGlobalsConfig) {
-        return;
-    }
-    const updatedTsJestTransformer = tsquery_1.tsquery.replace(noTsJestGlobals, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX}> ObjectLiteralExpression PropertyAssignment:has(Identifier[name="transform"]) PropertyAssignment > :has(StringLiteral[value="ts-jest"], StringLiteral[value="jest-preset-angular"])`, (node) => {
-        return `[${node.getText()}, ${tsJestGlobalsConfig}]`;
-    });
-    tree.write(configPath, updatedTsJestTransformer);
-}
-function updateNgJestOptions(tree, configPath) {
-    const contents = tree.read(configPath, 'utf-8');
-    let ngJestTeardownConfig;
-    const noTeardownConfig = tsquery_1.tsquery.replace(contents, 'BinaryExpression:has(PropertyAccessExpression:has(Identifier[name=ngJest]))  PropertyAssignment:has(Identifier[name=teardown])', (node) => {
-        ngJestTeardownConfig = node.initializer.getText();
-        return ' ';
-    });
-    if (!ngJestTeardownConfig) {
-        return;
-    }
-    let maybeUpdatedTestEnvOpts = tsquery_1.tsquery.replace(noTeardownConfig, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="testEnvironmentOptions"]) ObjectLiteralExpression`, (node) => {
-        return `{
-  ${node.properties
-            .map((p) => getNodeWithComments(noTeardownConfig, p))
-            .join(',\n')},
-   teardown: ${ngJestTeardownConfig}
-  }`;
-    });
-    if (maybeUpdatedTestEnvOpts !== noTeardownConfig) {
-        tree.write(configPath, maybeUpdatedTestEnvOpts);
-        return;
-    }
-    // didn't find existing testEnvironmentOptions, so add the new property
-    const updatedConfig = tsquery_1.tsquery.replace(maybeUpdatedTestEnvOpts, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression`, (node) => {
-        return `{
-${node.properties
-            .map((p) => getNodeWithComments(maybeUpdatedTestEnvOpts, p))
-            .join(',\n')},
-testEnvironmentOptions: { teardown: ${ngJestTeardownConfig} }, 
-}`;
-    }, { visitAllChildren: false });
-    tree.write(configPath, updatedConfig);
-}
-function getGlobalTsJestConfig(node) {
-    const globalObject = node.initializer;
-    const foundConfig = globalObject.properties.find((p) => ts.isPropertyAssignment(p) && p.name.getText().includes('ts-jest'));
-    return foundConfig?.initializer?.getText() || '';
-}
-function getGlobalConfigWithoutTsJest(node) {
-    const globalObject = node?.initializer;
-    const withoutTsJest = globalObject?.properties?.filter((p) => {
-        return !(ts.isPropertyAssignment(p) && p.name.getText().includes('ts-jest'));
-    });
-    const globalConfigs = withoutTsJest.map((c) => c.getText()).join(',\n');
-    return `globals: { ${globalConfigs} }`;
-}
-function getNodeWithComments(fullText, node) {
-    const commentRanges = ts.getLeadingCommentRanges(fullText, node.getFullStart());
-    if (commentRanges?.length > 0) {
-        const withComments = `${commentRanges
-            .map((r) => fullText.slice(r.pos, r.end))
-            .join('\n')}\n${node.getText()}`;
-        return withComments;
-    }
-    return node.getText();
-}
-exports.default = updateConfigsJest29;

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

@@ -1,5 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare function updateTestsJest29(tree: Tree): Promise<void>;
-export declare function updateJestMockTypes(tree: Tree, filePath: string): void;
-export declare function updateJestMocked(tree: Tree, filePath: string): void;
-export default updateTestsJest29;

package/src/migrations/update-15-8-0/update-tests-jest-29.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateJestMocked = exports.updateJestMockTypes = exports.updateTestsJest29 = 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 ast_utils_1 = require("../../utils/ast-utils");
-async function updateTestsJest29(tree) {
-    const graph = await (0, devkit_1.createProjectGraphAsync)();
-    (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/jest:jest', (options, projectName) => {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot || projectConfig.root, (file) => {
-            if (!ast_utils_1.TEST_FILE_PATTERN.test(file)) {
-                return;
-            }
-            updateJestMockTypes(tree, file);
-            updateJestMocked(tree, file);
-        });
-    });
-    await (0, devkit_1.formatFiles)(tree);
-}
-exports.updateTestsJest29 = updateTestsJest29;
-function updateJestMockTypes(tree, filePath) {
-    const contents = tree.read(filePath, 'utf-8');
-    const updatedContent = tsquery_1.tsquery.replace(contents, ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="MaybeMockedDeep"], Identifier[name="MaybeMocked"]):has(StringLiteral[value="jest-mock"])', (node) => {
-        const text = node.getText();
-        return (text
-            // MaybeMockedDeep and MaybeMocked now are exported as Mocked and MockedShallow
-            .replace('MaybeMockedDeep', 'Mocked')
-            .replace('MaybeMocked', 'MockedShallow'));
-    });
-    tree.write(filePath, updatedContent);
-}
-exports.updateJestMockTypes = updateJestMockTypes;
-function updateJestMocked(tree, filePath) {
-    const contents = tree.read(filePath, 'utf-8');
-    const jestGlobalNodes = tsquery_1.tsquery.query(contents, ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="jest"]):has(StringLiteral[value="@jest/globals"])');
-    // this only applies if using jest from @jest/globals
-    if (jestGlobalNodes.length === 0) {
-        return;
-    }
-    const updatedJestMockTypes = tsquery_1.tsquery.replace(contents, 'CallExpression:has(Identifier[name="jest"]):has(Identifier[name="mocked"])', (node) => {
-        if (node.arguments.length === 2 &&
-            node.getText().startsWith('jest.mocked(')) {
-            const text = node.getText();
-            // jest.mocked(someObject, true); => jest.mocked(someObject);
-            if (node.arguments[1].getText() === 'true') {
-                return text.replace(/,\s*true/g, '');
-            }
-            // jest.mocked(someObject, false); => jest.mocked(someObject, {shallow: true});
-            // opt into the new behavior unless explicitly opting out
-            if (node.arguments[1].getText() === 'false') {
-                return text.replace('false', '{shallow: true}');
-            }
-        }
-    });
-    tree.write(filePath, updatedJestMockTypes);
-}
-exports.updateJestMocked = updateJestMocked;
-exports.default = updateTestsJest29;