fix(jest-jasmine2, jest-types): remove jasmine types from @jest/types

CHANGELOG.md

@@ -12,11 +12,13 @@
 - `[jest-environment-node]` [**BREAKING**] Migrate to ESM ([#12340](https://github.com/facebook/jest/pull/12340))
 - `[@jest/expect-utils]` New module exporting utils for `expect` ([#12323](https://github.com/facebook/jest/pull/12323))
 - `[jest-jasmine2, jest-runtime]` [**BREAKING**] Use `Symbol` to pass `jest.setTimeout` value instead of `jasmine` specific logic ([#12124](https://github.com/facebook/jest/pull/12124))
+- `[jest-jasmine2, jest-types]` [**BREAKING**] Move all `jasmine` specific types from `@jest/types` to its own package ([#12125](https://github.com/facebook/jest/pull/12125))
 - `[jest-snapshot]` [**BREAKING**] Migrate to ESM ([#12342](https://github.com/facebook/jest/pull/12342))
 - `[jest-worker]` [**BREAKING**] Allow only absolute `workerPath` ([#12343](https://github.com/facebook/jest/pull/12343))
 
 ### Fixes
 
+- `[babel-jest]` Add `process.version` chunk to the cache key ([#12122](https://github.com/facebook/jest/pull/12122))
 - `[expect]` Move typings of `.not`, `.rejects` and `.resolves` modifiers outside of `Matchers` interface ([#12346](https://github.com/facebook/jest/pull/12346))
 - `[jest-phabricator]` [**BREAKING**] Convert to ESM ([#12341](https://github.com/facebook/jest/pull/12341))
 

packages/jest-jasmine2/src/errorOnPrivate.ts

@@ -7,29 +7,17 @@
 
 import type {Global} from '@jest/types';
 import {ErrorWithStack} from 'jest-util';
-import type {Jasmine} from './types';
-
-type DisabledGlobalKeys = 'fail' | 'pending' | 'spyOn' | 'spyOnProperty';
 
 // prettier-ignore
-const disabledGlobals: Record<DisabledGlobalKeys, string> = {
+const disabledGlobals: Record<string, string> = {
   fail: 'Illegal usage of global `fail`, prefer throwing an error, or the `done.fail` callback.',
   pending: 'Illegal usage of global `pending`, prefer explicitly skipping a test using `test.skip`',
   spyOn: 'Illegal usage of global `spyOn`, prefer `jest.spyOn`.',
   spyOnProperty: 'Illegal usage of global `spyOnProperty`, prefer `jest.spyOn`.',
 };
 
-type DisabledJasmineMethodsKeys =
-  | 'addMatchers'
-  | 'any'
-  | 'anything'
-  | 'arrayContaining'
-  | 'createSpy'
-  | 'objectContaining'
-  | 'stringMatching';
-
 // prettier-ignore
-const disabledJasmineMethods: Record<DisabledJasmineMethodsKeys, string> = {
+const disabledJasmineMethods: Record<string, string> = {
   addMatchers: 'Illegal usage of `jasmine.addMatchers`, prefer `expect.extends`.',
   any: 'Illegal usage of `jasmine.any`, prefer `expect.any`.',
   anything: 'Illegal usage of `jasmine.anything`, prefer `expect.anything`.',
@@ -40,21 +28,19 @@ const disabledJasmineMethods: Record<DisabledJasmineMethodsKeys, string> = {
 };
 
 export function installErrorOnPrivate(global: Global.Global): void {
-  const jasmine = global.jasmine as Jasmine;
+  const jasmine = global.jasmine;
 
-  (Object.keys(disabledGlobals) as Array<DisabledGlobalKeys>).forEach(
-    functionName => {
-      global[functionName] = () => {
-        throwAtFunction(disabledGlobals[functionName], global[functionName]);
-      };
-    },
-  );
+  Object.keys(disabledGlobals).forEach(functionName => {
+    global[functionName] = () => {
+      // @ts-expect-error
+      throwAtFunction(disabledGlobals[functionName], global[functionName]);
+    };
+  });
 
-  (
-    Object.keys(disabledJasmineMethods) as Array<DisabledJasmineMethodsKeys>
-  ).forEach(methodName => {
+  Object.keys(disabledJasmineMethods).forEach(methodName => {
     // @ts-expect-error
     jasmine[methodName] = () => {
+      // @ts-expect-error
       throwAtFunction(disabledJasmineMethods[methodName], jasmine[methodName]);
     };
   });

packages/jest-jasmine2/src/jasmineAsyncInstall.ts

@@ -230,7 +230,7 @@ export default function jasmineAsyncInstall(
   globalConfig: Config.GlobalConfig,
   global: Global.Global,
 ): void {
-  const jasmine = global.jasmine as Jasmine;
+  const jasmine = global.jasmine;
   const mutex = throat(globalConfig.maxConcurrency);
 
   const env = jasmine.getEnv();

packages/jest-jasmine2/src/jestExpect.ts

@@ -7,7 +7,6 @@
 
 /* eslint-disable local/prefer-spread-eventually */
 
-import type {Global} from '@jest/types';
 import {MatcherState, expect} from 'expect';
 import {
   addSerializer,
@@ -16,9 +15,7 @@ import {
   toThrowErrorMatchingInlineSnapshot,
   toThrowErrorMatchingSnapshot,
 } from 'jest-snapshot';
-import type {Jasmine, JasmineMatchersObject, RawMatcherFn} from './types';
-
-declare const global: Global.Global;
+import type {JasmineMatchersObject, RawMatcherFn} from './types';
 
 export default function jestExpect(config: {expand: boolean}): void {
   global.expect = expect;
@@ -31,7 +28,7 @@ export default function jestExpect(config: {expand: boolean}): void {
   });
   expect.addSnapshotSerializer = addSerializer;
 
-  const jasmine = global.jasmine as Jasmine;
+  const jasmine = global.jasmine;
   jasmine.anything = expect.anything;
   jasmine.any = expect.any;
   jasmine.objectContaining = expect.objectContaining;

packages/jest-jasmine2/src/setup_jest_globals.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {Config, Global} from '@jest/types';
+import type {Config} from '@jest/types';
 import {expect} from 'expect';
 import {
   SnapshotState,
@@ -18,9 +18,6 @@ import type {
   default as JasmineSpec,
   SpecResult,
 } from './jasmine/Spec';
-import type {Jasmine} from './types';
-
-declare const global: Global.Global;
 
 export type SetupOptions = {
   config: Config.ProjectConfig;
@@ -66,7 +63,7 @@ const addAssertionErrors = (result: SpecResult) => {
 };
 
 const patchJasmine = () => {
-  (global.jasmine as Jasmine).Spec = (realSpec => {
+  global.jasmine.Spec = (realSpec => {
     class Spec extends realSpec {
       constructor(attr: Attributes) {
         const resultCallback = attr.resultCallback;
@@ -85,7 +82,7 @@ const patchJasmine = () => {
     }
 
     return Spec;
-  })((global.jasmine as Jasmine).Spec);
+  })(global.jasmine.Spec);
 };
 
 export default async function setupJestGlobals({

packages/jest-jasmine2/src/types.ts

@@ -96,6 +96,15 @@ declare global {
   namespace NodeJS {
     interface Global {
       expect: Expect;
+      jasmine: Jasmine;
+    }
+  }
+}
+
+declare module '@jest/types' {
+  namespace Global {
+    interface GlobalAdditions {
+      jasmine: Jasmine;
     }
   }
 }

packages/jest-jasmine2/tsconfig.json

@@ -1,6 +1,8 @@
 {
   "extends": "../../tsconfig",
   "compilerOptions": {
+    // we don't want `@types/jest` to be referenced
+    "types": [],
     "rootDir": "src",
     "outDir": "build"
   },

packages/jest-types/src/Global.ts

@@ -51,12 +51,6 @@ export type EachTestFn<EachCallback extends TestCallback> = (
   ...args: ReadonlyArray<any>
 ) => ReturnType<EachCallback>;
 
-// TODO: Get rid of this at some point
-type Jasmine = {
-  _DEFAULT_TIMEOUT_INTERVAL?: number;
-  addMatchers: (matchers: Record<string, unknown>) => void;
-};
-
 type Each<EachCallback extends TestCallback> =
   | ((
       table: EachTable,
@@ -124,11 +118,6 @@ export interface TestFrameworkGlobals {
 
 export interface GlobalAdditions extends TestFrameworkGlobals {
   __coverage__: CoverageMapData;
-  jasmine: Jasmine;
-  fail: () => void;
-  pending: () => void;
-  spyOn: () => void;
-  spyOnProperty: () => void;
 }
 
 export interface Global