Skip to content

Commit 3e38157

Browse files
mrazauskasmrazauskas
authored
chore: bump typescript to v4.7 (#12901)
1 parent bd1fcbe commit 3e38157

File tree

27 files changed

+113
-84
lines changed

27 files changed

+113
-84
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
- `[@jest/expect-utils]` Fix deep equality of ImmutableJS OrderedMaps ([#12763](https://github.com/facebook/jest/pull/12899))
1212
- `[jest-docblock]` Handle multiline comments in parseWithComments ([#12845](https://github.com/facebook/jest/pull/12845))
13+
- `[jest-mock]` Improve `spyOn` error messages ([#12901](https://github.com/facebook/jest/pull/12901))
1314
- `[jest-worker]` Make `JestWorkerFarm` helper type to include methods of worker module that take more than one argument ([#12839](https://github.com/facebook/jest/pull/12839))
1415

1516
### Chore & Maintenance

‎e2e/coverage-remapping/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"testEnvironment": "node"
88
},
99
"dependencies": {
10-
"typescript": "^4.6.2"
10+
"typescript": "^4.7.2"
1111
}
1212
}

‎e2e/coverage-remapping/yarn.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ __metadata:
99
version: 0.0.0-use.local
1010
resolution: "root-workspace-0b6124@workspace:."
1111
dependencies:
12-
typescript: ^4.6.2
12+
typescript: ^4.7.2
1313
languageName: unknown
1414
linkType: soft
1515

16-
"typescript@npm:^4.6.2":
17-
version: 4.6.3
18-
resolution: "typescript@npm:4.6.3"
16+
"typescript@npm:^4.7.2":
17+
version: 4.7.2
18+
resolution: "typescript@npm:4.7.2"
1919
bin:
2020
tsc: bin/tsc
2121
tsserver: bin/tsserver
22-
checksum: 255bb26c8cb846ca689dd1c3a56587af4f69055907aa2c154796ea28ee0dea871535b1c78f85a6212c77f2657843a269c3a742d09d81495b97b914bf7920415b
22+
checksum: 5163585e6b56410f77d5483b698d9489bbee8902c99029eb70cf6d21525a186530ce19a00951af84eefd4a131cc51d0959f5118e25e70ab61f45ac4057dbd1ef
2323
languageName: node
2424
linkType: hard
2525

26-
"typescript@patch:typescript@^4.6.2#~builtin<compat/typescript>":
27-
version: 4.6.3
28-
resolution: "typescript@patch:typescript@npm%3A4.6.3#~builtin<compat/typescript>::version=4.6.3&hash=7ad353"
26+
"typescript@patch:typescript@^4.7.2#~builtin<compat/typescript>":
27+
version: 4.7.2
28+
resolution: "typescript@patch:typescript@npm%3A4.7.2#~builtin<compat/typescript>::version=4.7.2&hash=7ad353"
2929
bin:
3030
tsc: bin/tsc
3131
tsserver: bin/tsserver
32-
checksum: 6bf45caf847062420592e711bc9c28bf5f9a9a7fa8245343b81493e4ededae33f1774009d1234d911422d1646a2c839f44e1a23ecb111b40a60ac2ea4c1482a8
32+
checksum: 7e2b9a9f4a70fb7616f1b0d986977f8e34a74f046202fa7f24fdee79589598277810fa216b3776c20c0683a9235872c73be34fdb93f67f98c1efaca40999422f
3333
languageName: node
3434
linkType: hard

‎e2e/stack-trace-source-maps-with-coverage/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"testRegex": "fails"
99
},
1010
"dependencies": {
11-
"typescript": "^4.6.2"
11+
"typescript": "^4.7.2"
1212
}
1313
}

‎e2e/stack-trace-source-maps-with-coverage/yarn.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ __metadata:
99
version: 0.0.0-use.local
1010
resolution: "root-workspace-0b6124@workspace:."
1111
dependencies:
12-
typescript: ^4.6.2
12+
typescript: ^4.7.2
1313
languageName: unknown
1414
linkType: soft
1515

16-
"typescript@npm:^4.6.2":
17-
version: 4.6.3
18-
resolution: "typescript@npm:4.6.3"
16+
"typescript@npm:^4.7.2":
17+
version: 4.7.2
18+
resolution: "typescript@npm:4.7.2"
1919
bin:
2020
tsc: bin/tsc
2121
tsserver: bin/tsserver
22-
checksum: 255bb26c8cb846ca689dd1c3a56587af4f69055907aa2c154796ea28ee0dea871535b1c78f85a6212c77f2657843a269c3a742d09d81495b97b914bf7920415b
22+
checksum: 5163585e6b56410f77d5483b698d9489bbee8902c99029eb70cf6d21525a186530ce19a00951af84eefd4a131cc51d0959f5118e25e70ab61f45ac4057dbd1ef
2323
languageName: node
2424
linkType: hard
2525

26-
"typescript@patch:typescript@^4.6.2#~builtin<compat/typescript>":
27-
version: 4.6.3
28-
resolution: "typescript@patch:typescript@npm%3A4.6.3#~builtin<compat/typescript>::version=4.6.3&hash=7ad353"
26+
"typescript@patch:typescript@^4.7.2#~builtin<compat/typescript>":
27+
version: 4.7.2
28+
resolution: "typescript@patch:typescript@npm%3A4.7.2#~builtin<compat/typescript>::version=4.7.2&hash=7ad353"
2929
bin:
3030
tsc: bin/tsc
3131
tsserver: bin/tsserver
32-
checksum: 6bf45caf847062420592e711bc9c28bf5f9a9a7fa8245343b81493e4ededae33f1774009d1234d911422d1646a2c839f44e1a23ecb111b40a60ac2ea4c1482a8
32+
checksum: 7e2b9a9f4a70fb7616f1b0d986977f8e34a74f046202fa7f24fdee79589598277810fa216b3776c20c0683a9235872c73be34fdb93f67f98c1efaca40999422f
3333
languageName: node
3434
linkType: hard

‎e2e/stack-trace-source-maps/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"testRegex": "fails"
99
},
1010
"dependencies": {
11-
"typescript": "^4.6.2"
11+
"typescript": "^4.7.2"
1212
}
1313
}

‎e2e/stack-trace-source-maps/yarn.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ __metadata:
99
version: 0.0.0-use.local
1010
resolution: "root-workspace-0b6124@workspace:."
1111
dependencies:
12-
typescript: ^4.6.2
12+
typescript: ^4.7.2
1313
languageName: unknown
1414
linkType: soft
1515

16-
"typescript@npm:^4.6.2":
17-
version: 4.6.3
18-
resolution: "typescript@npm:4.6.3"
16+
"typescript@npm:^4.7.2":
17+
version: 4.7.2
18+
resolution: "typescript@npm:4.7.2"
1919
bin:
2020
tsc: bin/tsc
2121
tsserver: bin/tsserver
22-
checksum: 255bb26c8cb846ca689dd1c3a56587af4f69055907aa2c154796ea28ee0dea871535b1c78f85a6212c77f2657843a269c3a742d09d81495b97b914bf7920415b
22+
checksum: 5163585e6b56410f77d5483b698d9489bbee8902c99029eb70cf6d21525a186530ce19a00951af84eefd4a131cc51d0959f5118e25e70ab61f45ac4057dbd1ef
2323
languageName: node
2424
linkType: hard
2525

26-
"typescript@patch:typescript@^4.6.2#~builtin<compat/typescript>":
27-
version: 4.6.3
28-
resolution: "typescript@patch:typescript@npm%3A4.6.3#~builtin<compat/typescript>::version=4.6.3&hash=7ad353"
26+
"typescript@patch:typescript@^4.7.2#~builtin<compat/typescript>":
27+
version: 4.7.2
28+
resolution: "typescript@patch:typescript@npm%3A4.7.2#~builtin<compat/typescript>::version=4.7.2&hash=7ad353"
2929
bin:
3030
tsc: bin/tsc
3131
tsserver: bin/tsserver
32-
checksum: 6bf45caf847062420592e711bc9c28bf5f9a9a7fa8245343b81493e4ededae33f1774009d1234d911422d1646a2c839f44e1a23ecb111b40a60ac2ea4c1482a8
32+
checksum: 7e2b9a9f4a70fb7616f1b0d986977f8e34a74f046202fa7f24fdee79589598277810fa216b3776c20c0683a9235872c73be34fdb93f67f98c1efaca40999422f
3333
languageName: node
3434
linkType: hard

‎e2e/typescript-coverage/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"testEnvironment": "node"
88
},
99
"dependencies": {
10-
"typescript": "^4.6.2"
10+
"typescript": "^4.7.2"
1111
}
1212
}

‎e2e/typescript-coverage/yarn.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ __metadata:
99
version: 0.0.0-use.local
1010
resolution: "root-workspace-0b6124@workspace:."
1111
dependencies:
12-
typescript: ^4.6.2
12+
typescript: ^4.7.2
1313
languageName: unknown
1414
linkType: soft
1515

16-
"typescript@npm:^4.6.2":
17-
version: 4.6.3
18-
resolution: "typescript@npm:4.6.3"
16+
"typescript@npm:^4.7.2":
17+
version: 4.7.2
18+
resolution: "typescript@npm:4.7.2"
1919
bin:
2020
tsc: bin/tsc
2121
tsserver: bin/tsserver
22-
checksum: 255bb26c8cb846ca689dd1c3a56587af4f69055907aa2c154796ea28ee0dea871535b1c78f85a6212c77f2657843a269c3a742d09d81495b97b914bf7920415b
22+
checksum: 5163585e6b56410f77d5483b698d9489bbee8902c99029eb70cf6d21525a186530ce19a00951af84eefd4a131cc51d0959f5118e25e70ab61f45ac4057dbd1ef
2323
languageName: node
2424
linkType: hard
2525

26-
"typescript@patch:typescript@^4.6.2#~builtin<compat/typescript>":
27-
version: 4.6.3
28-
resolution: "typescript@patch:typescript@npm%3A4.6.3#~builtin<compat/typescript>::version=4.6.3&hash=7ad353"
26+
"typescript@patch:typescript@^4.7.2#~builtin<compat/typescript>":
27+
version: 4.7.2
28+
resolution: "typescript@patch:typescript@npm%3A4.7.2#~builtin<compat/typescript>::version=4.7.2&hash=7ad353"
2929
bin:
3030
tsc: bin/tsc
3131
tsserver: bin/tsserver
32-
checksum: 6bf45caf847062420592e711bc9c28bf5f9a9a7fa8245343b81493e4ededae33f1774009d1234d911422d1646a2c839f44e1a23ecb111b40a60ac2ea4c1482a8
32+
checksum: 7e2b9a9f4a70fb7616f1b0d986977f8e34a74f046202fa7f24fdee79589598277810fa216b3776c20c0683a9235872c73be34fdb93f67f98c1efaca40999422f
3333
languageName: node
3434
linkType: hard

‎examples/angular/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"core-js": "^3.2.1",
1616
"rxjs": "^7.5.5",
1717
"tslib": "^2.0.0",
18-
"typescript": "^4.6.2",
18+
"typescript": "^4.7.2",
1919
"zone.js": "~0.11.3"
2020
},
2121
"devDependencies": {

‎examples/typescript/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"dependencies": {
66
"react": "17.0.2",
77
"react-dom": "^17.0.1",
8-
"typescript": "^4.6.2"
8+
"typescript": "^4.7.2"
99
},
1010
"devDependencies": {
1111
"@babel/core": "^7.11.6",

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@jest/test-utils": "workspace:*",
1515
"@microsoft/api-extractor": "^7.23.0",
1616
"@tsconfig/node12": "^1.0.9",
17-
"@tsd/typescript": "~4.6.2",
17+
"@tsd/typescript": "~4.7.2",
1818
"@types/babel__core": "^7.1.14",
1919
"@types/babel__generator": "^7.0.0",
2020
"@types/babel__template": "^7.0.2",
@@ -81,7 +81,7 @@
8181
"throat": "^6.0.1",
8282
"ts-node": "^10.5.0",
8383
"type-fest": "^2.11.2",
84-
"typescript": "^4.6.2",
84+
"typescript": "^4.7.2",
8585
"which": "^2.0.1"
8686
},
8787
"scripts": {

‎packages/expect/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"devDependencies": {
2828
"@jest/test-utils": "^28.1.0",
29-
"@tsd/typescript": "~4.6.2",
29+
"@tsd/typescript": "~4.7.2",
3030
"chalk": "^4.0.0",
3131
"fast-check": "^3.0.0",
3232
"immutable": "^4.0.0",

‎packages/jest-cli/src/init/__tests__/fixtures/typescript-in-dependencies/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "typescript_in_dev_dependencies",
33
"devDependencies": {
4-
"typescript": "^4.6.2"
4+
"typescript": "^4.7.2"
55
}
66
}

‎packages/jest-cli/src/init/__tests__/fixtures/typescript-in-dev-dependencies/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "only-package-json",
33
"dependencies": {
4-
"typescript": "^4.6.2"
4+
"typescript": "^4.7.2"
55
}
66
}

‎packages/jest-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@types/micromatch": "^4.0.1",
5959
"semver": "^7.3.5",
6060
"ts-node": "^10.5.0",
61-
"typescript": "^4.6.2"
61+
"typescript": "^4.7.2"
6262
},
6363
"engines": {
6464
"node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"

‎packages/jest-expect/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"jest-snapshot": "^28.1.0"
2222
},
2323
"devDependencies": {
24-
"@tsd/typescript": "~4.6.2",
24+
"@tsd/typescript": "~4.7.2",
2525
"tsd-lite": "^0.5.1"
2626
},
2727
"engines": {

‎packages/jest-mock/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@types/node": "*"
2222
},
2323
"devDependencies": {
24-
"@tsd/typescript": "~4.6.2",
24+
"@tsd/typescript": "~4.7.2",
2525
"tsd-lite": "^0.5.1"
2626
},
2727
"engines": {

‎packages/jest-mock/src/index.ts

+14-6
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,9 @@ export class ModuleMocker {
10871087
if (!this.isMockFunction(original)) {
10881088
if (typeof original !== 'function') {
10891089
throw new Error(
1090-
`Cannot spy the ${methodName} property because it is not a function; ${this._typeOf(
1090+
`Cannot spy the ${String(
1091+
methodName,
1092+
)} property because it is not a function; ${this._typeOf(
10911093
original,
10921094
)} given instead`,
10931095
);
@@ -1149,7 +1151,9 @@ export class ModuleMocker {
11491151

11501152
if (!obj) {
11511153
throw new Error(
1152-
`spyOn could not find an object to spy upon for ${propertyName}`,
1154+
`spyOn could not find an object to spy upon for ${String(
1155+
propertyName,
1156+
)}`,
11531157
);
11541158
}
11551159

@@ -1166,16 +1170,18 @@ export class ModuleMocker {
11661170
}
11671171

11681172
if (!descriptor) {
1169-
throw new Error(`${propertyName} property does not exist`);
1173+
throw new Error(`${String(propertyName)} property does not exist`);
11701174
}
11711175

11721176
if (!descriptor.configurable) {
1173-
throw new Error(`${propertyName} is not declared configurable`);
1177+
throw new Error(`${String(propertyName)} is not declared configurable`);
11741178
}
11751179

11761180
if (!descriptor[accessType]) {
11771181
throw new Error(
1178-
`Property ${propertyName} does not have access type ${accessType}`,
1182+
`Property ${String(
1183+
propertyName,
1184+
)} does not have access type ${accessType}`,
11791185
);
11801186
}
11811187

@@ -1184,7 +1190,9 @@ export class ModuleMocker {
11841190
if (!this.isMockFunction(original)) {
11851191
if (typeof original !== 'function') {
11861192
throw new Error(
1187-
`Cannot spy the ${propertyName} property because it is not a function; ${this._typeOf(
1193+
`Cannot spy the ${String(
1194+
propertyName,
1195+
)} property because it is not a function; ${this._typeOf(
11881196
original,
11891197
)} given instead`,
11901198
);

‎packages/jest-reporters/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
},
4141
"devDependencies": {
4242
"@jest/test-utils": "^28.1.0",
43-
"@tsd/typescript": "~4.6.2",
43+
"@tsd/typescript": "~4.7.2",
4444
"@types/exit": "^0.1.30",
4545
"@types/glob": "^7.1.1",
4646
"@types/graceful-fs": "^4.1.3",

‎packages/jest-resolve/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"slash": "^3.0.0"
2929
},
3030
"devDependencies": {
31-
"@tsd/typescript": "~4.6.2",
31+
"@tsd/typescript": "~4.7.2",
3232
"@types/graceful-fs": "^4.1.3",
3333
"@types/pnpapi": "^0.0.2",
3434
"@types/resolve": "^1.20.2",

‎packages/jest-runner/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"throat": "^6.0.1"
4141
},
4242
"devDependencies": {
43-
"@tsd/typescript": "~4.6.2",
43+
"@tsd/typescript": "~4.7.2",
4444
"@types/exit": "^0.1.30",
4545
"@types/graceful-fs": "^4.1.3",
4646
"@types/source-map-support": "^0.5.0",

‎packages/jest-snapshot/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@babel/preset-flow": "^7.7.2",
4646
"@babel/preset-react": "^7.12.1",
4747
"@jest/test-utils": "^28.1.0",
48-
"@tsd/typescript": "~4.6.2",
48+
"@tsd/typescript": "~4.7.2",
4949
"@types/graceful-fs": "^4.1.3",
5050
"@types/natural-compare": "^1.4.0",
5151
"@types/semver": "^7.1.0",

‎packages/jest-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"chalk": "^4.0.0"
2929
},
3030
"devDependencies": {
31-
"@tsd/typescript": "~4.6.2",
31+
"@tsd/typescript": "~4.7.2",
3232
"tsd-lite": "^0.5.1"
3333
},
3434
"publishConfig": {

‎packages/jest-worker/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"supports-color": "^8.0.0"
2323
},
2424
"devDependencies": {
25-
"@tsd/typescript": "~4.6.2",
25+
"@tsd/typescript": "~4.7.2",
2626
"@types/merge-stream": "^1.1.2",
2727
"@types/supports-color": "^8.1.0",
2828
"get-stream": "^6.0.0",

‎packages/jest/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"jest-cli": "^28.1.0"
2020
},
2121
"devDependencies": {
22-
"@tsd/typescript": "~4.6.2",
22+
"@tsd/typescript": "~4.7.2",
2323
"tsd-lite": "^0.5.1"
2424
},
2525
"peerDependencies": {

0 commit comments

Comments
 (0)