Skip to content

Commit 11ee246

Browse files
authored
Merge branch 'main' into docs/update-tohavebeencalled
2 parents eac3730 + 50fe2ee commit 11ee246

File tree

5 files changed

+21
-24
lines changed

5 files changed

+21
-24
lines changed

packages/jest-jasmine2/src/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ export default async function jasmine2(
143143
env.addReporter(reporter);
144144

145145
runtime
146-
.requireInternalModule<typeof import('./jestExpect')>(
147-
require.resolve('./jestExpect.js'),
148-
)
146+
.requireInternalModule<
147+
typeof import('./jestExpect')
148+
>(require.resolve('./jestExpect.js'))
149149
.default({expand: globalConfig.expand});
150150

151151
if (globalConfig.errorOnDeprecated) {
@@ -164,9 +164,9 @@ export default async function jasmine2(
164164
}
165165

166166
const snapshotState: SnapshotState = await runtime
167-
.requireInternalModule<typeof import('./setup_jest_globals')>(
168-
require.resolve('./setup_jest_globals.js'),
169-
)
167+
.requireInternalModule<
168+
typeof import('./setup_jest_globals')
169+
>(require.resolve('./setup_jest_globals.js'))
170170
.default({
171171
config,
172172
globalConfig,

packages/jest-mock/src/index.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,11 @@ export interface Mock<T extends FunctionLike = UnknownFunction>
125125
(...args: Parameters<T>): ReturnType<T>;
126126
}
127127

128-
type ResolveType<T extends FunctionLike> = ReturnType<T> extends PromiseLike<
129-
infer U
130-
>
131-
? U
132-
: never;
133-
134-
type RejectType<T extends FunctionLike> = ReturnType<T> extends PromiseLike<any>
135-
? unknown
136-
: never;
128+
type ResolveType<T extends FunctionLike> =
129+
ReturnType<T> extends PromiseLike<infer U> ? U : never;
130+
131+
type RejectType<T extends FunctionLike> =
132+
ReturnType<T> extends PromiseLike<any> ? unknown : never;
137133

138134
export interface MockInstance<T extends FunctionLike = UnknownFunction> {
139135
_isMockFunction: true;

packages/jest-runner/src/runTest.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,9 @@ async function runTestInternal(
250250

251251
// For tests
252252
runtime
253-
.requireInternalModule<typeof import('source-map-support')>(
254-
require.resolve('source-map-support'),
255-
)
253+
.requireInternalModule<
254+
typeof import('source-map-support')
255+
>(require.resolve('source-map-support'))
256256
.install(sourcemapOptions);
257257

258258
// For runtime errors

packages/jest-worker/src/types.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ type MethodLikeKeys<T> = {
1717
[K in keyof T]: T[K] extends FunctionLike ? K : never;
1818
}[keyof T];
1919

20-
type Promisify<T extends FunctionLike> = ReturnType<T> extends Promise<infer R>
21-
? (...args: Parameters<T>) => Promise<R>
22-
: (...args: Parameters<T>) => Promise<ReturnType<T>>;
20+
type Promisify<T extends FunctionLike> =
21+
ReturnType<T> extends Promise<infer R>
22+
? (...args: Parameters<T>) => Promise<R>
23+
: (...args: Parameters<T>) => Promise<ReturnType<T>>;
2324

2425
export type WorkerModule<T> = {
2526
[K in keyof T as Extract<

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17206,11 +17206,11 @@ __metadata:
1720617206
linkType: hard
1720717207

1720817208
"prettier@npm:^3.0.3":
17209-
version: 3.1.1
17210-
resolution: "prettier@npm:3.1.1"
17209+
version: 3.2.2
17210+
resolution: "prettier@npm:3.2.2"
1721117211
bin:
1721217212
prettier: bin/prettier.cjs
17213-
checksum: e386855e3a1af86a748e16953f168be555ce66d6233f4ba54eb6449b88eb0c6b2ca79441b11eae6d28a7f9a5c96440ce50864b9d5f6356d331d39d6bb66c648e
17213+
checksum: b416e1e4b26c351403343ebe461feda631c0eee5c3cf316c711204a08f3c639f38a8f9177c75e98a690998ff82e8ddc80c6bc027fb4ef6cedb6a4db035b4fe9a
1721417214
languageName: node
1721517215
linkType: hard
1721617216

0 commit comments

Comments
 (0)