Resolve dynamic dependencies correctly when a mapping exists

CHANGELOG.md

@@ -43,6 +43,7 @@
 
 ### Fixes
 
+- `[jest-resolve-dependencies]` Handle dynamic dependencies correctly even when using module maps ([#9303](https://github.com/facebook/jest/pull/9303))
 - `[expect]` Display `expectedDiff` more carefully in `toBeCloseTo` ([#8389](https://github.com/facebook/jest/pull/8389))
 - `[expect]` Avoid incorrect difference for subset when `toMatchObject` fails ([#9005](https://github.com/facebook/jest/pull/9005))
 - `[expect]` Consider all RegExp flags for equality ([#9167](https://github.com/facebook/jest/pull/9167))

e2e/__tests__/watchDynamicRequires.test.ts

@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import * as path from 'path';
+import {json as runWithJson} from '../runJest';
+
+const dir = path.resolve(__dirname, '../watch-dynamic-requires');
+
+test('successfully transpiles async', () => {
+  const {json} = runWithJson(dir, ['--findRelatedTests', 'dynamicRequire.js']);
+  expect(json.success).toBe(true);
+  expect(json.numTotalTests).toBe(2);
+});

e2e/watch-dynamic-requires/__tests__/dynamicRequire.test.js

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+test('loading a file with a dynamic local require should work', () => {
+  const {withStandardResolution} = require('../dynamicRequire');
+  expect(withStandardResolution()).toBe(1);
+});
+
+test('loading a file with a dynamic require and custom resolve should work', () => {
+  const {withCustomResolution} = require('../dynamicRequire');
+  expect(withCustomResolution()).toBe(1);
+});

e2e/watch-dynamic-requires/dynamicRequire.js

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+const dynamicModuleName = 'source';
+
+module.exports.withStandardResolution = () =>
+  require(`./${dynamicModuleName}.js`);
+module.exports.withCustomResolution = () =>
+  require(`$asdf/${dynamicModuleName}.js`);

e2e/watch-dynamic-requires/package.json

@@ -0,0 +1,7 @@
+{
+  "jest": {
+    "moduleNameMapper": {
+      "^\\$asdf/(.*)$": "<rootDir>/$1"
+    }
+  }
+}

e2e/watch-dynamic-requires/source.js

@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+module.exports = 1;

packages/jest-resolve-dependencies/src/index.ts

@@ -58,8 +58,12 @@ class DependencyResolver {
           dependency,
           options,
         );
-      } catch (e) {
-        resolvedDependency = this._resolver.getMockModule(file, dependency);
+      } catch {
+        try {
+          resolvedDependency = this._resolver.getMockModule(file, dependency);
+        } catch {
+          resolvedDependency = null;
+        }
       }
 
       if (resolvedDependency) {