Revert "feat: add @jest/globals package for importing globals expli…

…citly (#9801)"

This reverts commit 2882d28.

CHANGELOG.md

@@ -4,7 +4,6 @@
 
 - `[expect]` Support `async function`s in `toThrow` ([#9817](https://github.com/facebook/jest/pull/9817))
 - `[jest-console]` Add code frame to `console.error` and `console.warn` ([#9741](https://github.com/facebook/jest/pull/9741))
-- `[@jest/globals]` New package so Jest's globals can be explicitly imported ([#9801](https://github.com/facebook/jest/pull/9801))
 - `[jest-runtime, jest-jasmine2, jest-circus]` Experimental, limited ECMAScript Modules support ([#9772](https://github.com/facebook/jest/pull/9772))
 
 ### Fixes

docs/GlobalAPI.md

@@ -3,7 +3,7 @@ id: api
 title: Globals
 ---
 
-In your test files, Jest puts each of these methods and objects into the global environment. You don't have to require or import anything to use them. However, if you prefer explicit imports, you can do `import {describe, expect, it} from '@jest/globals'`.
+In your test files, Jest puts each of these methods and objects into the global environment. You don't have to require or import anything to use them.
 
 ## Methods
 

docs/JestObjectAPI.md

@@ -3,7 +3,7 @@ id: jest-object
 title: The Jest Object
 ---
 
-The `jest` object is automatically in scope within every test file. The methods in the `jest` object help create mocks and let you control Jest's overall behavior. It can also be imported explicitly by via `import {jest} from '@jest/globals'`.
+The `jest` object is automatically in scope within every test file. The methods in the `jest` object help create mocks and let you control Jest's overall behavior.
 
 ## Mock Modules
 

packages/jest-runtime/package.json

@@ -19,7 +19,6 @@
   "dependencies": {
     "@jest/console": "^25.3.0",
     "@jest/environment": "^25.3.0",
-    "@jest/globals": "^25.3.0",
     "@jest/source-map": "^25.2.6",
     "@jest/test-result": "^25.3.0",
     "@jest/transform": "^25.3.0",

packages/jest-runtime/src/index.ts

@@ -19,15 +19,14 @@ import {
   compileFunction,
 } from 'vm';
 import * as nativeModule from 'module';
-import type {Config, Global} from '@jest/types';
+import type {Config} from '@jest/types';
 import type {
   Jest,
   JestEnvironment,
   LocalModuleRequire,
   Module,
   ModuleWrapper,
 } from '@jest/environment';
-import type * as JestGlobals from '@jest/globals';
 import type {SourceMapRegistry} from '@jest/source-map';
 import {formatStackTrace, separateMessageFromStack} from 'jest-message-util';
 import {createDirectory, deepCyclicCopy} from 'jest-util';
@@ -53,11 +52,6 @@ import Resolver = require('jest-resolve');
 import Snapshot = require('jest-snapshot');
 import stripBOM = require('strip-bom');
 
-interface JestGlobalsValues extends Global.TestFrameworkGlobals {
-  jest: JestGlobals.jest;
-  expect: JestGlobals.expect;
-}
-
 type HasteMapOptions = {
   console?: Console;
   maxWorkers: number;
@@ -152,7 +146,6 @@ class Runtime {
   private _unmockList: RegExp | undefined;
   private _virtualMocks: BooleanObject;
   private _moduleImplementation?: typeof nativeModule.Module;
-  private jestObjectCaches: Map<string, Jest>;
 
   constructor(
     config: Config.ProjectConfig,
@@ -190,7 +183,6 @@ class Runtime {
     this._sourceMapRegistry = Object.create(null);
     this._fileTransforms = new Map();
     this._virtualMocks = Object.create(null);
-    this.jestObjectCaches = new Map();
 
     this._mockMetaDataCache = Object.create(null);
     this._shouldMockModuleCache = Object.create(null);
@@ -428,11 +420,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);
     }
@@ -955,13 +942,6 @@ class Runtime {
       return;
     }
 
-    const jestObject = this._createJestObjectFor(
-      filename,
-      localModule.require as LocalModuleRequire,
-    );
-
-    this.jestObjectCaches.set(filename, jestObject);
-
     try {
       compiledFunction.call(
         localModule.exports,
@@ -971,7 +951,10 @@ class Runtime {
         dirname, // __dirname
         filename, // __filename
         this._environment.global, // global object
-        jestObject, // jest object
+        this._createJestObjectFor(
+          filename,
+          localModule.require as LocalModuleRequire,
+        ), // jest object
         ...this._config.extraGlobals.map(globalVariable => {
           if (this._environment.global[globalVariable]) {
             return this._environment.global[globalVariable];
@@ -1483,30 +1466,6 @@ class Runtime {
 
     throw e;
   }
-
-  private getGlobalsForFile(from: Config.Path): JestGlobalsValues {
-    const jest = this.jestObjectCaches.get(from);
-
-    // This won't exist in ESM
-    invariant(jest, 'There should always be a Jest object already');
-
-    return {
-      afterAll: this._environment.global.afterAll,
-      afterEach: this._environment.global.afterEach,
-      beforeAll: this._environment.global.beforeAll,
-      beforeEach: this._environment.global.beforeEach,
-      describe: this._environment.global.describe,
-      expect: this._environment.global.expect,
-      fdescribe: this._environment.global.fdescribe,
-      fit: this._environment.global.fit,
-      it: this._environment.global.it,
-      jest,
-      test: this._environment.global.test,
-      xdescribe: this._environment.global.xdescribe,
-      xit: this._environment.global.xit,
-      xtest: this._environment.global.xtest,
-    };
-  }
 }
 
 function invariant(condition: unknown, message?: string): asserts condition {

packages/jest-runtime/tsconfig.json

@@ -9,7 +9,6 @@
     {"path": "../jest-console"},
     {"path": "../jest-environment"},
     {"path": "../jest-environment-node"},
-    {"path": "../jest-globals"},
     {"path": "../jest-haste-map"},
     {"path": "../jest-message-util"},
     {"path": "../jest-mock"},