fix: hoist imports of @jest/globals correctly

Author: SimenB

e2e/__tests__/babelPluginJestHoist.test.ts

@@ -15,7 +15,7 @@ beforeEach(() => {
   run('yarn', DIR);
 });
 
-it('sucessfully runs the tests inside `babel-plugin-jest-hoist/`', () => {
+it('successfully runs the tests inside `babel-plugin-jest-hoist/`', () => {
   const {json} = runWithJson(DIR, ['--no-cache', '--coverage']);
   expect(json.success).toBe(true);
   expect(json.numTotalTestSuites).toBe(3);

e2e/babel-plugin-jest-hoist/__tests__/importJest.test.js

@@ -0,0 +1,18 @@
+/**
+ * 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 {jest} from '@jest/globals';
+
+// The virtual mock call below will be hoisted above this `require` call.
+const virtualModule = require('virtual-module');
+
+jest.mock('virtual-module', () => 'kiwi', {virtual: true});
+
+test('works with virtual modules', () => {
+  expect(virtualModule).toBe('kiwi');
+});

packages/babel-plugin-jest-hoist/src/index.ts

@@ -183,6 +183,13 @@ export default (): {visitor: Visitor} => {
         path.node._blockHoist = Infinity;
       }
     },
+    ImportDeclaration(path) {
+      // this seems to hoist correctly before the `commonjs` plugin runs
+      if (path.node.source.value === '@jest/globals') {
+        // @ts-ignore: private, magical property
+        path.node._blockHoist = Infinity;
+      }
+    },
   };
 
   return {visitor};

packages/jest-runtime/src/index.ts

@@ -331,11 +331,6 @@ class Runtime {
       modulePath = manualMock;
     }
 
-    if (moduleName === '@jest/globals') {
-      // @ts-ignore: we don't care that it's not assignable to T
-      return this.getGlobalsForFile(from);
-    }
-
     if (moduleName && this._resolver.isCoreModule(moduleName)) {
       return this._requireCoreModule(moduleName);
     }
@@ -526,12 +521,18 @@ class Runtime {
     };
   }
 
-  requireModuleOrMock(from: Config.Path, moduleName: string): unknown {
+  requireModuleOrMock<T = unknown>(from: Config.Path, moduleName: string): T {
+    // this module is unmockable
+    if (moduleName === '@jest/globals') {
+      // @ts-ignore: we don't care that it's not assignable to T
+      return this.getGlobalsForFile(from);
+    }
+
     try {
       if (this._shouldMock(from, moduleName)) {
-        return this.requireMock(from, moduleName);
+        return this.requireMock<T>(from, moduleName);
       } else {
-        return this.requireModule(from, moduleName);
+        return this.requireModule<T>(from, moduleName);
       }
     } catch (e) {
       const moduleNotFound = Resolver.tryCastModuleNotFoundError(e);

scripts/babel-plugin-jest-replace-ts-require-assignment.js

@@ -1,3 +1,4 @@
+
 /**
  * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
  *