Skip to content

Commit 8baa9de

Browse files
MarshallOfSoundMarshallOfSound
authored
build: update to typescript 4 (electron#25091)
1 parent 0efcaec commit 8baa9de

File tree

4 files changed

+72
-80
lines changed

4 files changed

+72
-80
lines changed

‎lib/renderer/init.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ if (nodeIntegration) {
165165
// non context-isolated environment
166166
if (!contextIsolation) {
167167
process.once('loaded', function () {
168-
delete global.process;
169-
delete global.Buffer;
170-
delete global.setImmediate;
171-
delete global.clearImmediate;
172-
delete global.global;
173-
delete global.root;
174-
delete global.GLOBAL;
168+
delete (global as any).process;
169+
delete (global as any).Buffer;
170+
delete (global as any).setImmediate;
171+
delete (global as any).clearImmediate;
172+
delete (global as any).global;
173+
delete (global as any).root;
174+
delete (global as any).GLOBAL;
175175
});
176176
}
177177
}

‎package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
66
"devDependencies": {
77
"@electron/docs-parser": "^0.9.1",
8-
"@electron/typescript-definitions": "^8.7.4",
8+
"@electron/typescript-definitions": "^8.7.5",
99
"@octokit/rest": "^18.0.3",
1010
"@primer/octicons": "^10.0.0",
1111
"@types/basic-auth": "^1.1.3",
1212
"@types/busboy": "^0.2.3",
13-
"@types/chai": "^4.2.11",
13+
"@types/chai": "^4.2.12",
1414
"@types/chai-as-promised": "^7.1.3",
1515
"@types/dirty-chai": "^2.0.2",
1616
"@types/express": "^4.17.7",
1717
"@types/fs-extra": "^9.0.1",
1818
"@types/mocha": "^7.0.2",
1919
"@types/node": "^12.12.6",
20-
"@types/semver": "^7.3.1",
20+
"@types/semver": "^7.3.3",
2121
"@types/send": "^0.14.5",
2222
"@types/split": "^1.0.0",
2323
"@types/uuid": "^3.4.6",
2424
"@types/webpack": "^4.41.21",
2525
"@types/webpack-env": "^1.15.2",
26-
"@typescript-eslint/eslint-plugin": "^3.6.0",
27-
"@typescript-eslint/parser": "^3.6.0",
26+
"@typescript-eslint/eslint-plugin": "^3.9.1",
27+
"@typescript-eslint/parser": "^3.9.1",
2828
"asar": "^3.0.3",
2929
"check-for-leaks": "^1.2.1",
3030
"colors": "^1.4.0",
@@ -58,9 +58,9 @@
5858
"tap-xunit": "^2.4.1",
5959
"temp": "^0.8.3",
6060
"timers-browserify": "1.4.2",
61-
"ts-loader": "^7.0.5",
61+
"ts-loader": "^8.0.2",
6262
"ts-node": "6.2.0",
63-
"typescript": "^3.9.6",
63+
"typescript": "^4.0.2",
6464
"webpack": "^4.43.0",
6565
"webpack-cli": "^3.3.12"
6666
},
@@ -139,4 +139,4 @@
139139
"dependencies": {
140140
"@types/temp": "^0.8.34"
141141
}
142-
}
142+
}

