From 6ec377182473b7dfb41872a3704273bce4adc42f Mon Sep 17 00:00:00 2001 From: Andrey Goncharov Date: Thu, 10 Mar 2022 10:31:24 -0800 Subject: [PATCH] Upgrade Metro Reviewed By: passy Differential Revision: D34789498 fbshipit-source-id: 9e984b308ac6d0dbc917ddaa20812f76d2a69d77 --- desktop/flipper-server/package.json | 2 +- ...{metro+0.66.2.patch => metro+0.69.0.patch} | 4 +- ....66.2.patch => metro-runtime+0.69.0.patch} | 4 +- desktop/pkg-lib/package.json | 2 +- desktop/scripts/package.json | 2 +- desktop/yarn.lock | 339 ++++++------------ 6 files changed, 120 insertions(+), 233 deletions(-) rename desktop/patches/{metro+0.66.2.patch => metro+0.69.0.patch} (88%) rename desktop/patches/{metro-runtime+0.66.2.patch => metro-runtime+0.69.0.patch} (80%) diff --git a/desktop/flipper-server/package.json b/desktop/flipper-server/package.json index 0c4521105..e48a03eea 100644 --- a/desktop/flipper-server/package.json +++ b/desktop/flipper-server/package.json @@ -22,7 +22,7 @@ "flipper-pkg-lib": "0.0.0", "flipper-server-core": "0.0.0", "fs-extra": "^9.0.0", - "metro": "^0.66.2", + "metro": "^0.69.0", "open": "^8.3.0", "p-filter": "^2.1.0", "socket.io": "^4.4.1", diff --git a/desktop/patches/metro+0.66.2.patch b/desktop/patches/metro+0.69.0.patch similarity index 88% rename from desktop/patches/metro+0.66.2.patch rename to desktop/patches/metro+0.69.0.patch index 3a4384803..e38813f97 100644 --- a/desktop/patches/metro+0.66.2.patch +++ b/desktop/patches/metro+0.69.0.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/metro/src/lib/getPreludeCode.js b/node_modules/metro/src/lib/getPreludeCode.js -index f73c6ec..fc313ec 100644 +index 56780d7..7da26d1 100644 --- a/node_modules/metro/src/lib/getPreludeCode.js +++ b/node_modules/metro/src/lib/getPreludeCode.js @@ -14,7 +14,7 @@ function getPreludeCode({ extraVars, isDev, globalPrefix }) { @@ -8,6 +8,6 @@ index f73c6ec..fc313ec 100644 ...formatExtraVars(extraVars), - "process=this.process||{}", + "process=process||this.process||global.process||{}", - `__METRO_GLOBAL_PREFIX__='${globalPrefix}'` + `__METRO_GLOBAL_PREFIX__='${globalPrefix}'`, ]; return `var ${vars.join(",")};${processEnv( diff --git a/desktop/patches/metro-runtime+0.66.2.patch b/desktop/patches/metro-runtime+0.69.0.patch similarity index 80% rename from desktop/patches/metro-runtime+0.66.2.patch rename to desktop/patches/metro-runtime+0.69.0.patch index 1ddd5f521..a8ea0328e 100644 --- a/desktop/patches/metro-runtime+0.66.2.patch +++ b/desktop/patches/metro-runtime+0.69.0.patch @@ -1,9 +1,9 @@ diff --git a/node_modules/metro-runtime/src/polyfills/require.js b/node_modules/metro-runtime/src/polyfills/require.js -index f9bb647..d918aa1 100644 +index e7e1e25..25a946a 100644 --- a/node_modules/metro-runtime/src/polyfills/require.js +++ b/node_modules/metro-runtime/src/polyfills/require.js @@ -113,11 +113,6 @@ function metroRequire(moduleId) { - .map(id => (modules[id] ? modules[id].verboseName : "[unknown]")); // We want to show A -> B -> A: + .map((id) => (modules[id] ? modules[id].verboseName : "[unknown]")); // We want to show A -> B -> A: cycle.push(cycle[0]); - console.warn( diff --git a/desktop/pkg-lib/package.json b/desktop/pkg-lib/package.json index 03877f8c6..f1fdb6219 100644 --- a/desktop/pkg-lib/package.json +++ b/desktop/pkg-lib/package.json @@ -12,7 +12,7 @@ "flipper-babel-transformer": "0.0.0", "flipper-plugin-lib": "0.0.0", "fs-extra": "^10.0.1", - "metro": "^0.66.2", + "metro": "^0.69.0", "metro-cache": "^0.69.0", "metro-minify-terser": "^0.66.2", "npm-packlist": "^4.0.0" diff --git a/desktop/scripts/package.json b/desktop/scripts/package.json index 4710398bf..fea9b41b5 100644 --- a/desktop/scripts/package.json +++ b/desktop/scripts/package.json @@ -28,7 +28,7 @@ "fs-extra": "^9.0.0", "glob": "^7.2.0", "ignore": "^5.1.4", - "metro": "^0.66.2", + "metro": "^0.69.0", "metro-minify-terser": "^0.66.2", "p-filter": "^2.1.0", "p-map": "^4.0.0", diff --git a/desktop/yarn.lock b/desktop/yarn.lock index dd23b3e4e..2f25d1e04 100644 --- a/desktop/yarn.lock +++ b/desktop/yarn.lock @@ -700,7 +700,7 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-proposal-optional-chaining" "^7.16.7" -"@babel/plugin-proposal-async-generator-functions@^7.16.8": +"@babel/plugin-proposal-async-generator-functions@^7.0.0", "@babel/plugin-proposal-async-generator-functions@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8" integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ== @@ -1172,13 +1172,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-object-assign@^7.0.0": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.8.3.tgz#dc3b8dd50ef03837868a37b7df791f64f288538e" - integrity sha512-i3LuN8tPDqUCRFu3dkzF2r1Nx0jp4scxtm7JxtIqI9he9Vk20YD+/zshdzR9JLsoBMlJlNR82a62vQExNEVx/Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/plugin-transform-object-super@^7.0.0", "@babel/plugin-transform-object-super@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" @@ -1462,17 +1455,6 @@ "@babel/plugin-transform-react-jsx-development" "^7.16.7" "@babel/plugin-transform-react-pure-annotations" "^7.16.7" -"@babel/register@^7.0.0": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.6.2.tgz#25765a922202cb06f8bdac5a3b1e70cd6bf3dd45" - integrity sha512-xgZk2LRZvt6i2SAUWxc7ellk4+OYRgS3Zpsnr13nMS1Qo25w21Uu8o6vTOAqNaxiqrnv30KTYzh9YWY2k21CeQ== - dependencies: - find-cache-dir "^2.0.0" - lodash "^4.17.13" - mkdirp "^0.5.1" - pirates "^4.0.0" - source-map-support "^0.5.9" - "@babel/runtime-corejs3@^7.10.2": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.1.tgz#51b9092befbeeed938335a109dbe0df51451e9dc" @@ -4785,11 +4767,6 @@ commander@~2.8.1: dependencies: graceful-readlink ">= 1.0.0" -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= - compare-version@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" @@ -6477,15 +6454,6 @@ finalhandler@1.1.2, finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-cache-dir@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" - integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== - dependencies: - commondir "^1.0.1" - make-dir "^2.0.0" - pkg-dir "^3.0.0" - find-root@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" @@ -6498,13 +6466,6 @@ find-up@^2.1.0: dependencies: locate-path "^2.0.0" -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" @@ -6992,10 +6953,17 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -hermes-parser@0.4.7: - version "0.4.7" - resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.4.7.tgz#410f5129d57183784d205a0538e6fbdcf614c9ea" - integrity sha512-jc+zCtXbtwTiXoMAoXOHepxAaGVFIp89wwE9qcdwnMd/uGVEtPoY8FaFSsx0ThPvyKirdR2EsIIDVrpbSXz1Ag== +hermes-estree@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.6.0.tgz#e866fddae1b80aec65fe2ae450a5f2070ad54033" + integrity sha512-2YTGzJCkhdmT6VuNprWjXnvTvw/3iPNw804oc7yknvQpNKo+vJGZmtvLLCghOZf0OwzKaNAzeIMp71zQbNl09w== + +hermes-parser@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.6.0.tgz#00d14e91bca830b3c1457050fa4187400cb96328" + integrity sha512-Vf58jBZca2+QBLR9h7B7mdg8oFz2g5ILz1iVouZ5DOrOrAfBmPfJjdjDT8jrO0f+iJ4/hSRrQHqHIjSnTaLUDQ== + dependencies: + hermes-estree "0.6.0" hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: version "3.3.2" @@ -7910,7 +7878,7 @@ jest-get-type@^26.3.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== -jest-haste-map@^26.5.2, jest-haste-map@^26.6.2: +jest-haste-map@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa" integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w== @@ -8620,14 +8588,6 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" @@ -8697,7 +8657,7 @@ lodash.union@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= -lodash@4.x, lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.7.0: +lodash@4.x, lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -8768,7 +8728,7 @@ make-dir@^1.0.0: dependencies: pify "^3.0.0" -make-dir@^2.0.0, make-dir@^2.1.0: +make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== @@ -8900,45 +8860,22 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -metro-babel-register@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.66.2.tgz#c6bbe36c7a77590687ccd74b425dc020d17d05af" - integrity sha512-3F+vsVubUPJYKfVMeol8/7pd8CC287Rw92QYzJD8LEmI980xcgwMUEVBZ0UIAUwlLgiJG/f4Mwhuji2EeBXrPg== +metro-babel-transformer@0.69.0: + version "0.69.0" + resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.69.0.tgz#6598ef631ebcb62b36d79d19a89a00d6fb54cf64" + integrity sha512-tlfdy8vkNQUqyFQYBK9lAHQvWfpC/E+auXiJZNNnKV1mbVZhmfbGpt1sLxidfXWMpcYMI1cdF0RxOkZDqTLtwQ== dependencies: "@babel/core" "^7.14.0" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0" - "@babel/plugin-proposal-optional-chaining" "^7.0.0" - "@babel/plugin-syntax-class-properties" "^7.0.0" - "@babel/plugin-transform-flow-strip-types" "^7.0.0" - "@babel/plugin-transform-modules-commonjs" "^7.0.0" - "@babel/register" "^7.0.0" - escape-string-regexp "^1.0.5" - -metro-babel-transformer@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.66.2.tgz#fce0a3e314d28a5e7141c135665e1cc9b8e7ce86" - integrity sha512-aJ/7fc/Xkofw8Fqa51OTDhBzBz26mmpIWrXAZcPdQ8MSTt883EWncxeCEjasc79NJ89BRi7sOkkaWZo2sXlKvw== - dependencies: - "@babel/core" "^7.14.0" - hermes-parser "0.4.7" - metro-source-map "0.66.2" + hermes-parser "0.6.0" + metro-source-map "0.69.0" nullthrows "^1.1.1" -metro-cache-key@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.66.2.tgz#d6463d2a53e887a38419d523962cc24ea0e780b4" - integrity sha512-WtkNmRt41qOpHh1MkNA4nLiQ/m7iGL90ysSKD+fcLqlUnOBKJptPQm0ZUv8Kfqk18ddWX2KmsSbq+Sf3I6XohQ== +metro-cache-key@0.69.0: + version "0.69.0" + resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.69.0.tgz#b042231678bdc24c2604326047b839db4f372138" + integrity sha512-79zYpE2M0JPvmzq8R1a+HjbNsGcEQlOUCfLwENyAZslmjJrajXsrF5FxxMVWIIWoMftMRCvz65RD96cuzMJUCw== -metro-cache@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.66.2.tgz#e0af4e0a319898f7d42a980f7ee5da153fcfd019" - integrity sha512-5QCYJtJOHoBSbL3H4/Fpl36oA697C3oYHqsce+Hk/dh2qtODUGpS3gOBhvP1B8iB+H8jJMyR75lZq129LJEsIQ== - dependencies: - metro-core "0.66.2" - mkdirp "^0.5.1" - rimraf "^2.5.4" - -metro-cache@^0.69.0: +metro-cache@0.69.0, metro-cache@^0.69.0: version "0.69.0" resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.69.0.tgz#9b31e33b11e1a5a91d82a9895710ab49301c33e4" integrity sha512-KVAxeJ2T3T+PiaOJZdH5To9q0YoZxOaIJgTDDvtnaAlMnw5yax1RIQymiZ2Qfo3gawdr0a5ZfJtCqkG+JS8+4Q== @@ -8946,26 +8883,17 @@ metro-cache@^0.69.0: metro-core "0.69.0" rimraf "^2.5.4" -metro-config@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.66.2.tgz#e365acdb66ad0cda0182b9c9910760a97ee4293b" - integrity sha512-0C+PrKKIBNNzLZUKN/8ZDJS2U5FLMOTXDWbvBHIdqb6YXz8WplXR2+xlSlaSCCi5b+GR7cWFWUNeKA4GQS1/AQ== +metro-config@0.69.0: + version "0.69.0" + resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.69.0.tgz#18612746a3477651140db7e1211b267cadc02e4c" + integrity sha512-5LuTCrIzASi5c/Lu6eND/X1SpRM8s/8+9qCzhOVm0oVpq4EOq/7yWDufZ1DYrqZCOiSBjz9m1l5pym2LB+N0/A== dependencies: cosmiconfig "^5.0.5" jest-validate "^26.5.2" - metro "0.66.2" - metro-cache "0.66.2" - metro-core "0.66.2" - metro-runtime "0.66.2" - -metro-core@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.66.2.tgz#ead776a17b3e5a307e6dc22259db30bf5c7e8490" - integrity sha512-JieLZkef/516yxXYvQxWnf3OWw5rcgWRy76K8JV/wr/i8LGVGulPAXlIi445/QZzXVydzRVASKAEVqyxM5F4mA== - dependencies: - jest-haste-map "^26.5.2" - lodash.throttle "^4.1.1" - metro-resolver "0.66.2" + metro "0.69.0" + metro-cache "0.69.0" + metro-core "0.69.0" + metro-runtime "0.69.0" metro-core@0.69.0: version "0.69.0" @@ -8976,19 +8904,19 @@ metro-core@0.69.0: lodash.throttle "^4.1.1" metro-resolver "0.69.0" -metro-hermes-compiler@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-hermes-compiler/-/metro-hermes-compiler-0.66.2.tgz#30290748f83805faa601aa487632444915795823" - integrity sha512-nCVL1g9uR6vrw5+X1wjwZruRyMkndnzGRMqjqoljf+nGEqBTD607CR7elXw4fMWn/EM+1y0Vdq5altUu9LdgCA== +metro-hermes-compiler@0.69.0: + version "0.69.0" + resolved "https://registry.yarnpkg.com/metro-hermes-compiler/-/metro-hermes-compiler-0.69.0.tgz#57c067b237f9cf87f31627caa1a67d17ea647e46" + integrity sha512-ofGCh/HRs+81T6WrzTFXe3GH3nyVMEswTbbhzBVuIbG+Hj+S23Q1qL5ptJZhsxVV/Sez/P/ifUtvqH3TIUw50Q== -metro-inspector-proxy@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-inspector-proxy/-/metro-inspector-proxy-0.66.2.tgz#a83c76bd2f2fd7b9240be92acf9a8b1d1404547a" - integrity sha512-gnLc9121eznwP0iiA9tCBW8qZjwIsCgwHWMF1g1Qaki9le9tzeJv3dK4/lFNGxyfSaLO7vahQEhsEYsiRnTROg== +metro-inspector-proxy@0.69.0: + version "0.69.0" + resolved "https://registry.yarnpkg.com/metro-inspector-proxy/-/metro-inspector-proxy-0.69.0.tgz#173177200d357d5114294c9f233134156557d68d" + integrity sha512-rDHGTLZ1cGmcVS7pDFfYVWvCWfnMMpzj4QAZO1/9HZsy95TKoRc71L6LhVDC0xQstBAqXk+aIvgTjkJ+VICUyg== dependencies: connect "^3.6.5" debug "^2.2.0" - ws "^1.1.5" + ws "^7.5.1" yargs "^15.3.1" metro-minify-terser@^0.66.2: @@ -8998,19 +8926,20 @@ metro-minify-terser@^0.66.2: dependencies: terser "^4.6.3" -metro-minify-uglify@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.66.2.tgz#6061dbee4f61e6d5bb3c100e4379ff6f2e16e42b" - integrity sha512-7TUK+L5CmB5x1PVnFbgmjzHW4CUadq9H5jgp0HfFoWT1skXAyEsx0DHkKDXwnot0khnNhBOEfl62ctQOnE110Q== +metro-minify-uglify@0.69.0: + version "0.69.0" + resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.69.0.tgz#dfa3fc330902f74227480193fd8313690cdf80e8" + integrity sha512-zpEqHOAArP+QfOzqGG/d1D3orX1Isr3+HlZOnZFvxV6aJkloeDT5hMOznN9D9+O+7NJt0YHn+txyUrqKzjldzA== dependencies: uglify-es "^3.1.9" -metro-react-native-babel-preset@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.66.2.tgz#fddebcf413ad4ea617d4f47f7c1da401052de734" - integrity sha512-H/nLBAz0MgfDloSe1FjyH4EnbokHFdncyERvLPXDACY3ROVRCeUyFNo70ywRGXW2NMbrV4H7KUyU4zkfWhC2HQ== +metro-react-native-babel-preset@0.69.0: + version "0.69.0" + resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.69.0.tgz#5f651a027d3ced57fb1ef93e2e5a5a4a90059a93" + integrity sha512-AEvyI6h3ltvc3/hY+v7DhV3pFSSE3jhtebjYEX+ffXQ/oT3U3pbFvLXa24TCe7cTljM6eEMtmpYS+6UkGE9BKQ== dependencies: "@babel/core" "^7.14.0" + "@babel/plugin-proposal-async-generator-functions" "^7.0.0" "@babel/plugin-proposal-class-properties" "^7.0.0" "@babel/plugin-proposal-export-default-from" "^7.0.0" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0" @@ -9034,7 +8963,6 @@ metro-react-native-babel-preset@0.66.2: "@babel/plugin-transform-function-name" "^7.0.0" "@babel/plugin-transform-literals" "^7.0.0" "@babel/plugin-transform-modules-commonjs" "^7.0.0" - "@babel/plugin-transform-object-assign" "^7.0.0" "@babel/plugin-transform-parameters" "^7.0.0" "@babel/plugin-transform-react-display-name" "^7.0.0" "@babel/plugin-transform-react-jsx" "^7.0.0" @@ -9051,13 +8979,6 @@ metro-react-native-babel-preset@0.66.2: "@babel/template" "^7.0.0" react-refresh "^0.4.0" -metro-resolver@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.66.2.tgz#f743ddbe7a12dd137d1f7a555732cafcaea421f8" - integrity sha512-pXQAJR/xauRf4kWFj2/hN5a77B4jLl0Fom5I3PHp6Arw/KxSBp0cnguXpGLwNQ6zQC0nxKCoYGL9gQpzMnN7Hw== - dependencies: - absolute-path "^0.0.0" - metro-resolver@0.69.0: version "0.69.0" resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.69.0.tgz#d1d2147e6771f952f27b1bf5f645dc6b4ca12de0" @@ -9065,46 +8986,41 @@ metro-resolver@0.69.0: dependencies: absolute-path "^0.0.0" -metro-runtime@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.66.2.tgz#3409ee957b949b6c7b72ef6ed2b9af9a4f4a910e" - integrity sha512-vFhKBk2ot9FS4b+2v0OTa/guCF/QDAOJubY0CNg7PzCS5+w4y3IvZIcPX4SSS1t8pYEZBLvtdtTDarlDl81xmg== - -metro-runtime@^0.69.0: +metro-runtime@0.69.0, metro-runtime@^0.69.0: version "0.69.0" resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.69.0.tgz#cfddafbb8f3e194b3e2eb917ed851d0ee10d8e04" integrity sha512-m4qnrNIU5r/mYKiMJwfsUpJ8Q3oZa+bp0bpQHYxt5KvXETiFTEO3iF5ZsebLDII0SbEY+vIzGVXZFlA4p7XX9A== -metro-source-map@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.66.2.tgz#b5304a282a5d55fa67b599265e9cf3217175cdd7" - integrity sha512-038tFmB7vSh73VQcDWIbr5O1m+WXWyYafDaOy+1A/2K308YP0oj33gbEgDnZsLZDwcJ+xt1x6KUEBIzlX4YGeQ== +metro-source-map@0.69.0: + version "0.69.0" + resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.69.0.tgz#1fd1d9a886da2d1b147b57647d86f91f0b57512b" + integrity sha512-EvnX4kgUALt/xS+kASgwMSXjNTMjoicN1bIAVZsYWi/fujoc/nWWm05WJqmNzJHMyA/IUR4nBmmcQT+y5ZE5RA== dependencies: "@babel/traverse" "^7.14.0" "@babel/types" "^7.0.0" invariant "^2.2.4" - metro-symbolicate "0.66.2" + metro-symbolicate "0.69.0" nullthrows "^1.1.1" - ob1 "0.66.2" + ob1 "0.69.0" source-map "^0.5.6" vlq "^1.0.0" -metro-symbolicate@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.66.2.tgz#addd095ce5f77e73ca21ddb5dfb396ff5d4fa041" - integrity sha512-u+DeQHyAFXVD7mVP+GST/894WHJ3i/U8oEJFnT7U3P52ZuLgX8n4tMNxhqZU12RcLR6etF8143aP0Ktx1gFLEQ== +metro-symbolicate@0.69.0: + version "0.69.0" + resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.69.0.tgz#46911445f9114371e694c07c3d562f2747d3c581" + integrity sha512-KMDS5vB85WWlFX2P7d9+8+W5R78hAhgj8wfB5uw0HiG+bO2k3uACunFImFLqWU+Eqc57OZPxyF/XYi5h2q15CQ== dependencies: invariant "^2.2.4" - metro-source-map "0.66.2" + metro-source-map "0.69.0" nullthrows "^1.1.1" source-map "^0.5.6" through2 "^2.0.1" vlq "^1.0.0" -metro-transform-plugins@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.66.2.tgz#39dd044a23b1343e4f2d2ec34d08128cdf255ed4" - integrity sha512-KTvqplh0ut7oDKovvDG6yzXM02R6X+9b2oVG+qYq8Zd3aCGTi51ASx4ThCNkAHyEvCuJdYg9fxXTL+j+wvhB5w== +metro-transform-plugins@0.69.0: + version "0.69.0" + resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.69.0.tgz#02d7ea0d6c6a211e316b78c16dd5024b3c8054d6" + integrity sha512-CUhBcftpk8N7vigcPxOzIB0yfNY0DZjDCsyNRAOUYpg2wfjiMrGW9YPx3q2qUIP05BZ8x4nBLaWdF0PG16DHeA== dependencies: "@babel/core" "^7.14.0" "@babel/generator" "^7.14.0" @@ -9112,29 +9028,29 @@ metro-transform-plugins@0.66.2: "@babel/traverse" "^7.14.0" nullthrows "^1.1.1" -metro-transform-worker@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.66.2.tgz#0a8455992132c479721accd52c9bd47deb77769e" - integrity sha512-dO4PtYOMGB7Vzte8aIzX39xytODhmbJrBYPu+zYzlDjyefJZT7BkZ0LkPIThtyJi96xWcGqi9JBSo0CeRupAHw== +metro-transform-worker@0.69.0: + version "0.69.0" + resolved "https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.69.0.tgz#60323245c104a6da4f40f7c0972991901e11ae07" + integrity sha512-AHdu8bxc9yYqMQmiDn03fkl+u/6QqpNW1dv9TZIcXo1fNGOAilRYex/AJFodDnKmANVJIy1TFDp2od17OAWimg== dependencies: "@babel/core" "^7.14.0" "@babel/generator" "^7.14.0" "@babel/parser" "^7.14.0" "@babel/types" "^7.0.0" babel-preset-fbjs "^3.4.0" - metro "0.66.2" - metro-babel-transformer "0.66.2" - metro-cache "0.66.2" - metro-cache-key "0.66.2" - metro-hermes-compiler "0.66.2" - metro-source-map "0.66.2" - metro-transform-plugins "0.66.2" + metro "0.69.0" + metro-babel-transformer "0.69.0" + metro-cache "0.69.0" + metro-cache-key "0.69.0" + metro-hermes-compiler "0.69.0" + metro-source-map "0.69.0" + metro-transform-plugins "0.69.0" nullthrows "^1.1.1" -metro@0.66.2, metro@^0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/metro/-/metro-0.66.2.tgz#f21759bf00995470e7577b5b88a5277963f24492" - integrity sha512-uNsISfcQ3iKKSHoN5Q+LAh0l3jeeg7ZcNZ/4BAHGsk02erA0OP+l2m+b5qYVoPptHz9Oc3KyG5oGJoTu41pWjg== +metro@0.69.0, metro@^0.69.0: + version "0.69.0" + resolved "https://registry.yarnpkg.com/metro/-/metro-0.69.0.tgz#f141dc81ec62606cfa334f07e0a42f64b03b5a13" + integrity sha512-84dYpmK1S8bcbGGL9bcQZXt24ooNlKZnW+W3CW9eqPG9niVar/ra3l/QyDlIi7RxZuTBj+gO/D7irIm6QBkliw== dependencies: "@babel/code-frame" "^7.0.0" "@babel/core" "^7.14.0" @@ -9154,30 +9070,28 @@ metro@0.66.2, metro@^0.66.2: error-stack-parser "^2.0.6" fs-extra "^1.0.0" graceful-fs "^4.1.3" - hermes-parser "0.4.7" + hermes-parser "0.6.0" image-size "^0.6.0" invariant "^2.2.4" - jest-haste-map "^26.5.2" + jest-haste-map "^27.3.1" jest-worker "^26.0.0" lodash.throttle "^4.1.1" - metro-babel-register "0.66.2" - metro-babel-transformer "0.66.2" - metro-cache "0.66.2" - metro-cache-key "0.66.2" - metro-config "0.66.2" - metro-core "0.66.2" - metro-hermes-compiler "0.66.2" - metro-inspector-proxy "0.66.2" - metro-minify-uglify "0.66.2" - metro-react-native-babel-preset "0.66.2" - metro-resolver "0.66.2" - metro-runtime "0.66.2" - metro-source-map "0.66.2" - metro-symbolicate "0.66.2" - metro-transform-plugins "0.66.2" - metro-transform-worker "0.66.2" + metro-babel-transformer "0.69.0" + metro-cache "0.69.0" + metro-cache-key "0.69.0" + metro-config "0.69.0" + metro-core "0.69.0" + metro-hermes-compiler "0.69.0" + metro-inspector-proxy "0.69.0" + metro-minify-uglify "0.69.0" + metro-react-native-babel-preset "0.69.0" + metro-resolver "0.69.0" + metro-runtime "0.69.0" + metro-source-map "0.69.0" + metro-symbolicate "0.69.0" + metro-transform-plugins "0.69.0" + metro-transform-worker "0.69.0" mime-types "^2.1.27" - mkdirp "^0.5.1" node-fetch "^2.2.0" nullthrows "^1.1.1" rimraf "^2.5.4" @@ -9186,7 +9100,7 @@ metro@0.66.2, metro@^0.66.2: strip-ansi "^6.0.0" temp "0.8.3" throat "^5.0.0" - ws "^1.1.5" + ws "^7.5.1" yargs "^15.3.1" micromark@~2.10.0: @@ -9587,10 +9501,10 @@ nwsapi@^2.2.0: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== -ob1@0.66.2: - version "0.66.2" - resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.66.2.tgz#8caf548202cf2688944bae47db405a08bca17a61" - integrity sha512-RFewnL/RjE0qQBOuM+2bbY96zmJPIge/aDtsiDbLSb+MOiK8CReAhBHDgL+zrA3F1hQk00lMWpUwYcep750plA== +ob1@0.69.0: + version "0.69.0" + resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.69.0.tgz#46556143247f671b9b99fa4cbfd0a60a354fa050" + integrity sha512-TDhnMJnbb41HklhCy/1o7lJS6p8k14vk7rVaMuV7i8iDH/iVLF51UDFQtO0Yh73WhdONXquhRxaDjFtUBZqjmg== object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" @@ -9760,11 +9674,6 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -options@>=0.0.5: - version "0.0.6" - resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" - integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8= - ora@^5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" @@ -9814,7 +9723,7 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" -p-limit@^2.0.0, p-limit@^2.2.0: +p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== @@ -9828,13 +9737,6 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - p-locate@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -10067,20 +9969,13 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= -pirates@^4.0.0, pirates@^4.0.1: +pirates@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== dependencies: node-modules-regexp "^1.0.0" -pkg-dir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" - integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== - dependencies: - find-up "^3.0.0" - pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" @@ -11712,7 +11607,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.6, source-map-support@^0.5.9, source-map-support@~0.5.12: +source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.6, source-map-support@~0.5.12: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== @@ -12485,11 +12380,6 @@ uglify-es@^3.1.9: commander "~2.13.0" source-map "~0.6.1" -ultron@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" - integrity sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po= - unbox-primitive@^1.0.0, unbox-primitive@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" @@ -12960,19 +12850,16 @@ write-json-file@^4.1.1: sort-keys "^4.0.0" write-file-atomic "^3.0.0" -ws@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51" - integrity sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w== - dependencies: - options ">=0.0.5" - ultron "1.0.x" - ws@^7.4.5: version "7.5.6" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== +ws@^7.5.1: + version "7.5.7" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" + integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== + ws@^8.5.0: version "8.5.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"