@nx/jest 19.2.3 → 19.3.0-beta.1

package/package.json

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

package/src/plugins/plugin.js

@@ -6,6 +6,7 @@ const path_1 = require("path");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const fs_1 = require("fs");
 const jest_config_1 = require("jest-config");
+const jest_resolve_1 = require("jest-resolve");
 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");
@@ -88,10 +89,11 @@ async function buildJestTargets(configFilePath, projectRoot, options, context) {
     if (require.cache[absConfigFilePath]) {
         (0, config_utils_1.clearRequireCache)();
     }
+    const rawConfig = await (0, config_utils_1.loadConfigFile)(absConfigFilePath);
     const config = await (0, jest_config_1.readConfig)({
         _: [],
         $0: undefined,
-    }, absConfigFilePath);
+    }, rawConfig, undefined, (0, path_1.dirname)(absConfigFilePath));
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {};
     const target = (targets[options.targetName] = {
@@ -105,7 +107,7 @@ async function buildJestTargets(configFilePath, projectRoot, options, context) {
         },
     });
     const cache = (target.cache = true);
-    const inputs = (target.inputs = getInputs(namedInputs));
+    const inputs = (target.inputs = getInputs(namedInputs, rawConfig, projectRoot, context.workspaceRoot));
     const outputs = (target.outputs = getOutputs(projectRoot, config, context));
     let metadata;
     if (options?.ciTargetName) {
@@ -168,15 +170,51 @@ async function buildJestTargets(configFilePath, projectRoot, options, context) {
     }
     return { targets, metadata };
 }
-function getInputs(namedInputs) {
-    return [
+function getInputs(namedInputs, jestConfig, projectRoot, workspaceRoot) {
+    const inputs = [
         ...('production' in namedInputs
             ? ['default', '^production']
             : ['default', '^default']),
-        {
-            externalDependencies: ['jest'],
-        },
     ];
+    const externalDependencies = ['jest'];
+    const presetInput = resolvePresetInput(jestConfig.preset, projectRoot, workspaceRoot);
+    if (presetInput) {
+        if (typeof presetInput !== 'string' &&
+            'externalDependencies' in presetInput) {
+            externalDependencies.push(...presetInput.externalDependencies);
+        }
+        else {
+            inputs.push(presetInput);
+        }
+    }
+    inputs.push({ externalDependencies });
+    return inputs;
+}
+// preset resolution adapted from:
+// https://github.com/jestjs/jest/blob/c54bccd657fb4cf060898717c09f633b4da3eec4/packages/jest-config/src/normalize.ts#L122
+function resolvePresetInput(presetValue, projectRoot, workspaceRoot) {
+    if (!presetValue) {
+        return null;
+    }
+    let presetPath = (0, jest_config_1.replaceRootDirInPath)(projectRoot, presetValue);
+    const isNpmPackage = !presetValue.startsWith('.') && !(0, path_1.isAbsolute)(presetPath);
+    presetPath = presetPath.startsWith('.')
+        ? presetPath
+        : (0, path_1.join)(presetPath, 'jest-preset');
+    const presetModule = jest_resolve_1.default.findNodeModule(presetPath, {
+        basedir: projectRoot,
+        extensions: ['.json', '.js', '.cjs', '.mjs'],
+    });
+    if (!presetModule) {
+        return null;
+    }
+    if (isNpmPackage) {
+        return { externalDependencies: [presetValue] };
+    }
+    const relativePath = (0, path_1.relative)((0, path_1.join)(workspaceRoot, projectRoot), presetModule);
+    return relativePath.startsWith('..')
+        ? (0, path_1.join)('{workspaceRoot}', (0, path_1.join)(projectRoot, relativePath))
+        : (0, path_1.join)('{projectRoot}', relativePath);
 }
 function getOutputs(projectRoot, { globalConfig }, context) {
     function getOutput(path) {