From 5d65e3b36cfb82288442c5848f7fe7416094ae87 Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Tue, 26 Apr 2022 18:15:43 -0700 Subject: [PATCH] Revert update to electron 18.1.0 * Revert "Update electron-builder to 23.0.8" This reverts commit c8842d94ec802c861ddcea1a651256ca38d462d7. * Revert "Update to electron@18.1.0" This reverts commit 5f3a62cbb653a59d270816a9f1f278bcc0425cf2. --- .github/workflows/benchmark.yml | 2 +- .github/workflows/ci.yml | 10 +- .nvmrc | 2 +- app/main.ts | 1 + package.json | 8 +- patches/app-builder-lib+23.0.1.patch | 107 +++++++++++++ patches/app-builder-lib+23.0.8.patch | 39 ----- ts/util/lint/linter.ts | 3 +- yarn.lock | 218 ++++++++++++--------------- 9 files changed, 213 insertions(+), 177 deletions(-) create mode 100644 patches/app-builder-lib+23.0.1.patch delete mode 100644 patches/app-builder-lib+23.0.8.patch diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index f38af114f..0f8142323 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -28,7 +28,7 @@ jobs: - name: Setup node.js uses: actions/setup-node@v2 with: - node-version: '16.13.2' + node-version: '16.13.0' - name: Install global dependencies run: npm install -g yarn@1.22.10 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e26ed271b..0d3c0be1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: '16.13.2' + node-version: '16.13.0' - run: npm install -g yarn@1.22.10 - name: Cache Desktop node_modules @@ -51,7 +51,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: '16.13.2' + node-version: '16.13.0' - run: npm install -g yarn@1.22.10 - name: Cache Desktop node_modules @@ -89,7 +89,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: '16.13.2' + node-version: '16.13.0' - run: sudo apt-get install xvfb - run: npm install -g yarn@1.22.10 @@ -130,7 +130,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: '16.13.2' + node-version: '16.13.0' - run: npm install -g yarn@1.22.10 - name: Cache Desktop node_modules @@ -176,7 +176,7 @@ jobs: - name: Setup node.js uses: actions/setup-node@v2 with: - node-version: '16.13.2' + node-version: '16.13.0' - name: Install global dependencies run: npm install -g yarn@1.22.10 diff --git a/.nvmrc b/.nvmrc index 23d9c36a1..58a4133d9 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16.13.2 +16.13.0 diff --git a/app/main.ts b/app/main.ts index 518a4c98f..7e0df7dc4 100644 --- a/app/main.ts +++ b/app/main.ts @@ -489,6 +489,7 @@ async function createWindow() { __dirname, usePreloadBundle ? '../preload.bundle.js' : '../preload.js' ), + nativeWindowOpen: true, spellcheck: await getSpellCheckSetting(), backgroundThrottling: isThrottlingEnabled, enablePreferredSizeMode: true, diff --git a/package.json b/package.json index 8158c3b4c..8cc4b00d0 100644 --- a/package.json +++ b/package.json @@ -221,7 +221,7 @@ "@types/mkdirp": "0.5.2", "@types/mocha": "9.0.0", "@types/mustache": "4.1.2", - "@types/node": "16.11.29", + "@types/node": "16.11.26", "@types/node-fetch": "2.5.7", "@types/node-forge": "0.9.5", "@types/normalize-path": "3.0.0", @@ -264,8 +264,8 @@ "cross-env": "5.2.0", "css-loader": "3.2.0", "debug": "4.3.3", - "electron": "18.1.0", - "electron-builder": "23.0.8", + "electron": "17.3.1", + "electron-builder": "23.0.1", "electron-mocha": "11.0.2", "electron-notarize": "0.1.1", "esbuild": "0.14.28", @@ -309,7 +309,7 @@ "sharp/color/color-string": "1.7.4" }, "engines": { - "node": "16.13.2" + "node": "16.13.0" }, "build": { "appId": "org.whispersystems.signal-desktop", diff --git a/patches/app-builder-lib+23.0.1.patch b/patches/app-builder-lib+23.0.1.patch new file mode 100644 index 000000000..868fc707e --- /dev/null +++ b/patches/app-builder-lib+23.0.1.patch @@ -0,0 +1,107 @@ +diff --git a/node_modules/app-builder-lib/out/asar/asar.d.ts b/node_modules/app-builder-lib/out/asar/asar.d.ts +index be27052..97db603 100644 +--- a/node_modules/app-builder-lib/out/asar/asar.d.ts ++++ b/node_modules/app-builder-lib/out/asar/asar.d.ts +@@ -1,3 +1,3 @@ +-export declare function readAsarHeader(archive: string): Promise; +-export declare function readAsar(archive: string): Promise; ++export declare function readAsarHeader(archive: string): Promise; ++export declare function readAsar(archive: string): Promise; + export declare function readAsarJson(archive: string, file: string): Promise; +diff --git a/node_modules/app-builder-lib/out/asar/integrity.d.ts b/node_modules/app-builder-lib/out/asar/integrity.d.ts +index 01da9f4..094c175 100644 +--- a/node_modules/app-builder-lib/out/asar/integrity.d.ts ++++ b/node_modules/app-builder-lib/out/asar/integrity.d.ts +@@ -1,5 +1,4 @@ + /// +-import { NodeIntegrity } from "./asar"; + export interface AsarIntegrityOptions { + readonly resourcesPath: string; + readonly resourcesRelativePath: string; +@@ -12,5 +11,5 @@ export interface AsarIntegrity { + [key: string]: HeaderHash; + } + export declare function computeData({ resourcesPath, resourcesRelativePath }: AsarIntegrityOptions): Promise; +-export declare function hashFile(file: string, blockSize?: number): Promise; +-export declare function hashFileContents(contents: Buffer | string, blockSize?: number): NodeIntegrity; ++export declare function hashFile(file: string, blockSize?: number): Promise; ++export declare function hashFileContents(contents: Buffer | string, blockSize?: number): unknown; +diff --git a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js +index ffcc8bd..bafab0e 100644 +--- a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js ++++ b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js +@@ -88,7 +88,7 @@ class LinuxTargetHelper { + // https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables + const execCodes = ["%f", "%u", "%F", "%U"]; + if (executableArgs == null || executableArgs.findIndex(arg => execCodes.includes(arg)) === -1) { +- exec += " %U"; ++ exec += " --no-sandbox %U"; + } + } + const desktopMeta = { +diff --git a/node_modules/app-builder-lib/templates/linux/after-install.tpl b/node_modules/app-builder-lib/templates/linux/after-install.tpl +index 1536059..555f8f5 100644 +--- a/node_modules/app-builder-lib/templates/linux/after-install.tpl ++++ b/node_modules/app-builder-lib/templates/linux/after-install.tpl +@@ -3,8 +3,5 @@ + # Link to the binary + ln -sf '/opt/${sanitizedProductName}/${executable}' '/usr/bin/${executable}' + +-# SUID chrome-sandbox for Electron 5+ +-chmod 4755 '/opt/${sanitizedProductName}/chrome-sandbox' || true +- + update-mime-database /usr/share/mime || true + update-desktop-database /usr/share/applications || true +diff --git a/node_modules/app-builder-lib/templates/nsis/include/allowOnlyOneInstallerInstance.nsh b/node_modules/app-builder-lib/templates/nsis/include/allowOnlyOneInstallerInstance.nsh +index cc77993..ac36618 100644 +--- a/node_modules/app-builder-lib/templates/nsis/include/allowOnlyOneInstallerInstance.nsh ++++ b/node_modules/app-builder-lib/templates/nsis/include/allowOnlyOneInstallerInstance.nsh +@@ -40,7 +40,7 @@ + ${nsProcess::FindProcess} "${_FILE}" ${_ERR} + !else + # find process owned by current user +- nsExec::Exec `cmd /c tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" | find "${_FILE}"` ++ nsExec::Exec `cmd /c tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" | %SYSTEMROOT%\System32\find.exe "${_FILE}"` + Pop ${_ERR} + !endif + !macroend +diff --git a/node_modules/app-builder-lib/templates/nsis/include/extractAppPackage.nsh b/node_modules/app-builder-lib/templates/nsis/include/extractAppPackage.nsh +index d96a655..f5470bf 100644 +--- a/node_modules/app-builder-lib/templates/nsis/include/extractAppPackage.nsh ++++ b/node_modules/app-builder-lib/templates/nsis/include/extractAppPackage.nsh +@@ -113,13 +113,21 @@ + # Try copying a few times before asking for a user action. + Goto RetryExtract7za + ${else} +- MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "$(appCannotBeClosed)" /SD IDCANCEL IDRETRY RetryExtract7za ++ MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "$(appCannotBeClosed)" /SD IDRETRY IDCANCEL AbortExtract7za + ${endIf} + + # As an absolutely last resort after a few automatic attempts and user + # intervention - we will just overwrite everything with `Nsis7z::Extract` + # even though it is not atomic and will ignore errors. ++ ++ # Clear the temporary folder first to make sure we don't use twice as ++ # much disk space. ++ RMDir /r "$PLUGINSDIR\7z-out" ++ + Nsis7z::Extract "${FILE}" ++ Goto DoneExtract7za ++ ++ AbortExtract7za: + Quit + + RetryExtract7za: +diff --git a/node_modules/app-builder-lib/templates/nsis/messages.yml b/node_modules/app-builder-lib/templates/nsis/messages.yml +index 6527c99..695444c 100644 +--- a/node_modules/app-builder-lib/templates/nsis/messages.yml ++++ b/node_modules/app-builder-lib/templates/nsis/messages.yml +@@ -45,7 +45,7 @@ x64WinRequired: + es: Windows de 64 bits es requerido + da: 64-bit Windows er påkrævet + appRunning: +- en: "${PRODUCT_NAME} is running.\nClick OK to close it." ++ en: "${PRODUCT_NAME} is running.\nClick OK to close it.\nIf it doesn't close, try closing it manually." + de: "${PRODUCT_NAME} ist geöffnet. \nKlicken Sie zum Schliessen auf «OK»." + it: "${PRODUCT_NAME} è in esecuzione. \nPremi OK per chiudere." + fr: "${PRODUCT_NAME} est en cours d’utilisation. \nCliquez sur «OK» pour fermer ce programme." diff --git a/patches/app-builder-lib+23.0.8.patch b/patches/app-builder-lib+23.0.8.patch deleted file mode 100644 index 561513003..000000000 --- a/patches/app-builder-lib+23.0.8.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js -index ffcc8bd..bafab0e 100644 ---- a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js -+++ b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js -@@ -88,7 +88,7 @@ class LinuxTargetHelper { - // https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables - const execCodes = ["%f", "%u", "%F", "%U"]; - if (executableArgs == null || executableArgs.findIndex(arg => execCodes.includes(arg)) === -1) { -- exec += " %U"; -+ exec += " --no-sandbox %U"; - } - } - const desktopMeta = { -diff --git a/node_modules/app-builder-lib/templates/linux/after-install.tpl b/node_modules/app-builder-lib/templates/linux/after-install.tpl -index 1536059..555f8f5 100644 ---- a/node_modules/app-builder-lib/templates/linux/after-install.tpl -+++ b/node_modules/app-builder-lib/templates/linux/after-install.tpl -@@ -3,8 +3,5 @@ - # Link to the binary - ln -sf '/opt/${sanitizedProductName}/${executable}' '/usr/bin/${executable}' - --# SUID chrome-sandbox for Electron 5+ --chmod 4755 '/opt/${sanitizedProductName}/chrome-sandbox' || true -- - update-mime-database /usr/share/mime || true - update-desktop-database /usr/share/applications || true -diff --git a/node_modules/app-builder-lib/templates/nsis/messages.yml b/node_modules/app-builder-lib/templates/nsis/messages.yml -index 6527c99..695444c 100644 ---- a/node_modules/app-builder-lib/templates/nsis/messages.yml -+++ b/node_modules/app-builder-lib/templates/nsis/messages.yml -@@ -45,7 +45,7 @@ x64WinRequired: - es: Windows de 64 bits es requerido - da: 64-bit Windows er påkrævet - appRunning: -- en: "${PRODUCT_NAME} is running.\nClick OK to close it." -+ en: "${PRODUCT_NAME} is running.\nClick OK to close it.\nIf it doesn't close, try closing it manually." - de: "${PRODUCT_NAME} ist geöffnet. \nKlicken Sie zum Schliessen auf «OK»." - it: "${PRODUCT_NAME} è in esecuzione. \nPremi OK per chiudere." - fr: "${PRODUCT_NAME} est en cours d’utilisation. \nCliquez sur «OK» pour fermer ce programme." diff --git a/ts/util/lint/linter.ts b/ts/util/lint/linter.ts index 004005b7b..a3b7c79e9 100644 --- a/ts/util/lint/linter.ts +++ b/ts/util/lint/linter.ts @@ -108,6 +108,7 @@ const excludedFilesRegexp = RegExp( '^node_modules/react-color/.+/(?:core-js|fbjs|lodash)/.+', // Modules used only in test/development scenarios + '^node_modules/esbuild/.+', '^node_modules/@babel/.+', '^node_modules/@chanzuckerberg/axe-storybook-testing/.+', '^node_modules/@signalapp/mock-server/.+', @@ -161,7 +162,6 @@ const excludedFilesRegexp = RegExp( '^node_modules/es-abstract/.+', '^node_modules/es5-shim/.+', // Currently only used in storybook '^node_modules/es6-shim/.+', // Currently only used in storybook - '^node_modules/esbuild/.+', '^node_modules/escodegen/.+', '^node_modules/eslint.+', '^node_modules/@typescript-eslint.+', @@ -187,7 +187,6 @@ const excludedFilesRegexp = RegExp( '^node_modules/istanbul.+', '^node_modules/jimp/.+', '^node_modules/jquery/.+', - '^node_modules/jake/.+', '^node_modules/jss-global/.+', '^node_modules/jss/.+', '^node_modules/liftup/.+', diff --git a/yarn.lock b/yarn.lock index 44496e408..5f81c4346 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1023,10 +1023,10 @@ global-agent "^3.0.0" global-tunnel-ng "^2.7.1" -"@electron/universal@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339" - integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ== +"@electron/universal@1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.0.tgz#518cac72bccd79c00bf41345119e6fdbabdb871d" + integrity sha512-eu20BwNsrMPKoe2bZ3/l9c78LclDvxg3PlVXrQf3L50NaUuW5M59gbPytI+V4z7/QMrohUHetQaU0ou+p1UG9Q== dependencies: "@malept/cross-spawn-promise" "^1.1.0" asar "^3.1.0" @@ -2259,15 +2259,15 @@ dependencies: "@types/node" "*" -"@types/node@*": +"@types/node@*", "@types/node@^14.6.2": version "14.14.37" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e" integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw== -"@types/node@16.11.29", "@types/node@^16.11.26": - version "16.11.29" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.29.tgz#2422b0bf46afb2568dc71df903afa36f56bab8ea" - integrity sha512-9dDdonLyPJQJ/kdOlDxAah+bTI+u2ccF3k62FErhquDuggoCX6piWez7j7o6yNE+rP2IRcZVQ6Tw4N0P38+rWA== +"@types/node@16.11.26": + version "16.11.26" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.26.tgz#63d204d136c9916fb4dcd1b50f9740fe86884e47" + integrity sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ== "@types/node@>=13.7.0": version "17.0.17" @@ -3305,41 +3305,40 @@ anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" - integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== +app-builder-bin@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.1.0.tgz#db4108c005ca5ea53b00d1eb4cd6f6c265fafdc9" + integrity sha512-rbdMe0sIVE95cpYqMQh4IFqhTDdB8LkKlTRcbO/Y3QleRYoIePejIbX774IYomYYzZbJfJuX7pLRiGvSdIxIYA== -app-builder-lib@23.0.8: - version "23.0.8" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.0.8.tgz#06750dac27b564333f4026db813f4987cabd41b1" - integrity sha512-IObTdRc/0TQsfGn9IvaEXULE/QacgyFgpz3+vmlpZgHHjQ6V1c/T4pKlzNTsNHGjJBuEg2FvTvYi9ZVFfhyWow== +app-builder-lib@23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.0.1.tgz#a916f525f65875c6e05aa288413f1aa7c08a19b6" + integrity sha512-XO+xQ7oVmGjGyBttXfaE2WawgPYQjBhLu8ZZhvGUiKL8WiLFrRUunoaoF+WzwLda4pMIvEEd7MGQ1VRopWO4tQ== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.2.1" + "@electron/universal" "1.2.0" "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "23.0.8" - builder-util-runtime "9.0.2" + builder-util "23.0.0" + builder-util-runtime "9.0.0" chromium-pickle-js "^0.2.0" - debug "^4.3.4" - ejs "^3.1.7" + debug "^4.3.2" + ejs "^3.1.6" electron-osx-sign "^0.6.0" - electron-publish "23.0.8" + electron-publish "23.0.0" form-data "^4.0.0" - fs-extra "^10.1.0" - hosted-git-info "^4.1.0" + fs-extra "^10.0.0" + hosted-git-info "^4.0.2" is-ci "^3.0.0" - isbinaryfile "^4.0.10" + isbinaryfile "^4.0.8" js-yaml "^4.1.0" lazy-val "^1.0.5" - minimatch "^3.1.2" + minimatch "^3.0.4" read-config-file "6.2.0" sanitize-filename "^1.6.3" - semver "^7.3.7" - tar "^6.1.11" + semver "^7.3.5" temp-file "^3.4.0" app-root-dir@^1.0.2: @@ -3594,6 +3593,10 @@ async-exit-hook@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" +async@0.9.x: + version "0.9.2" + resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" + async@^2.1.4, async@^2.6.2: version "2.6.3" resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" @@ -3601,11 +3604,6 @@ async@^2.1.4, async@^2.6.2: dependencies: lodash "^4.17.14" -async@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" - integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -4429,28 +4427,28 @@ buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.2.tgz#dc54f8581bbcf1e0428da4483fa46d09524be857" - integrity sha512-xF55W/8mgfT6+sMbX0TeiJkTusA5GMOzckM4rajN4KirFcUIuLTH8oEaTYmM86YwVCZaTwa/7GyFhauXaEICwA== +builder-util-runtime@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.0.tgz#3a40ba7382712ccdb24471567f91d7c167e00830" + integrity sha512-SkpEtSmTkREDHRJnxKEv43aAYp8sYWY8fxYBhGLBLOBIRXeaIp6Kv3lBgSD7uR8jQtC7CA659sqJrpSV6zNvSA== dependencies: - debug "^4.3.4" + debug "^4.3.2" sax "^1.2.4" -builder-util@23.0.8: - version "23.0.8" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.0.8.tgz#b59af2248f23270ed669cffc4a442418df83a303" - integrity sha512-xPpnoLLAEPx5oxxzRFINRnxmLNQDn+FddU7QRvCJDQi0jvUJ7UjdoGoM+UPy9yh+p9O82/nC7MHGuUptJkOXyQ== +builder-util@23.0.0: + version "23.0.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.0.0.tgz#63a6d0d585f49b2c502d64bb074098827e2a9df3" + integrity sha512-OkRo/W19it+9ulWoqVKIWmfTS1i6J6vaWIB4j33u5+vNbhyRP7PkBMzB878gBDGyuBwjT/Oq4bh8DzrrB374IA== dependencies: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.6" "@types/fs-extra" "^9.0.11" - app-builder-bin "4.0.0" + app-builder-bin "4.1.0" bluebird-lst "^1.0.9" - builder-util-runtime "9.0.2" + builder-util-runtime "9.0.0" chalk "^4.1.1" cross-spawn "^7.0.3" - debug "^4.3.4" + debug "^4.3.2" fs-extra "^10.0.0" http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.0" @@ -4624,7 +4622,7 @@ caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000984, caniuse-lite@^1.0.300011 resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001207.tgz#364d47d35a3007e528f69adb6fecb07c2bb2cc50" integrity sha512-UPQZdmAsyp2qfCTiMU/zqGSWOYaY9F9LL61V8f+8MrubsaDGpaHD9HRV/EWZGULZn0Hxu48SKzI5DgFwTvHuYw== -canvas@^2.6.1, "canvas@https://registry.yarnpkg.com/nop/-/nop-1.0.0.tgz", dmg-license@^1.0.11, "dmg-license@https://registry.yarnpkg.com/nop/-/nop-1.0.0.tgz", jsdom@^15.2.1, "jsdom@https://registry.yarnpkg.com/nop/-/nop-1.0.0.tgz": +canvas@^2.6.1, "canvas@https://registry.yarnpkg.com/nop/-/nop-1.0.0.tgz", dmg-license@^1.0.9, "dmg-license@https://registry.yarnpkg.com/nop/-/nop-1.0.0.tgz", jsdom@^15.2.1, "jsdom@https://registry.yarnpkg.com/nop/-/nop-1.0.0.tgz": version "1.0.0" resolved "https://registry.yarnpkg.com/nop/-/nop-1.0.0.tgz#cb46cf7e01574aa6390858149f66897afe53c9ca" @@ -4684,7 +4682,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -5606,13 +5604,6 @@ debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6, debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - decamelize@^1.1.1, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -5879,19 +5870,19 @@ direction@1.0.4: resolved "https://registry.yarnpkg.com/direction/-/direction-1.0.4.tgz#2b86fb686967e987088caf8b89059370d4837442" integrity sha512-GYqKi1aH7PJXxdhTeZBFrg8vUBeKXi+cNprXsC1kpJcbcVnV9wBsrOu1cQEdG0WeQwlfHiy3XvnKfIrJ2R0NzQ== -dmg-builder@23.0.8: - version "23.0.8" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.8.tgz#c68d9811da8d1891e6121c1e0807635519856800" - integrity sha512-dXguxjekxY70hzgAW+0NPCI7bagQ2ZrLDwYf1bvHSwlVfVizyJ/EC+e71U/NUgiWlXU5nogbWcGC3H74mFu0iw== +dmg-builder@23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.1.tgz#fc5d3e6939b4ca7769d83224d48c2e8da453e84d" + integrity sha512-pyqUXprUD5bWeCfW/heG80iJdf6/pF0v8WjP2VDk0fATMYJiYqZpmkWy00BxAEAnFRIqv3iXYRtGlgwFjhr+3g== dependencies: - app-builder-lib "23.0.8" - builder-util "23.0.8" - builder-util-runtime "9.0.2" + app-builder-lib "23.0.1" + builder-util "23.0.0" + builder-util-runtime "9.0.0" fs-extra "^10.0.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" optionalDependencies: - dmg-license "^1.0.11" + dmg-license "^1.0.9" dns-equal@^1.0.0: version "1.0.0" @@ -6088,24 +6079,24 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.2.tgz#3a32c63d1cd16d11266cd4703b14fec4e74ab4f6" integrity sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q== -ejs@^3.1.7: - version "3.1.7" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.7.tgz#c544d9c7f715783dd92f0bddcf73a59e6962d006" - integrity sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw== +ejs@^3.1.6: + version "3.1.6" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" + integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== dependencies: - jake "^10.8.5" + jake "^10.6.1" -electron-builder@23.0.8: - version "23.0.8" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.0.8.tgz#7379b91905aa73d4757234550d76dbce3fd17433" - integrity sha512-7WxdR4+l+VL4QN/K6NdqRQg7+cbIka4By1+4eN8odMPySSTI5d6nrV8R+SSRt9MXeWVdWlW8RCX5Pk6L0oaRug== +electron-builder@23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.0.1.tgz#2e5481ff66fe4e4d171e393a8ac2189338d054a6" + integrity sha512-0ISmpdJlIjcKxuLu0JOygA4c90y1aOiNTAqML2ln2BQJ+UsfizWyBeVOEJdZnEurmCAt1ICeiQ9DeQcMgCLnnQ== dependencies: "@types/yargs" "^17.0.1" - app-builder-lib "23.0.8" - builder-util "23.0.8" - builder-util-runtime "9.0.2" + app-builder-lib "23.0.1" + builder-util "23.0.0" + builder-util-runtime "9.0.0" chalk "^4.1.1" - dmg-builder "23.0.8" + dmg-builder "23.0.1" fs-extra "^10.0.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -6150,14 +6141,14 @@ electron-osx-sign@^0.6.0: minimist "^1.2.0" plist "^3.0.1" -electron-publish@23.0.8: - version "23.0.8" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.0.8.tgz#a55b0c4a9ceec1eadb9b1b19194b9d9f2ae4ec33" - integrity sha512-GnqJH7Wh8LnapN4npl1Xs2Er/486/qxE3dV42WxXHX2VeoKAJTOuCzOVWCxpajaR3Msji4SkS0p81R018uK6Mg== +electron-publish@23.0.0: + version "23.0.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.0.0.tgz#d17c7e407a8bd2c6fc359be2e36d1f88d69cca74" + integrity sha512-T4UuPjwaGrm+5DYkmSLlY3ae8EQ8LvkDdO/ZHiyIa7o43myjKXDLkYVISA4mH4FtGVBk1SSQF0CNH96TimZK6g== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "23.0.8" - builder-util-runtime "9.0.2" + builder-util "23.0.0" + builder-util-runtime "9.0.0" chalk "^4.1.1" fs-extra "^10.0.0" lazy-val "^1.0.5" @@ -6183,13 +6174,13 @@ electron-window@^0.8.0: dependencies: is-electron-renderer "^2.0.0" -electron@18.1.0: - version "18.1.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-18.1.0.tgz#d92b76f301af1a8728adff8d6eeb42382e218fe8" - integrity sha512-P55wdHNTRMo7a/agC84ZEZDYEK/pTBcQdlp8lFbHcx3mO4Kr+Im/J5p2uQgiuXtown31HqNh2paL3V0p+E6rpQ== +electron@17.3.1: + version "17.3.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-17.3.1.tgz#083b6bd034eb1ee7d75378316d6460348eb62605" + integrity sha512-C5E3uvXo1cmI+xYtbiMCW8AAGhBL0HbLA6cqD7FJmBoPtY88W/3A/km5z8oPGORyBNgSe7tSoHx4a6jWJIR+og== dependencies: "@electron/get" "^1.13.0" - "@types/node" "^16.11.26" + "@types/node" "^14.6.2" extract-zip "^1.0.3" elliptic@^6.0.0: @@ -7668,15 +7659,6 @@ fs-extra@^10.0.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-extra@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" @@ -8384,10 +8366,10 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -hosted-git-info@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" - integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== +hosted-git-info@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" + integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== dependencies: lru-cache "^6.0.0" @@ -9359,10 +9341,10 @@ isbinaryfile@^3.0.2: dependencies: buffer-alloc "^1.2.0" -isbinaryfile@^4.0.10: - version "4.0.10" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" - integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== +isbinaryfile@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" + integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w== isexe@^2.0.0: version "2.0.0" @@ -9443,13 +9425,13 @@ istanbul-reports@^1.1.3: dependencies: handlebars "^4.0.3" -jake@^10.8.5: - version "10.8.5" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" - integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== +jake@^10.6.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" + integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== dependencies: - async "^3.2.3" - chalk "^4.0.2" + async "0.9.x" + chalk "^2.4.2" filelist "^1.0.1" minimatch "^3.0.4" @@ -10345,13 +10327,6 @@ minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimatch@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - 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" @@ -13578,13 +13553,6 @@ semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: dependencies: lru-cache "^6.0.0" -semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== - dependencies: - lru-cache "^6.0.0" - send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -14546,7 +14514,7 @@ tar@^4: safe-buffer "^5.2.1" yallist "^3.1.1" -tar@^6.0.2, tar@^6.1.0, tar@^6.1.11: +tar@^6.0.2, tar@^6.1.0: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==