[](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/3384
Reviewed By: passy
Differential Revision: D33892201
Pulled By: cekkaewnumchai
fbshipit-source-id: e318850d9bcad6908a92e41080fb64d8efafb183
---
desktop/scripts/build-icons.tsx | 1 -
desktop/scripts/package.json | 2 +-
desktop/yarn.lock | 17 +++++------------
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/desktop/scripts/build-icons.tsx b/desktop/scripts/build-icons.tsx
index 0169648d6..d6675cd5c 100644
--- a/desktop/scripts/build-icons.tsx
+++ b/desktop/scripts/build-icons.tsx
@@ -57,7 +57,6 @@ export async function downloadIcons(buildFolder: string) {
// Be default, only 5xx are retried but we're getting the odd 404
// which goes away on a retry for some reason.
retryOnHttpResponse: (res) => res.status >= 400,
- // @ts-expect-error not available in typings, but provided in docs (if this errors in future, remove the comment!)
retryOnHttpError: () => true,
},
})
diff --git a/desktop/scripts/package.json b/desktop/scripts/package.json
index 33ab34a35..c2a6a8112 100644
--- a/desktop/scripts/package.json
+++ b/desktop/scripts/package.json
@@ -7,7 +7,7 @@
"license": "MIT",
"bugs": "https://github.com/facebook/flipper/issues",
"devDependencies": {
- "@adobe/node-fetch-retry": "^2.0.0",
+ "@adobe/node-fetch-retry": "^2.1.0",
"@babel/code-frame": "^7.16.7",
"@types/adobe__node-fetch-retry": "^1.0.3",
"@types/babel__code-frame": "^7.0.3",
diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index 7ef5dd3e2..b7af2e875 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -12,10 +12,10 @@
resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876"
integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==
-"@adobe/node-fetch-retry@^2.0.0":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@adobe/node-fetch-retry/-/node-fetch-retry-2.0.0.tgz#760a042580f06c776442735c6d459c7feae5aaf7"
- integrity sha512-yqyY8yfHtVRMhy9JHiu9gVhnHVZfZRRTEWWinBGnSCLijLggslWdXsflOf80odzjRueQOzJl3/wbfzFeXpsNwA==
+"@adobe/node-fetch-retry@^2.1.0":
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/@adobe/node-fetch-retry/-/node-fetch-retry-2.1.0.tgz#1b3173ad1cac3fd1297fa02a08047f7f52400db3"
+ integrity sha512-LWBPgPCWJsgdD2wZqwoxdLITKabiw9IbvG4ZppD7DEKnYfaZFrhjHMaWdYjrOWOCGpE3kY7CFD4219thAKwLzg==
dependencies:
abort-controller "^3.0.0"
node-fetch "^2.6.1"
@@ -9137,14 +9137,7 @@ node-fetch@2.6.0:
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
-node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1:
- version "2.6.6"
- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
- integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
- dependencies:
- whatwg-url "^5.0.0"
-
-node-fetch@^2.6.7:
+node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7:
version "2.6.7"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==