Skip to content

Commit 2a6ded2

Browse files
sainthkhsainthkh
authored
chore: Update TypeScript to 4.4.4 (#18930)
1 parent e9accb4 commit 2a6ded2

File tree

13 files changed

+62
-28
lines changed

13 files changed

+62
-28
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
"terminal-banner": "1.1.0",
187187
"through": "2.3.8",
188188
"ts-node": "8.3.0",
189-
"typescript": "^4.2.3",
189+
"typescript": "^4.4.4",
190190
"yarn-deduplicate": "3.1.0"
191191
},
192192
"engines": {

‎packages/driver/cypress/integration/cy/snapshot_spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ describe('driver/src/cy/snapshots', () => {
9999

100100
cy.createSnapshot(null, this.$el)
101101

102-
expect(attr).to.be.calledWith('data-cypress-el', true)
102+
expect(attr).to.be.calledWith('data-cypress-el', 'true')
103103
})
104104

105105
it('removes data-cypress-el attr', function () {

‎packages/driver/src/cy/snapshots.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,7 @@ export const create = ($$, state) => {
144144
const isJqueryElement = $dom.isElement($elToHighlight) && $dom.isJquery($elToHighlight)
145145

146146
if (isJqueryElement) {
147-
// JQuery.attr doesn't support `true` as a value.
148-
// @ts-ignore
149-
($elToHighlight as JQuery<HTMLElement>).attr(HIGHLIGHT_ATTR, true)
147+
($elToHighlight as JQuery<HTMLElement>).attr(HIGHLIGHT_ATTR, 'true')
150148
}
151149

152150
// TODO: throw error here if cy is undefined!

‎packages/driver/src/cy/testConfigOverrides.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function setConfig (testConfigList: Array<TestConfig>, config, localConfigOverri
3737

3838
try {
3939
config(testConfigOverride)
40-
} catch (e) {
40+
} catch (e: any) {
4141
let err = $errUtils.errByPath('config.invalid_test_override', {
4242
errMsg: e.message,
4343
})

‎packages/network/lib/client-certificates.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ export function loadClientCertificateConfig (config) {
218218

219219
try {
220220
pki.certificateFromPem(caRaw)
221-
} catch (error) {
221+
} catch (error: any) {
222222
throw new Error(`Cannot parse CA cert: ${error.message}`)
223223
}
224224

@@ -251,7 +251,7 @@ export function loadClientCertificateConfig (config) {
251251

252252
try {
253253
pemParsed = pki.certificateFromPem(pemRaw)
254-
} catch (error) {
254+
} catch (error: any) {
255255
throw new Error(`Cannot parse PEM cert: ${error.message}`)
256256
}
257257

@@ -279,7 +279,7 @@ export function loadClientCertificateConfig (config) {
279279
throw new Error('Cannot load PEM key')
280280
}
281281
}
282-
} catch (error) {
282+
} catch (error: any) {
283283
throw new Error(`Cannot parse PEM key: ${error.message}`)
284284
}
285285

@@ -332,7 +332,7 @@ export function loadClientCertificateConfig (config) {
332332
`loaded client certificates for ${clientCertificateStore.getCertCount()} URL(s)`,
333333
)
334334
}
335-
} catch (e) {
335+
} catch (e: any) {
336336
debug(
337337
`Failed to load client certificate for clientCertificates[${index}]: ${e.message} ${e.stack}`,
338338
)
@@ -363,7 +363,7 @@ function extractSubjectFromPem (pem): string {
363363
return pem.subject.attributes
364364
.map((attr) => [attr.shortName, attr.value].join('='))
365365
.join(', ')
366-
} catch (e) {
366+
} catch (e: any) {
367367
throw new Error(`Unable to extract subject from PEM file: ${e.message}`)
368368
}
369369
}
@@ -377,7 +377,7 @@ function loadPfx (pfx: Buffer, passphrase: string | undefined) {
377377
const certAsn1 = asn1.fromDer(certDer)
378378

379379
return pkcs12.pkcs12FromAsn1(certAsn1, passphrase)
380-
} catch (e) {
380+
} catch (e: any) {
381381
debug(`loadPfx fail: ${e.message} ${e.stackTrace}`)
382382
throw new Error(`Unable to load PFX file: ${e.message}`)
383383
}
@@ -391,7 +391,7 @@ function extractSubjectFromPfx (pfx) {
391391
const certs = pfx.getBags({ bagType: pki.oids.certBag })[pki.oids.certBag].map((item) => item.cert)
392392

393393
return certs[0].subject.attributes.map((attr) => [attr.shortName, attr.value].join('=')).join(', ')
394-
} catch (e) {
394+
} catch (e: any) {
395395
throw new Error(`Unable to extract subject from PFX file: ${e.message}`)
396396
}
397397
}

‎packages/proxy/lib/http/response-middleware.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ const PatchExpressSetHeader: ResponseMiddleware = function () {
200200
// set the header manually. this way we can retain Node's original error behavior
201201
try {
202202
return originalSetHeader.call(this, name, value)
203-
} catch (err) {
203+
} catch (err: any) {
204204
if (err.code !== 'ERR_INVALID_CHAR') {
205205
throw err
206206
}

‎packages/rewriter/lib/js.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export function _rewriteJsUnsafe (url: string, js: string, deferSourceMapRewrite
5252

5353
try {
5454
astTypes.visit(ast, jsRules)
55-
} catch (err) {
55+
} catch (err: any) {
5656
// if visiting fails, it points to a bug in our rewriting logic, so raise the error to the driver
5757
return _generateDriverError(url, err)
5858
}

‎packages/rewriter/lib/threads/worker.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ parentPort!.on('message', async (req: RewriteRequest) => {
6161
const output = await _getOutput()
6262

6363
_reply({ output, threadMs: _getThreadMs() })
64-
} catch (error) {
64+
} catch (error: any) {
6565
_reply({ error, threadMs: _getThreadMs() })
6666
}
6767

‎packages/runner-shared/src/header/index.tsx

+4
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,10 @@ export class Header extends Component<HeaderProps> {
262262

263263
if (!this._studioNeedsUrl) return
264264

265+
// Note: changes in TypeScript 4.4.4 made the code below fail the type check.
266+
// ts interprets visitUrl below as (url: null | undefined) => never
267+
// TODO: studio/studio-recorder.js should be converted to ts. And add proper type.
268+
// @ts-ignore
265269
studioRecorder.visitUrl(this.urlInput)
266270

267271
this.urlInput = ''

‎packages/server/lib/util/file-opener.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const openFile = (fileDetails) => {
1111
if (openerId === 'computer') {
1212
try {
1313
require('electron').shell.showItemInFolder(fileDetails.file)
14-
} catch (err) {
14+
} catch (err: any) {
1515
debug('error opening file: %s', err.stack)
1616
}
1717

‎packages/web-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@babel/preset-react": "7.9.4",
1212
"@babel/preset-typescript": "7.9.0",
1313
"@babel/register": "7.9.0",
14-
"@types/jsdom": "12.2.4",
14+
"@types/jsdom": "16.2.13",
1515
"@types/mock-require": "2.0.0",
1616
"@types/webpack": "4.41.0",
1717
"@types/webpack-dev-server": "^4.0.0",

‎patches/react-vtree+3.0.0-beta.1.patch

+27
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,30 @@ index bb27d60..a4f244f 100644
100100
+// getRecordData: (index: number) => TNodePublicState;
101101
+// treeData: any;
102102
+// }>) => string;
103+
diff --git a/node_modules/react-vtree/dist/lib/utils.d.ts b/node_modules/react-vtree/dist/lib/utils.d.ts
104+
index bb27d60..d5ac63c 100644
105+
--- a/node_modules/react-vtree/dist/lib/utils.d.ts
106+
+++ b/node_modules/react-vtree/dist/lib/utils.d.ts
107+
@@ -12,14 +12,14 @@ export declare type RequestIdleCallbackDeadline = Readonly<{
108+
didTimeout: boolean;
109+
timeRemaining: () => number;
110+
}>;
111+
-declare global {
112+
- const requestIdleCallback: (callback: (deadline: RequestIdleCallbackDeadline) => void, opts?: RequestIdleCallbackOptions) => RequestIdleCallbackHandle;
113+
- const cancelIdleCallback: (handle: RequestIdleCallbackHandle) => void;
114+
- interface Window {
115+
- requestIdleCallback: typeof requestIdleCallback;
116+
- cancelIdleCallback: typeof cancelIdleCallback;
117+
- }
118+
-}
119+
+// declare global {
120+
+// const requestIdleCallback: (callback: (deadline: RequestIdleCallbackDeadline) => void, opts?: RequestIdleCallbackOptions) => RequestIdleCallbackHandle;
121+
+// const cancelIdleCallback: (handle: RequestIdleCallbackHandle) => void;
122+
+// interface Window {
123+
+// requestIdleCallback: typeof requestIdleCallback;
124+
+// cancelIdleCallback: typeof cancelIdleCallback;
125+
+// }
126+
+// }
127+
export declare type DefaultTreeProps = TreeProps<NodeData, NodePublicState<NodeData>, FixedSizeList>;
128+
export declare type DefaultTreeState = TreeState<NodeData, NodePublicState<NodeData>, FixedSizeList>;
129+
export declare type DefaultTreeCreatorOptions = TreeCreatorOptions<NodeData, NodePublicState<NodeData>, DefaultTreeState>;

‎yarn.lock

+15-10
Original file line numberDiff line numberDiff line change
@@ -7827,9 +7827,9 @@
78277827
"@types/serve-static" "*"
78287828

78297829
"@types/filesystem@*":
7830-
version "0.0.29"
7831-
resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz#ee3748eb5be140dcf980c3bd35f11aec5f7a3748"
7832-
integrity sha512-85/1KfRedmfPGsbK8YzeaQUyV1FQAvMPMTuWFQ5EkLd2w7szhNO96bk3Rh/SKmOfd9co2rCLf0Voy4o7ECBOvw==
7830+
version "0.0.32"
7831+
resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.32.tgz#307df7cc084a2293c3c1a31151b178063e0a8edf"
7832+
integrity sha512-Yuf4jR5YYMR2DVgwuCiP11s0xuVRyPKmz8vo6HBY3CGdeMj8af93CFZX+T82+VD1+UqHOxTq31lO7MI7lepBtQ==
78337833
dependencies:
78347834
"@types/filewriter" "*"
78357835

@@ -7958,14 +7958,14 @@
79587958
dependencies:
79597959
"@types/sizzle" "*"
79607960

7961-
"@types/jsdom@12.2.4":
7962-
version "12.2.4"
7963-
resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-12.2.4.tgz#845cd4d43f95b8406d9b724ec30c03edadcd9528"
7964-
integrity sha512-q+De3S/Ri6U9uPx89YA1XuC+QIBgndIfvBaaJG0pRT8Oqa75k4Mr7G9CRZjIvlbLGIukO/31DFGFJYlQBmXf/A==
7961+
"@types/jsdom@16.2.13":
7962+
version "16.2.13"
7963+
resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-16.2.13.tgz#126c8b7441b159d6234610a48de77b6066f1823f"
7964+
integrity sha512-8JQCjdeAidptSsOcRWk2iTm9wCcwn9l+kRG6k5bzUacrnm1ezV4forq0kWjUih/tumAeoG+OspOvQEbbRucBTw==
79657965
dependencies:
79667966
"@types/node" "*"
7967+
"@types/parse5" "*"
79677968
"@types/tough-cookie" "*"
7968-
parse5 "^4.0.0"
79697969

79707970
"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8":
79717971
version "7.0.9"
@@ -29821,7 +29821,7 @@ parse5-sax-parser@^6.0.1:
2982129821
dependencies:
2982229822
parse5 "^6.0.1"
2982329823

29824-
parse5@4.0.0, parse5@^4.0.0:
29824+
parse5@4.0.0:
2982529825
version "4.0.0"
2982629826
resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
2982729827
integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
@@ -38330,7 +38330,7 @@ typescript@4.1.5:
3833038330
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72"
3833138331
integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==
3833238332

38333-
typescript@4.2.4, typescript@^4.2.3, typescript@~4.2.4:
38333+
typescript@4.2.4, typescript@~4.2.4:
3833438334
version "4.2.4"
3833538335
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
3833638336
integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
@@ -38340,6 +38340,11 @@ typescript@^3.9.7:
3834038340
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.9.tgz#e69905c54bc0681d0518bd4d587cc6f2d0b1a674"
3834138341
integrity sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==
3834238342

38343+
typescript@^4.2.3, typescript@^4.4.4:
38344+
version "4.4.4"
38345+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c"
38346+
integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==
38347+
3834338348
ua-parser-js@0.7.24, ua-parser-js@^0.7.18:
3834438349
version "0.7.24"
3834538350
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.24.tgz#8d3ecea46ed4f1f1d63ec25f17d8568105dc027c"

0 commit comments

Comments
 (0)