From 50f161dc13e057a4eff8f2d5e246ce66779881c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 May 2021 05:50:25 -0700
Subject: [PATCH] Bump electron-builder from 22.10.5 to 22.11.1 in /desktop
(#2297)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Summary:
Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 22.10.5 to 22.11.1.
Release notes
Sourced from electron-builder's releases.
22.11.1
Bug Fixes
- check if icons subdir exists in build resources, otherwise don't prepend it to fallback sources (#5686) (8df250b)
- DMG assembly on Apple Silicon (#4606) (#5724) (469b85f)
- Escape version in NSIS Updater during replace (#5655) (77c215d)
- extend http file limit (#5843) (9305fef), closes #4676
- fixing downloadPromise not resolving on Mac. (#5802) (d57453c)
- test snap update for abi_registry.json (#5823) (6237e67)
- typo in
fileMatcher's default patterns (#5705) (c0ae89c)
- update repo in CONTRIBUTING.md (#5726) (da85087)
- electron-updater: do not install on quit when autoInstallOnAppQuit is set to false (#5681) (8f84591)
- windows async signing (9162711)
- nsis: keep injected logger state (#5596) (be4a1fb)
Features
- add custom macro for checking uninstallation results (#5712) (e425020)
- add Electron branding options (#5727) (0de5f1f)
- add option removePackageKeywords (#5814) (dcf570f)
- Allow specifying additional WiX compiler options (#5813) (4e2909c)
- build additional arch-specific nsis installers when ${arch} template is provided (#5718) (7194c38)
- linux: Package name can be specified using packageName option (#5530) (#5588) (622aaef)
Commits
9305fef fix: extend http file limit (#5843)4e2909c feat: Allow specifying additional WiX compiler options (#5813)6237e67 fix: test snap update for abi_registry.json (#5823)dcf570f feat: add option removePackageKeywords (#5814)79c9f6b docs: CONTRIBUTING.md -> limit line length, refactoring and snippets for Wind...d57453c fix: fixing downloadPromise not resolving on Mac. (#5802)28cb86b fix/windows-tests (#5806)66f01bb chore: default linux target + ci config (#5787)6b1be73 Add support for building Flatpak bundles (#5711)0f3b46c [Electron Builder] Fix for Signing error on docker with WSL 2 engine … (#5722)- Additional commits viewable in compare view
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `dependabot rebase` will rebase this PR
- `dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `dependabot merge` will merge this PR after your CI passes on it
- `dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `dependabot cancel merge` will cancel a previously requested merge and block automerging
- `dependabot reopen` will reopen this PR if it is closed
- `dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Pull Request resolved: https://github.com/facebook/flipper/pull/2297
Test Plan:
Smoke test with
```
env FLIPPERVERSIONV2=0.88.290384275 RUST_LOG=flipper_launcher=info /Applications/Flipper.app/Contents/MacOS/Flipper
```
Everything seems to work fine
Reviewed By: passy
Differential Revision: D28323866
Pulled By: cekkaewnumchai
fbshipit-source-id: 8ced137e7c46a8b2cfd044b8f77b65efed639cbf
---
desktop/package.json | 2 +-
desktop/yarn.lock | 146 +++++++------------------------------------
2 files changed, 23 insertions(+), 125 deletions(-)
diff --git a/desktop/package.json b/desktop/package.json
index e96bb6cef..b1005b664 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -133,7 +133,7 @@
"detect-port": "^1.1.1",
"dotenv": "^8.2.0",
"electron": "11.2.3",
- "electron-builder": "22.10.5",
+ "electron-builder": "22.11.1",
"eslint": "^7.25.0",
"eslint-config-fbjs": "^3.1.1",
"eslint-config-prettier": "^8.3.0",
diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index 9e73d577f..80d5f5b74 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -7,11 +7,6 @@
resolved "https://registry.yarnpkg.com/7zip-bin-mac/-/7zip-bin-mac-1.0.1.tgz#3e68778bbf0926adc68159427074505d47555c02"
integrity sha1-Pmh3i78JJq3GgVlCcHRQXUdVXAI=
-"7zip-bin@~5.0.3":
- version "5.0.3"
- resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f"
- integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA==
-
"7zip-bin@~5.1.1":
version "5.1.1"
resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876"
@@ -2916,14 +2911,14 @@
dependencies:
"@types/yargs-parser" "*"
-"@types/yargs@^15.0.0", "@types/yargs@^15.0.13":
+"@types/yargs@^15.0.0":
version "15.0.13"
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"
integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==
dependencies:
"@types/yargs-parser" "*"
-"@types/yargs@^16.0.1":
+"@types/yargs@^16.0.0", "@types/yargs@^16.0.1":
version "16.0.1"
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.1.tgz#5fc5d41f69762e00fbecbc8d4bf9dea47d8726f4"
integrity sha512-x4HABGLyzr5hKUzBC9dvjciOTm11WVH1NWonNjGgxapnTHu5SWUqyqn0zQ6Re0yQU0lsQ6ztLCoMAKDGZflyxA==
@@ -3340,45 +3335,11 @@ anymatch@^3.0.3:
normalize-path "^3.0.0"
picomatch "^2.0.4"
-app-builder-bin@3.5.12:
- version "3.5.12"
- resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz#bbe174972cc1f481f73d6d92ad47a8b4c7eb4530"
- integrity sha512-lQARM2AielmFoBeIo6LZigAe+58Wwe07ZWkt+wVeDxzyieNmeWjlvz/V5dKzinydwdHd+CNswN86sww46yijjA==
-
app-builder-bin@3.5.13:
version "3.5.13"
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz#6dd7f4de34a4e408806f99b8c7d6ef1601305b7e"
integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg==
-app-builder-lib@22.10.5:
- version "22.10.5"
- resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.5.tgz#24a88581c891e5b187a0d569aa44e7c4a0dc8de2"
- integrity sha512-/W8nlGamJCtKlQtsMWwU9vb+cX4pTNY+rJWCuc7oXUykVSMS50W7LhQusIjCelNfymUQ1XCu6cXEY/ylqhX12A==
- dependencies:
- "7zip-bin" "~5.0.3"
- "@develar/schema-utils" "~2.6.5"
- "@electron/universal" "1.0.4"
- async-exit-hook "^2.0.1"
- bluebird-lst "^1.0.9"
- builder-util "22.10.5"
- builder-util-runtime "8.7.3"
- chromium-pickle-js "^0.2.0"
- debug "^4.3.2"
- ejs "^3.1.6"
- electron-publish "22.10.5"
- fs-extra "^9.1.0"
- hosted-git-info "^3.0.8"
- is-ci "^2.0.0"
- istextorbinary "^5.12.0"
- js-yaml "^4.0.0"
- lazy-val "^1.0.4"
- minimatch "^3.0.4"
- normalize-package-data "^3.0.0"
- read-config-file "6.0.0"
- sanitize-filename "^1.6.3"
- semver "^7.3.4"
- temp-file "^3.3.7"
-
app-builder-lib@22.11.1:
version "22.11.1"
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.1.tgz#a19c90f9bbe22309db53768434e744095ddf6c85"
@@ -4121,14 +4082,6 @@ buffer@^5.0.6, buffer@^5.1.0, buffer@^5.2.1, buffer@^5.5.0:
base64-js "^1.3.1"
ieee754 "^1.1.13"
-builder-util-runtime@8.7.3:
- version "8.7.3"
- resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.3.tgz#0aaafa52d25295c939496f62231ca9ff06c30e40"
- integrity sha512-1Q2ReBqFblimF5g/TLg2+0M5Xzv0Ih5LxJ/BMWXvEy/e6pQKeeEpbkPMGsN6OiQgkygaZo5VXCXIjOkOQG5EoQ==
- dependencies:
- debug "^4.3.2"
- sax "^1.2.4"
-
builder-util-runtime@8.7.4:
version "8.7.4"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.4.tgz#83f9f00bdf496cb3636d551cb5f5db56cdf25c96"
@@ -4137,26 +4090,6 @@ builder-util-runtime@8.7.4:
debug "^4.3.2"
sax "^1.2.4"
-builder-util@22.10.5:
- version "22.10.5"
- resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.5.tgz#8d0b04a3be6acc74938679aa90dcb3181b1ae86b"
- integrity sha512-/MkLhmyo1gU3xMwXJxccQaRj/9tm5eTd6ZyebTf8SYouY4r3hRser+LxhOm/f8Z9W6oJvfPe0jc9TFsxYfMcsg==
- dependencies:
- "7zip-bin" "~5.0.3"
- "@types/debug" "^4.1.5"
- "@types/fs-extra" "^9.0.7"
- app-builder-bin "3.5.12"
- bluebird-lst "^1.0.9"
- builder-util-runtime "8.7.3"
- chalk "^4.1.0"
- debug "^4.3.2"
- fs-extra "^9.1.0"
- is-ci "^2.0.0"
- js-yaml "^4.0.0"
- source-map-support "^0.5.19"
- stat-mode "^1.0.0"
- temp-file "^3.3.7"
-
builder-util@22.11.1:
version "22.11.1"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.1.tgz#d0683d192294a8ebf3db413e995f9abdfba59e35"
@@ -4317,15 +4250,7 @@ chalk@^3.0.0:
ansi-styles "^4.1.0"
supports-color "^7.1.0"
-chalk@^4.0.0, chalk@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
- integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
- dependencies:
- ansi-styles "^4.1.0"
- supports-color "^7.1.0"
-
-chalk@^4.1.1:
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
@@ -5247,17 +5172,17 @@ dir-glob@^3.0.1:
dependencies:
path-type "^4.0.0"
-dmg-builder@22.10.5:
- version "22.10.5"
- resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.5.tgz#65a33c106ead5a350c7de8997c546559bd6e0e7c"
- integrity sha512-58FEpfH8PEFqjbUNka4bYr52snRT8+LSXrP4gy6EZWOVICbOlmTOYj988pfoLam5C5iXb3odmyUQqwWOxlsEUw==
+dmg-builder@22.11.1:
+ version "22.11.1"
+ resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.1.tgz#87a8d7c4fd56166aab805425401b96481f656b83"
+ integrity sha512-FZIIYpEs/ZfKJbRKjTjpQAHJKjRBlgd6QDUEAuC6OuyHUwwrflQay1rNTwp7spqbu9HDHipiQevX/e8dFmkQmw==
dependencies:
- app-builder-lib "22.10.5"
- builder-util "22.10.5"
+ app-builder-lib "22.11.1"
+ builder-util "22.11.1"
+ builder-util-runtime "8.7.4"
fs-extra "^9.1.0"
iconv-lite "^0.6.2"
js-yaml "^4.0.0"
- sanitize-filename "^1.6.3"
optionalDependencies:
dmg-license "^1.0.8"
@@ -5424,23 +5349,21 @@ ejs@^3.1.6:
dependencies:
jake "^10.6.1"
-electron-builder@22.10.5:
- version "22.10.5"
- resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.5.tgz#03b156b93e6012609027c3aaa69201a3ad21e454"
- integrity sha512-0q/289UUJUhRou6lZKDz/wzK6WprIQ6VXMTmaI+w9qXvSNugPC9UA5s2zXInOkjZOvO/xKnjeyiavrVSHYF3tA==
+electron-builder@22.11.1:
+ version "22.11.1"
+ resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.1.tgz#8d443f6599e718ef96837573a6d07754dde64310"
+ integrity sha512-IbAhv31idKzTR8KNQ+AIRf9J5vfU+9PzpG2STKHjYYWwGhfhZ5H4YfR0xH8xiwI4gaL1uTrfiq7fnpQxafhF2A==
dependencies:
- "@types/yargs" "^15.0.13"
- app-builder-lib "22.10.5"
- bluebird-lst "^1.0.9"
- builder-util "22.10.5"
- builder-util-runtime "8.7.3"
+ "@types/yargs" "^16.0.0"
+ app-builder-lib "22.11.1"
+ builder-util "22.11.1"
+ builder-util-runtime "8.7.4"
chalk "^4.1.0"
- dmg-builder "22.10.5"
+ dmg-builder "22.11.1"
fs-extra "^9.1.0"
- is-ci "^2.0.0"
+ is-ci "^3.0.0"
lazy-val "^1.0.4"
- read-config-file "6.0.0"
- sanitize-filename "^1.6.3"
+ read-config-file "6.1.0"
update-notifier "^5.1.0"
yargs "^16.2.0"
@@ -5461,20 +5384,6 @@ electron-devtools-installer@^3.1.1:
semver "^7.2.1"
unzip-crx-3 "^0.2.0"
-electron-publish@22.10.5:
- version "22.10.5"
- resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.5.tgz#9cbe46266b6c79d8c6e99840755682e2262d3543"
- integrity sha512-dHyuazv3P3j1Xyv7pdwTwAvxWab2pCb0G0Oa6qWQoCc4b1/mRGY00M7AvYW1cPuUijj9zYAf1HmXfM6MifaMlA==
- dependencies:
- "@types/fs-extra" "^9.0.7"
- bluebird-lst "^1.0.9"
- builder-util "22.10.5"
- builder-util-runtime "8.7.3"
- chalk "^4.1.0"
- fs-extra "^9.1.0"
- lazy-val "^1.0.4"
- mime "^2.5.0"
-
electron-publish@22.11.1:
version "22.11.1"
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.1.tgz#23f3e96772b2de82c32b75e6070053ed246dfa6a"
@@ -6953,7 +6862,7 @@ hosted-git-info@^2.1.4:
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
-hosted-git-info@^3.0.6, hosted-git-info@^3.0.8:
+hosted-git-info@^3.0.6:
version "3.0.8"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d"
integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==
@@ -11103,17 +11012,6 @@ reactcss@^1.2.0:
dependencies:
lodash "^4.0.1"
-read-config-file@6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299"
- integrity sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA==
- dependencies:
- dotenv "^8.2.0"
- dotenv-expand "^5.1.0"
- js-yaml "^3.13.1"
- json5 "^2.1.2"
- lazy-val "^1.0.4"
-
read-config-file@6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.1.0.tgz#204256f18eedf4dc82dd5f7886dfd7b931d03b08"