‎typings/internal-electron.d.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ declare namespace ElectronInternal {
224224

225225
interface DesktopCapturer {
226226
startHandling(captureWindow: boolean, captureScreen: boolean, thumbnailSize: Electron.Size, fetchWindowIcons: boolean): void;
227-
_onerror: (error: string) => void;
228-
_onfinished: (sources: Electron.DesktopCapturerSource[], fetchWindowIcons: boolean) => void;
227+
_onerror?: (error: string) => void;
228+
_onfinished?: (sources: Electron.DesktopCapturerSource[], fetchWindowIcons: boolean) => void;
229229
}
230230

231231
interface GetSourcesOptions {
@@ -289,9 +289,9 @@ declare namespace ElectronInternal {
289289

290290
public contentWindow: Window;
291291

292-
public connectedCallback(): void;
293-
public attributeChangedCallback(): void;
294-
public disconnectedCallback(): void;
292+
public connectedCallback?(): void;
293+
public attributeChangedCallback?(): void;
294+
public disconnectedCallback?(): void;
295295

296296
// Created in web-view-impl
297297
public getWebContentsId(): number;

‎yarn.lock‎

Lines changed: 52 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
ora "^4.0.3"
3434
pretty-ms "^5.1.0"
3535

36-
"@electron/typescript-definitions@^8.7.4":
37-
version "8.7.4"
38-
resolved "https://registry.yarnpkg.com/@electron/typescript-definitions/-/typescript-definitions-8.7.4.tgz#d42f86dd9ee60a3e9c91afd63793cfaaae4d6472"
39-
integrity sha512-LCd2zYtnPA5u9jGjVuUdTt+HlGLraoM8Z0Gob23znAEHsmCly2Rz0R1M90LA4PoEJ15a4wmKgSsL8tkIWlG18g==
36+
"@electron/typescript-definitions@^8.7.5":
37+
version "8.7.5"
38+
resolved "https://registry.yarnpkg.com/@electron/typescript-definitions/-/typescript-definitions-8.7.5.tgz#d141b10a7abbe2ef72e4083f6eb4d344c3b886c9"
39+
integrity sha512-Q/0Iuas9PkDvLvejC9TYyVh+LdFF0GalHy6i2ZvMRS8MzYk3BLJI1ZsA2o4Z8DXk9G4b2ZVx8L3aNdDUvTjhGw==
4040
dependencies:
4141
"@types/node" "^11.13.7"
4242
chalk "^2.4.2"
@@ -49,7 +49,6 @@
4949
mkdirp "^0.5.1"
5050
ora "^3.4.0"
5151
pretty-ms "^5.0.0"
52-
typescript "^3.4.5"
5352

5453
"@nodelib/fs.scandir@2.1.3":
5554
version "2.1.3"
@@ -222,10 +221,10 @@
222221
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.7.tgz#1b8e33b61a8c09cbe1f85133071baa0dbf9fa71a"
223222
integrity sha512-2Y8uPt0/jwjhQ6EiluT0XCri1Dbplr0ZxfFXUz+ye13gaqE8u5gL5ppao1JrUYr9cIip5S6MvQzBS7Kke7U9VA==
224223

225-
"@types/chai@^4.2.11":
226-
version "4.2.11"
227-
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.11.tgz#d3614d6c5f500142358e6ed24e1bf16657536c50"
228-
integrity sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==
224+
"@types/chai@^4.2.12":
225+
version "4.2.12"
226+
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.12.tgz#6160ae454cd89dae05adc3bb97997f488b608201"
227+
integrity sha512-aN5IAC8QNtSUdQzxu7lGBgYAOuU1tmRU4c9dIq5OKGf/SBVjXo+ffM2wEjudAWbgpOhy60nLoAGH1xm8fpCKFQ==
229228

230229
"@types/color-name@^1.1.1":
231230
version "1.1.1"
@@ -374,12 +373,10 @@
374373
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
375374
integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
376375

377-
"@types/semver@^7.3.1":
378-
version "7.3.1"
379-
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.1.tgz#7a9a5d595b6d873f338c867dcef64df289468cfa"
380-
integrity sha512-ooD/FJ8EuwlDKOI6D9HWxgIgJjMg2cuziXm/42npDC8y4NjxplBUn9loewZiBNCt44450lHAU0OSb51/UqXeag==
381-
dependencies:
382-
"@types/node" "*"
376+
"@types/semver@^7.3.3":
377+
version "7.3.3"
378+
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.3.tgz#3ad6ed949e7487e7bda6f886b4a2434a2c3d7b1a"
379+
integrity sha512-jQxClWFzv9IXdLdhSaTf16XI3NYe6zrEbckSpb5xhKfPbWgIyAY0AFyWWWfaiDcBuj3UHmMkCIwSRqpKMTZL2Q==
383380

384381
"@types/send@^0.14.5":
385382
version "0.14.5"
@@ -474,63 +471,63 @@
474471
"@types/webpack-sources" "*"
475472
source-map "^0.6.0"
476473

477-
"@typescript-eslint/eslint-plugin@^3.6.0":
478-
version "3.6.0"
479-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.6.0.tgz#ba2b6cae478b8fca3f2e58ff1313e4198eea2d8a"
480-
integrity sha512-ubHlHVt1lsPQB/CZdEov9XuOFhNG9YRC//kuiS1cMQI6Bs1SsqKrEmZnpgRwthGR09/kEDtr9MywlqXyyYd8GA==
474+
"@typescript-eslint/eslint-plugin@^3.9.1":
475+
version "3.9.1"
476+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.9.1.tgz#8cf27b6227d12d66dd8dc1f1a4b04d1daad51c2e"
477+
integrity sha512-XIr+Mfv7i4paEdBf0JFdIl9/tVxyj+rlilWIfZ97Be0lZ7hPvUbS5iHt9Glc8kRI53dsr0PcAEudbf8rO2wGgg==
481478
dependencies:
482-
"@typescript-eslint/experimental-utils" "3.6.0"
479+
"@typescript-eslint/experimental-utils" "3.9.1"
483480
debug "^4.1.1"
484481
functional-red-black-tree "^1.0.1"
485482
regexpp "^3.0.0"
486483
semver "^7.3.2"
487484
tsutils "^3.17.1"
488485

489-
"@typescript-eslint/experimental-utils@3.6.0":
490-
version "3.6.0"
491-
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.6.0.tgz#0138152d66e3e53a6340f606793fb257bf2d76a1"
492-
integrity sha512-4Vdf2hvYMUnTdkCNZu+yYlFtL2v+N2R7JOynIOkFbPjf9o9wQvRwRkzUdWlFd2YiiUwJLbuuLnl5civNg5ykOQ==
486+
"@typescript-eslint/experimental-utils@3.9.1":
487+
version "3.9.1"
488+
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.9.1.tgz#b140b2dc7a7554a44f8a86fb6fe7cbfe57ca059e"
489+
integrity sha512-lkiZ8iBBaYoyEKhCkkw4SAeatXyBq9Ece5bZXdLe1LWBUwTszGbmbiqmQbwWA8cSYDnjWXp9eDbXpf9Sn0hLAg==
493490
dependencies:
494491
"@types/json-schema" "^7.0.3"
495-
"@typescript-eslint/types" "3.6.0"
496-
"@typescript-eslint/typescript-estree" "3.6.0"
492+
"@typescript-eslint/types" "3.9.1"
493+
"@typescript-eslint/typescript-estree" "3.9.1"
497494
eslint-scope "^5.0.0"
498495
eslint-utils "^2.0.0"
499496

500-
"@typescript-eslint/parser@^3.6.0":
501-
version "3.6.0"
502-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.6.0.tgz#79b5232e1a2d06f1fc745942b690cd87aca7b60e"
503-
integrity sha512-taghDxuLhbDAD1U5Fk8vF+MnR0yiFE9Z3v2/bYScFb0N1I9SK8eKHkdJl1DAD48OGFDMFTeOTX0z7g0W6SYUXw==
497+
"@typescript-eslint/parser@^3.9.1":
498+
version "3.9.1"
499+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.9.1.tgz#ab7983abaea0ae138ff5671c7c7739d8a191b181"
500+
integrity sha512-y5QvPFUn4Vl4qM40lI+pNWhTcOWtpZAJ8pOEQ21fTTW4xTJkRplMjMRje7LYTXqVKKX9GJhcyweMz2+W1J5bMg==
504501
dependencies:
505502
"@types/eslint-visitor-keys" "^1.0.0"
506-
"@typescript-eslint/experimental-utils" "3.6.0"
507-
"@typescript-eslint/types" "3.6.0"
508-
"@typescript-eslint/typescript-estree" "3.6.0"
503+
"@typescript-eslint/experimental-utils" "3.9.1"
504+
"@typescript-eslint/types" "3.9.1"
505+
"@typescript-eslint/typescript-estree" "3.9.1"
509506
eslint-visitor-keys "^1.1.0"
510507

511-
"@typescript-eslint/types@3.6.0":
512-
version "3.6.0"
513-
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.6.0.tgz#4bd6eee55d2f9d35a4b36c4804be1880bf68f7bc"
514-
integrity sha512-JwVj74ohUSt0ZPG+LZ7hb95fW8DFOqBuR6gE7qzq55KDI3BepqsCtHfBIoa0+Xi1AI7fq5nCu2VQL8z4eYftqg==
508+
"@typescript-eslint/types@3.9.1":
509+
version "3.9.1"
510+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.9.1.tgz#b2a6eaac843cf2f2777b3f2464fb1fbce5111416"
511+
integrity sha512-15JcTlNQE1BsYy5NBhctnEhEoctjXOjOK+Q+rk8ugC+WXU9rAcS2BYhoh6X4rOaXJEpIYDl+p7ix+A5U0BqPTw==
515512

516-
"@typescript-eslint/typescript-estree@3.6.0":
517-
version "3.6.0"
518-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.6.0.tgz#9b4cab43f1192b64ff51530815b8919f166ce177"
519-
integrity sha512-G57NDSABHjvob7zVV09ehWyD1K6/YUKjz5+AufObFyjNO4DVmKejj47MHjVHHlZZKgmpJD2yyH9lfCXHrPITFg==
513+
"@typescript-eslint/typescript-estree@3.9.1":
514+
version "3.9.1"
515+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.9.1.tgz#fd81cada74bc8a7f3a2345b00897acb087935779"
516+
integrity sha512-IqM0gfGxOmIKPhiHW/iyAEXwSVqMmR2wJ9uXHNdFpqVvPaQ3dWg302vW127sBpAiqM9SfHhyS40NKLsoMpN2KA==
520517
dependencies:
521-
"@typescript-eslint/types" "3.6.0"
522-
"@typescript-eslint/visitor-keys" "3.6.0"
518+
"@typescript-eslint/types" "3.9.1"
519+
"@typescript-eslint/visitor-keys" "3.9.1"
523520
debug "^4.1.1"
524521
glob "^7.1.6"
525522
is-glob "^4.0.1"
526523
lodash "^4.17.15"
527524
semver "^7.3.2"
528525
tsutils "^3.17.1"
529526

530-
"@typescript-eslint/visitor-keys@3.6.0":
531-
version "3.6.0"
532-
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.6.0.tgz#44185eb0cc47651034faa95c5e2e8b314ecebb26"
533-
integrity sha512-p1izllL2Ubwunite0ITjubuMQRBGgjdVYwyG7lXPX8GbrA6qF0uwSRz9MnXZaHMxID4948gX0Ez8v9tUDi/KfQ==
527+
"@typescript-eslint/visitor-keys@3.9.1":
528+
version "3.9.1"
529+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.9.1.tgz#92af3747cdb71509199a8f7a4f00b41d636551d1"
530+
integrity sha512-zxdtUjeoSh+prCpogswMwVUJfEFmCOjdzK9rpNjNBfm6EyPt99x3RrJoBOGZO23FCt0WPKUCOL5mb/9D5LjdwQ==
534531
dependencies:
535532
eslint-visitor-keys "^1.1.0"
536533

@@ -7810,10 +7807,10 @@ trough@^1.0.0:
78107807
resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e"
78117808
integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==
78127809

7813-
ts-loader@^7.0.5:
7814-
version "7.0.5"
7815-
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-7.0.5.tgz#789338fb01cb5dc0a33c54e50558b34a73c9c4c5"
7816-
integrity sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig==
7810+
ts-loader@^8.0.2:
7811+
version "8.0.2"
7812+
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.2.tgz#ee73ca9350f745799396fff8578ba29b1e95616b"
7813+
integrity sha512-oYT7wOTUawYXQ8XIDsRhziyW0KUEV38jISYlE+9adP6tDtG+O5GkRe4QKQXrHVH4mJJ88DysvEtvGP65wMLlhg==
78177814
dependencies:
78187815
chalk "^2.3.0"
78197816
enhanced-resolve "^4.0.0"
@@ -7926,15 +7923,10 @@ typedarray@^0.0.6:
79267923
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
79277924
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
79287925

7929-
typescript@^3.4.5:
7930-
version "3.6.3"
7931-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da"
7932-
integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==
7933-
7934-
typescript@^3.9.6:
7935-
version "3.9.6"
7936-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a"
7937-
integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw==
7926+
typescript@^4.0.2:
7927+
version "4.0.2"
7928+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
7929+
integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
79387930

79397931
uc.micro@^1.0.1, uc.micro@^1.0.5:
79407932
version "1.0.6"

0 commit comments

Comments
 (0)