From e5f6de946ff5729d7491947631d70c183f616341 Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Mon, 29 Aug 2022 09:28:41 -0700 Subject: [PATCH] Update electron to 20.1.0 --- app/main.ts | 8 ++++ package.json | 4 +- ts/util/lint/exceptions.json | 21 ++++++++++ yarn.lock | 76 +++++------------------------------- 4 files changed, 40 insertions(+), 69 deletions(-) diff --git a/app/main.ts b/app/main.ts index 3262313aea2..737ce97e693 100644 --- a/app/main.ts +++ b/app/main.ts @@ -668,6 +668,7 @@ async function createWindow() { ...defaultWebPrefs, nodeIntegration: false, nodeIntegrationInWorker: false, + sandbox: false, contextIsolation: false, preload: join( __dirname, @@ -1112,6 +1113,7 @@ async function showScreenShareWindow(sourceName: string) { ...defaultWebPrefs, nodeIntegration: false, nodeIntegrationInWorker: false, + sandbox: false, contextIsolation: true, preload: join(__dirname, '../ts/windows/screenShare/preload.js'), }, @@ -1165,6 +1167,7 @@ async function showAbout() { ...defaultWebPrefs, nodeIntegration: false, nodeIntegrationInWorker: false, + sandbox: false, contextIsolation: true, preload: join(__dirname, '../ts/windows/about/preload.js'), nativeWindowOpen: true, @@ -1212,6 +1215,7 @@ async function showSettingsWindow() { ...defaultWebPrefs, nodeIntegration: false, nodeIntegrationInWorker: false, + sandbox: false, contextIsolation: true, preload: join(__dirname, '../ts/windows/settings/preload.js'), nativeWindowOpen: true, @@ -1286,6 +1290,7 @@ async function showStickerCreator() { ...defaultWebPrefs, nodeIntegration: false, nodeIntegrationInWorker: false, + sandbox: false, contextIsolation: false, preload: join(__dirname, '../sticker-creator/preload.js'), nativeWindowOpen: true, @@ -1347,6 +1352,7 @@ async function showDebugLogWindow() { ...defaultWebPrefs, nodeIntegration: false, nodeIntegrationInWorker: false, + sandbox: false, contextIsolation: true, preload: join(__dirname, '../ts/windows/debuglog/preload.js'), nativeWindowOpen: true, @@ -1410,6 +1416,7 @@ function showPermissionsPopupWindow(forCalling: boolean, forCamera: boolean) { ...defaultWebPrefs, nodeIntegration: false, nodeIntegrationInWorker: false, + sandbox: false, contextIsolation: true, preload: join(__dirname, '../ts/windows/permissions/preload.js'), nativeWindowOpen: true, @@ -1695,6 +1702,7 @@ app.on('ready', async () => { webPreferences: { ...defaultWebPrefs, nodeIntegration: false, + sandbox: false, contextIsolation: true, preload: join(__dirname, '../ts/windows/loading/preload.js'), }, diff --git a/package.json b/package.json index a4398c45b7b..8ee05a820f4 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "array-move": "2.1.0", "axe-core": "4.1.4", "backbone": "1.4.0", - "better-sqlite3": "https://github.com/signalapp/better-sqlite3#3c4a7eebba3d5f5d8cb88fe83be1c01b8c0dea7d", + "better-sqlite3": "https://github.com/signalapp/better-sqlite3#a92f637708b41a478601c388f5a66223f766021b", "bezier-easing": "2.1.0", "blob-util": "2.0.2", "blueimp-load-image": "5.14.0", @@ -272,7 +272,7 @@ "cross-env": "5.2.0", "css-loader": "3.2.0", "debug": "4.3.3", - "electron": "19.0.13", + "electron": "20.1.0", "electron-builder": "23.0.8", "electron-mocha": "11.0.2", "electron-notarize": "1.2.1", diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json index 03f7f5aca72..1de2ed5e8de 100644 --- a/ts/util/lint/exceptions.json +++ b/ts/util/lint/exceptions.json @@ -2251,6 +2251,27 @@ "reasonCategory": "falseMatch|", "updated": "2020-04-30T22:35:27.860Z" }, + { + "rule": "jQuery-load(", + "path": "node_modules/extract-zip/node_modules/debug/src/browser.js", + "line": "function load() {", + "reasonCategory": "falseMatch", + "updated": "2022-08-25T18:40:51.202Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/extract-zip/node_modules/debug/src/common.js", + "line": "\tcreateDebug.enable(createDebug.load());", + "reasonCategory": "falseMatch", + "updated": "2022-08-25T18:40:51.202Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/extract-zip/node_modules/debug/src/node.js", + "line": "function load() {", + "reasonCategory": "falseMatch", + "updated": "2022-08-25T18:40:51.202Z" + }, { "rule": "jQuery-$(", "path": "node_modules/fabric/dist/fabric.min.js", diff --git a/yarn.lock b/yarn.lock index 566e09b64fa..eab817e0deb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5134,9 +5134,9 @@ better-opn@^2.1.1: dependencies: open "^7.0.3" -"better-sqlite3@https://github.com/signalapp/better-sqlite3#3c4a7eebba3d5f5d8cb88fe83be1c01b8c0dea7d": - version "7.5.0" - resolved "https://github.com/signalapp/better-sqlite3#3c4a7eebba3d5f5d8cb88fe83be1c01b8c0dea7d" +"better-sqlite3@https://github.com/signalapp/better-sqlite3#a92f637708b41a478601c388f5a66223f766021b": + version "7.5.1" + resolved "https://github.com/signalapp/better-sqlite3#a92f637708b41a478601c388f5a66223f766021b" dependencies: bindings "^1.5.0" tar "^6.1.0" @@ -6176,14 +6176,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611" - dependencies: - inherits "~2.0.1" - readable-stream "~2.0.0" - typedarray "~0.0.5" - concat-stream@^1.5.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" @@ -6643,10 +6635,6 @@ debug-log@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f" -debug@0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" - debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -7245,14 +7233,14 @@ electron-window@^0.8.0: dependencies: is-electron-renderer "^2.0.0" -electron@19.0.13: - version "19.0.13" - resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.13.tgz#68bcf7d94f249dbae9a3d4d1794d45a24db666dc" - integrity sha512-11Ne0VJy8L1GU7sGcbJHhkAz73szR27uP4vmfUVGlppC/ipA39AUkdzqiQoPC/F1EJdjEOBvHySG8K8Xe9yETA== +electron@20.1.0: + version "20.1.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-20.1.0.tgz#2de079adc551dadc21f11d12a37c70873b9ffb40" + integrity sha512-gzl6fdZe5g0qmzCC6Ejxa1Oa8eqUSxs4+QLtrM7SyEVp+mEPJAOoDe0xD8ayRQqeXTBxLK1LFrKtc4c98iufsg== dependencies: "@electron/get" "^1.14.1" "@types/node" "^16.11.26" - extract-zip "^1.0.3" + extract-zip "^2.0.1" element-resize-detector@^1.2.2: version "1.2.4" @@ -8219,15 +8207,6 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-zip@^1.0.3: - version "1.6.0" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.0.tgz#7f400c9607ea866ecab7aa6d54fb978eeb11621a" - dependencies: - concat-stream "1.5.0" - debug "0.7.4" - mkdirp "0.5.0" - yauzl "2.4.1" - extract-zip@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -8362,12 +8341,6 @@ faye-websocket@^0.11.3: dependencies: websocket-driver ">=0.5.1" -fd-slicer@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" - dependencies: - pend "~1.2.0" - fd-slicer@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" @@ -11634,10 +11607,6 @@ minimatch@^3.1.2: dependencies: brace-expansion "^1.1.7" -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - minimist@^1.1.3, minimist@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" @@ -11753,12 +11722,6 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -mkdirp@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12" - dependencies: - minimist "0.0.8" - mkdirp@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.2.tgz#2e7138d794dfbd097d74c84c410c3edd9eec479f" @@ -13359,10 +13322,6 @@ prismjs@~1.27.0: resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057" integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA== -process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -14094,17 +14053,6 @@ readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@~2.0.0: - version "2.0.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - readdirp@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" @@ -16253,7 +16201,7 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typedarray@^0.0.6, typedarray@~0.0.5: +typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -17347,12 +17295,6 @@ yargs@^17.0.1: y18n "^5.0.5" yargs-parser "^20.2.2" -yauzl@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" - dependencies: - fd-slicer "~1.0.1" - yauzl@^2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"