From f09dc2f5dc353d852015e9b917c58efb9f9a3756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Mon, 29 Mar 2021 18:03:14 +0200 Subject: [PATCH] Makes patches optional (#2543) * Tolerates failing patches; fallback on the original sources * Adds support for optional patches * Versions * Fixes cache * Removes comments --- .pnp.cjs | 284 +++++++++--------- ...s-core-npm-1.2.6-f205abe96a-f07d105cd5.zip | Bin 0 -> 13269 bytes ...rlock-npm-1.0.38-d4f5e2dbf3-f99a839301.zip | Bin 14696 -> 0 bytes ...erlock-npm-2.0.2-91650a2501-627bee24a7.zip | Bin 0 -> 14975 bytes ...-monorepo-patch-3af4fe7cee-b7a09743fd.zip} | Bin ... fsevents-patch-166e093fda-b31f577c1a.zip} | Bin ... fsevents-patch-fef26eaad3-37502954e1.zip} | Bin ...> resolve-patch-3fc886ec33-d608d2915f.zip} | Bin ...> resolve-patch-8f9f00d98d-a360630804.zip} | Bin ...> resolve-patch-e402faf642-babb8c184c.zip} | Bin ...ypescript-patch-221ef62ccd-ac6b67d951.zip} | Bin ...ypescript-patch-bc0257cdd6-fb62f24bfd.zip} | Bin ...ypescript-patch-def50d8c94-894288b401.zip} | Bin ...-prebuilt-patch-ca225257fc-704a9fee9d.zip} | Bin .yarn/versions/36d85c5f.yml | 22 ++ package.json | 2 +- packages/plugin-compat/sources/index.ts | 2 +- packages/plugin-patch/sources/PatchFetcher.ts | 109 ++++--- .../plugin-patch/sources/PatchResolver.ts | 2 +- packages/plugin-patch/sources/patchUtils.ts | 66 ++-- packages/yarnpkg-core/sources/Report.ts | 8 +- yarn.lock | 54 ++-- 22 files changed, 320 insertions(+), 229 deletions(-) create mode 100644 .yarn/cache/@actions-core-npm-1.2.6-f205abe96a-f07d105cd5.zip delete mode 100644 .yarn/cache/@arcanis-sherlock-npm-1.0.38-d4f5e2dbf3-f99a839301.zip create mode 100644 .yarn/cache/@arcanis-sherlock-npm-2.0.2-91650a2501-627bee24a7.zip rename .yarn/cache/{@strictsoftware-typedoc-plugin-monorepo-patch-9155b53ad6-b7a09743fd.zip => @strictsoftware-typedoc-plugin-monorepo-patch-3af4fe7cee-b7a09743fd.zip} (100%) rename .yarn/cache/{fsevents-patch-b051797a41-b31f577c1a.zip => fsevents-patch-166e093fda-b31f577c1a.zip} (100%) rename .yarn/cache/{fsevents-patch-5794df231e-37502954e1.zip => fsevents-patch-fef26eaad3-37502954e1.zip} (100%) rename .yarn/cache/{resolve-patch-23a3403570-d608d2915f.zip => resolve-patch-3fc886ec33-d608d2915f.zip} (100%) rename .yarn/cache/{resolve-patch-38ce149af0-a360630804.zip => resolve-patch-8f9f00d98d-a360630804.zip} (100%) rename .yarn/cache/{resolve-patch-493d9f7c02-babb8c184c.zip => resolve-patch-e402faf642-babb8c184c.zip} (100%) rename .yarn/cache/{typescript-patch-c001a83e51-ac6b67d951.zip => typescript-patch-221ef62ccd-ac6b67d951.zip} (100%) rename .yarn/cache/{typescript-patch-91b1ac9b3b-fb62f24bfd.zip => typescript-patch-bc0257cdd6-fb62f24bfd.zip} (100%) rename .yarn/cache/{typescript-patch-3fdb043cfb-894288b401.zip => typescript-patch-def50d8c94-894288b401.zip} (100%) rename .yarn/cache/{yoga-layout-prebuilt-patch-9ccf399fa4-704a9fee9d.zip => yoga-layout-prebuilt-patch-ca225257fc-704a9fee9d.zip} (100%) create mode 100644 .yarn/versions/36d85c5f.yml diff --git a/.pnp.cjs b/.pnp.cjs index d5c31edd1410..38a2752906ca 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -245,7 +245,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { [null, { "packageLocation": "./", "packageDependencies": [ - ["@arcanis/sherlock", "npm:1.0.38"], + ["@arcanis/sherlock", "npm:2.0.2"], ["@babel/cli", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.10.1"], ["@babel/core", "npm:7.10.2"], ["@babel/plugin-proposal-class-properties", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.10.1"], @@ -279,11 +279,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest-junit", "npm:10.0.0"], ["micromatch", "npm:4.0.2"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "linkType": "SOFT", }] ]], + ["@actions/core", [ + ["npm:1.2.6", { + "packageLocation": "./.yarn/cache/@actions-core-npm-1.2.6-f205abe96a-f07d105cd5.zip/node_modules/@actions/core/", + "packageDependencies": [ + ["@actions/core", "npm:1.2.6"] + ], + "linkType": "HARD", + }] + ]], ["@algolia/cache-browser-local-storage", [ ["npm:4.2.0", { "packageLocation": "./.yarn/cache/@algolia-cache-browser-local-storage-npm-4.2.0-ce650cb25f-654f9bc1af.zip/node_modules/@algolia/cache-browser-local-storage/", @@ -441,10 +450,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["@arcanis/sherlock", [ - ["npm:1.0.38", { - "packageLocation": "./.yarn/cache/@arcanis-sherlock-npm-1.0.38-d4f5e2dbf3-f99a839301.zip/node_modules/@arcanis/sherlock/", + ["npm:2.0.2", { + "packageLocation": "./.yarn/cache/@arcanis-sherlock-npm-2.0.2-91650a2501-627bee24a7.zip/node_modules/@arcanis/sherlock/", "packageDependencies": [ - ["@arcanis/sherlock", "npm:1.0.38"], + ["@arcanis/sherlock", "npm:2.0.2"], + ["@actions/core", "npm:1.2.6"], ["@octokit/rest", "npm:16.28.7"], ["clipanion", "npm:2.0.0-rc.16"], ["expect", "npm:24.8.0"], @@ -540,7 +550,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["gensync", "npm:1.0.0-beta.1"], ["json5", "npm:2.1.3"], ["lodash", "npm:4.17.15"], - ["resolve", "patch:resolve@npm%3A1.14.1#builtin::version=1.14.1&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff"], ["semver", "npm:5.6.0"], ["source-map", "npm:0.5.7"] ], @@ -563,7 +573,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["gensync", "npm:1.0.0-beta.1"], ["json5", "npm:2.1.3"], ["lodash", "npm:4.17.15"], - ["resolve", "patch:resolve@npm%3A1.14.1#builtin::version=1.14.1&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff"], ["semver", "npm:5.6.0"], ["source-map", "npm:0.5.7"] ], @@ -3521,7 +3531,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@babel/helper-module-imports", "npm:7.10.1"], ["@babel/helper-plugin-utils", "npm:7.10.1"], ["@types/babel__core", "npm:7.1.3"], - ["resolve", "patch:resolve@npm%3A1.14.1#builtin::version=1.14.1&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff"], ["semver", "npm:5.6.0"] ], "packagePeers": [ @@ -3538,7 +3548,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@babel/helper-module-imports", "npm:7.10.1"], ["@babel/helper-plugin-utils", "npm:7.10.1"], ["@types/babel__core", null], - ["resolve", "patch:resolve@npm%3A1.14.1#builtin::version=1.14.1&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff"], ["semver", "npm:5.6.0"] ], "packagePeers": [ @@ -8028,17 +8038,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["@strictsoftware/typedoc-plugin-monorepo", [ - ["patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=3cb6af&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby", { - "packageLocation": "./.yarn/cache/@strictsoftware-typedoc-plugin-monorepo-patch-9155b53ad6-b7a09743fd.zip/node_modules/@strictsoftware/typedoc-plugin-monorepo/", + ["patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=c53b58&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby", { + "packageLocation": "./.yarn/cache/@strictsoftware-typedoc-plugin-monorepo-patch-3af4fe7cee-b7a09743fd.zip/node_modules/@strictsoftware/typedoc-plugin-monorepo/", "packageDependencies": [ - ["@strictsoftware/typedoc-plugin-monorepo", "patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=3cb6af&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"] + ["@strictsoftware/typedoc-plugin-monorepo", "patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=c53b58&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"] ], "linkType": "SOFT", }], - ["virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=3cb6af&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby", { - "packageLocation": "./.yarn/__virtual__/@strictsoftware-typedoc-plugin-monorepo-virtual-09b872f664/0/cache/@strictsoftware-typedoc-plugin-monorepo-patch-9155b53ad6-b7a09743fd.zip/node_modules/@strictsoftware/typedoc-plugin-monorepo/", + ["virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=c53b58&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby", { + "packageLocation": "./.yarn/__virtual__/@strictsoftware-typedoc-plugin-monorepo-virtual-1e2ad49114/0/cache/@strictsoftware-typedoc-plugin-monorepo-patch-3af4fe7cee-b7a09743fd.zip/node_modules/@strictsoftware/typedoc-plugin-monorepo/", "packageDependencies": [ - ["@strictsoftware/typedoc-plugin-monorepo", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=3cb6af&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], + ["@strictsoftware/typedoc-plugin-monorepo", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=c53b58&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], ["@types/typedoc", null], ["highlight.js", "npm:9.18.1"], ["marked", "npm:0.8.1"], @@ -9475,7 +9485,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["regexpp", "npm:3.0.0"], ["semver", "npm:7.3.2"], ["tsutils", "virtual:2ae55ed8ee0df5c5f27d6073707b1f25bcdc980314bc3c8d57c3fe2245d235c8c4745392a5af57ae4d8682511e779924129eed1a2b77951c3643749e1e53479e#npm:3.17.1"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/eslint", @@ -9499,7 +9509,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["functional-red-black-tree", "npm:1.0.1"], ["regexpp", "npm:3.0.0"], ["tsutils", "virtual:5f54d2b1a1f006985d0fdd9ec5559662aecdedf927326cad5264ae047905157bfa09fd75849ec664b5eb3a2d1ec3e16961d252b89cc360af383c9a7c3760e002#npm:3.17.1"], - ["typescript", "patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=fadafe"] ], "packagePeers": [ "@types/eslint", @@ -9631,7 +9641,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@typescript-eslint/typescript-estree", "virtual:db0c4d5e7f962d786779f2179e1d016630eed273b73d036b975476ce85b8fa2d3feb840ab85453b2710a8bf98d3c8cb369c3d8554d73e4a8d1525b6b21702f32#npm:4.11.1"], ["debug", "virtual:ebe93d6532e43d78779479b0dabfe2d284fd2cc037fde073604e57fc384c1044e905ed82c7d081310a0af68c672c6a0a67f8fdbca758f0bd26d9fc4456fbf1af#npm:4.1.1"], ["eslint", "npm:6.8.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/eslint", @@ -9651,7 +9661,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@typescript-eslint/typescript-estree", "virtual:ad13b5ab21f801b540b464ce4369c0ca688e0d6353ac7e356522b6c6dfb665757f139d77305652f9641cd74ed7e4db3d56c6d652029b271de6c7ee05c9c4d4f5#npm:2.29.0"], ["eslint", null], ["eslint-visitor-keys", "npm:1.1.0"], - ["typescript", "patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=fadafe"] ], "packagePeers": [ "@types/eslint", @@ -9730,7 +9740,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["lodash", "npm:4.17.15"], ["semver", "npm:6.3.0"], ["tsutils", "virtual:5f54d2b1a1f006985d0fdd9ec5559662aecdedf927326cad5264ae047905157bfa09fd75849ec664b5eb3a2d1ec3e16961d252b89cc360af383c9a7c3760e002#npm:3.17.1"], - ["typescript", "patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=fadafe"] ], "packagePeers": [ "@types/typescript", @@ -9789,7 +9799,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["lodash", "npm:4.17.15"], ["semver", "npm:7.3.2"], ["tsutils", "virtual:2ae55ed8ee0df5c5f27d6073707b1f25bcdc980314bc3c8d57c3fe2245d235c8c4745392a5af57ae4d8682511e779924129eed1a2b77951c3643749e1e53479e#npm:3.17.1"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "typescript" @@ -10168,7 +10178,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["terser-webpack-plugin", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.4"], ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"], + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.1.1"], ["webpack-merge", "npm:4.2.2"] @@ -10206,7 +10216,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["terser-webpack-plugin", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.4"], ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"], + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.1.1"], ["webpack-merge", "npm:4.2.2"] @@ -10244,7 +10254,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["terser-webpack-plugin", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.4"], ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"], + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.1.1"], ["webpack-merge", "npm:4.2.2"] @@ -10281,7 +10291,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["terser-webpack-plugin", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.4"], ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"], + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.1.1"], ["webpack-merge", "npm:4.2.2"] @@ -10328,7 +10338,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__core", @@ -10374,7 +10384,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__core", @@ -10420,7 +10430,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__core", @@ -10466,7 +10476,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__core", @@ -10512,7 +10522,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__core", @@ -10558,7 +10568,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__core", @@ -10604,7 +10614,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__core", @@ -10650,7 +10660,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__core", @@ -10696,7 +10706,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__core", @@ -10742,7 +10752,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__core", @@ -10788,7 +10798,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__core", @@ -10834,7 +10844,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__core", @@ -10879,7 +10889,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "linkType": "SOFT", }] @@ -10951,7 +10961,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["micromatch", "npm:4.0.2"], ["p-limit", "npm:2.2.0"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "linkType": "SOFT", }] @@ -11004,7 +11014,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint", "npm:6.8.0"], ["eslint-plugin-arca", "npm:0.10.0"], ["eslint-plugin-react", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.20.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/eslint-plugin-arca", @@ -11056,7 +11066,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@loadable/component", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:5.12.0"], ["@reach/router", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:1.3.3"], ["@rehooks/component-size", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:1.0.3"], - ["@strictsoftware/typedoc-plugin-monorepo", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=3cb6af&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], + ["@strictsoftware/typedoc-plugin-monorepo", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=c53b58&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], ["@types/babel__core", "npm:7.1.3"], ["@types/dedent", "npm:0.7.0"], ["@types/indent-string", "npm:4.0.1"], @@ -11130,7 +11140,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["typedoc", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:0.17.0-3"], ["typedoc-neo-theme", "npm:1.0.7"], ["typedoc-plugin-yarn", "portal:./typedoc-plugin-yarn::locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"], + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"], ["unescape-html", "npm:1.1.0"], ["unfetch", "npm:4.1.0"], ["unified", "npm:7.1.0"], @@ -11203,7 +11213,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./", "packageDependencies": [ ["@yarnpkg/monorepo", "workspace:."], - ["@arcanis/sherlock", "npm:1.0.38"], + ["@arcanis/sherlock", "npm:2.0.2"], ["@babel/cli", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.10.1"], ["@babel/core", "npm:7.10.2"], ["@babel/plugin-proposal-class-properties", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.10.1"], @@ -11237,7 +11247,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest-junit", "npm:10.0.0"], ["micromatch", "npm:4.0.2"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "linkType": "SOFT", }] @@ -11269,7 +11279,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:f4e4f4a9a0213f122880195b39adaee7de5cb560c1d806ebc8bace6a3124e5b8f820bbb89ebecd4d535caeb6f527d343143210aa405689c118ff2813b78998a0#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "packagePeers": [ @@ -11293,7 +11303,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:1c3d72c6b31a8950672985f8306a860ecc80c9a006aac95cf4a7ba13a6e7cc4e095e37186a53c9909e9efe97bc0f7f570a74b3879778e2a2356cdcf407120006#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "packagePeers": [ @@ -11317,7 +11327,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:2351fd5ac4f83ad35b714d8af9fdeea561ada341d529d0dba50742dd5735dc3750df6c56bd680e14833d5b987026a1eab6618211ea0ef1b34b727372b3c77bc9#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "packagePeers": [ @@ -11341,7 +11351,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:4864d30fc563f2fd1b72a5e3869493c5f50bf38f98ed3886173d80c044d981c3f68220dbf17f2b5fc5b4c5fba7d0af2e003926efe3487086484049f41c449852#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "packagePeers": [ @@ -11365,7 +11375,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:83b7a14498f70e120fb6f455fa263877f0d2954cbb68f3216e842cf37532afa9fe7895f2327708b45ae12ab75df0f3b07ed6e746fa7001bc6460dba7aaf38d31#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "packagePeers": [ @@ -11389,7 +11399,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:08fe6ad7a76ed00f8dc32e3b968ce66fd4db8ac47424db78612ce3633e63ecb46d41984611094facf53bbef7eae7fbf98bbfd729fb77f5ccde564684f4e3a829#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:a7c38e9a420fd3b408ea245831c2c9f0e880eac64b268fab3219f5f0b1d6015f44b1f92d23aabfc6e980bbbbda00a23e9faa983fb98544fab94119ccd31f2440#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "packagePeers": [ @@ -11413,7 +11423,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:adaf1cec8728346f1bf6a263f1954625a52d60518b8d2084da8a926203282105d2b95fb9da84922062af8d4fc84b8a1c39f220238424024e56f55577bdbc7208#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "packagePeers": [ @@ -11437,7 +11447,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:b4c0e602e8ac4e01a7b08db41bb5808da767dd1f6802758faa5125fb2423614bb0a8806ee1b30c3a0769f86da15ad37377f5118d93cd93fa48df0008a448fb35#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "packagePeers": [ @@ -11461,7 +11471,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:c44c4b6360dc34d25da6d32e39622e7e40f36f37b99dc66b6ebbd615fdd49465f496bf10f81b6fa5f71b95443fda61174ad51d2799fc7ca433af9a9666cd0f37#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "packagePeers": [ @@ -11485,7 +11495,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:cd2af72718007566941ac9f5a6def4d055c38029c95c3ac065493603e6055c1d77b2f2df752588114932973488b5a566f49b00118e7e12f48aa0798ea38cc15b#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "packagePeers": [ @@ -11509,7 +11519,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:d1d72d9e3903ca8b8d9c23a360395cc764db2689e5992ef9af91c79f03a839db10ec675af9e4c1c8f4842aff1a614eb5b115fcc0afe8256630151ef1252de94b#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "packagePeers": [ @@ -11533,7 +11543,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:f8376ca2bc11738adced76b97627e7eff07ec08f93f5b76caf8d6bd4f78f5ae9c1911cb9d1a0bd256ef3e0601dedeba933acf0d2381588b6513ee81e25626459#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "packagePeers": [ @@ -11557,7 +11567,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:fbdc5d510ba8a17c8a6f41fa886aad6afdb5bb69a6c572f07631b9053e2f6fffb88c3c0ed12ce824d16679e6179817298d840c6f53555825740d9f6b3a6aa0cd#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "packagePeers": [ @@ -11579,7 +11589,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:f4e4f4a9a0213f122880195b39adaee7de5cb560c1d806ebc8bace6a3124e5b8f820bbb89ebecd4d535caeb6f527d343143210aa405689c118ff2813b78998a0#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["semver", "npm:7.3.2"] ], "linkType": "SOFT", @@ -11600,7 +11610,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["node-emoji", "npm:1.10.0"], ["tau-prolog", "npm:0.2.66"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "linkType": "SOFT", }] @@ -12358,7 +12368,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/core", "workspace:packages/yarnpkg-core"], ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "linkType": "SOFT", }] @@ -12805,7 +12815,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["react", "npm:16.13.1"], ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "linkType": "SOFT", }] @@ -15090,7 +15100,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15112,7 +15122,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15134,7 +15144,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15156,7 +15166,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15178,7 +15188,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15200,7 +15210,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15222,7 +15232,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15244,7 +15254,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15266,7 +15276,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15288,7 +15298,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15310,7 +15320,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15332,7 +15342,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15354,7 +15364,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15374,7 +15384,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "linkType": "SOFT", }] @@ -15394,7 +15404,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["algoliasearch", "npm:4.2.0"], ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "linkType": "SOFT", }] @@ -15418,7 +15428,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["react", "npm:16.13.1"], ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "linkType": "SOFT", }] @@ -15438,7 +15448,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["p-limit", "npm:2.2.0"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "linkType": "SOFT", }] @@ -15455,7 +15465,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["resolve.exports", "npm:1.0.2"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"], + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"], ["webpack", "virtual:16110bda3ce959c103b1979c5d750ceb8ac9cfbd2049c118b6278e46e65aa65fd17e71e04a0ce5f75b7ca3203efd8e9c9b03c948a76c7f4bca807539915b5cfc#npm:5.1.1"], ["webpack-cli", "virtual:16110bda3ce959c103b1979c5d750ceb8ac9cfbd2049c118b6278e46e65aa65fd17e71e04a0ce5f75b7ca3203efd8e9c9b03c948a76c7f4bca807539915b5cfc#npm:4.0.0-beta.8"] ], @@ -15482,7 +15492,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint", "npm:6.8.0"], ["lodash", "npm:4.17.15"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/eslint", @@ -15510,7 +15520,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint", "npm:6.8.0"], ["lodash", "npm:4.17.15"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/eslint", @@ -15536,7 +15546,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint", "npm:6.8.0"], ["lodash", "npm:4.17.15"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "linkType": "SOFT", }] @@ -16773,7 +16783,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/eslint", null], ["eslint", "npm:6.8.0"], ["eslint-visitor-keys", "npm:1.1.0"], - ["resolve", "patch:resolve@npm%3A1.14.1#builtin::version=1.14.1&hash=3388aa"] + ["resolve", "patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff"] ], "packagePeers": [ "@types/eslint", @@ -17001,7 +17011,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["babel-plugin-macros", "npm:2.8.0"], ["@babel/runtime", "npm:7.9.2"], ["cosmiconfig", "npm:6.0.0"], - ["resolve", "patch:resolve@npm%3A1.14.1#builtin::version=1.14.1&hash=3388aa"] + ["resolve", "patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff"] ], "linkType": "HARD", }] @@ -18531,7 +18541,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["anymatch", "npm:2.0.0"], ["async-each", "npm:1.0.1"], ["braces", "npm:2.3.2"], - ["fsevents", "patch:fsevents@npm%3A1.2.7#builtin::version=1.2.7&hash=11e9ea"], + ["fsevents", "patch:fsevents@npm%3A1.2.7#~builtin::version=1.2.7&hash=1cc4b2"], ["glob-parent", "npm:3.1.0"], ["inherits", "npm:2.0.3"], ["is-binary-path", "npm:1.0.1"], @@ -18549,7 +18559,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["chokidar", "npm:3.4.0"], ["anymatch", "npm:3.1.1"], ["braces", "npm:3.0.2"], - ["fsevents", "patch:fsevents@npm%3A2.1.3#builtin::version=2.1.3&hash=11e9ea"], + ["fsevents", "patch:fsevents@npm%3A2.1.3#~builtin::version=2.1.3&hash=1cc4b2"], ["glob-parent", "npm:5.1.0"], ["is-binary-path", "npm:2.1.0"], ["is-glob", "npm:4.0.1"], @@ -21692,7 +21702,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [ ["eslint-import-resolver-node", "npm:0.3.3"], ["debug", "virtual:2bcc47d217f870e3d52f0e55493dc34fd3da852877f7db32fa2940cc320151746026495daf6a34a974488cf5a949d93be1e2dc1ffba036faf081a9b15fcd2252#npm:2.6.9"], - ["resolve", "patch:resolve@npm%3A1.14.1#builtin::version=1.14.1&hash=3388aa"] + ["resolve", "patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff"] ], "linkType": "HARD", }] @@ -21821,7 +21831,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["minimatch", "npm:3.0.4"], ["object.values", "npm:1.1.1"], ["read-pkg-up", "npm:2.0.0"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["tsconfig-paths", "npm:3.9.0"] ], "packagePeers": [ @@ -21884,7 +21894,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["object.fromentries", "npm:2.0.2"], ["object.values", "npm:1.1.1"], ["prop-types", "npm:15.7.2"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["string.prototype.matchall", "npm:4.0.2"], ["xregexp", "npm:4.3.0"] ], @@ -23173,7 +23183,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["schema-utils", "npm:1.0.0"], ["semver", "npm:5.6.0"], ["tapable", "npm:1.1.3"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"], + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"], ["vue-template-compiler", null], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.1.1"] ], @@ -23439,19 +23449,19 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["fsevents", [ - ["patch:fsevents@npm%3A1.2.7#builtin::version=1.2.7&hash=11e9ea", { - "packageLocation": "./.yarn/unplugged/fsevents-patch-b051797a41/node_modules/fsevents/", + ["patch:fsevents@npm%3A1.2.7#~builtin::version=1.2.7&hash=1cc4b2", { + "packageLocation": "./.yarn/unplugged/fsevents-patch-166e093fda/node_modules/fsevents/", "packageDependencies": [ - ["fsevents", "patch:fsevents@npm%3A1.2.7#builtin::version=1.2.7&hash=11e9ea"], + ["fsevents", "patch:fsevents@npm%3A1.2.7#~builtin::version=1.2.7&hash=1cc4b2"], ["nan", "npm:2.14.0"], ["node-pre-gyp", "npm:0.10.3"] ], "linkType": "HARD", }], - ["patch:fsevents@npm%3A2.1.3#builtin::version=2.1.3&hash=11e9ea", { - "packageLocation": "./.yarn/unplugged/fsevents-patch-5794df231e/node_modules/fsevents/", + ["patch:fsevents@npm%3A2.1.3#~builtin::version=2.1.3&hash=1cc4b2", { + "packageLocation": "./.yarn/unplugged/fsevents-patch-fef26eaad3/node_modules/fsevents/", "packageDependencies": [ - ["fsevents", "patch:fsevents@npm%3A2.1.3#builtin::version=2.1.3&hash=11e9ea"], + ["fsevents", "patch:fsevents@npm%3A2.1.3#~builtin::version=2.1.3&hash=1cc4b2"], ["node-gyp", "npm:6.0.1"] ], "linkType": "HARD", @@ -23833,7 +23843,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["strict-ui", "npm:0.1.3"], ["subscriptions-transport-ws", "virtual:e721af34745e2aded5d4d499d50f62b576dd2080eb1f2bb52977c4bfa58f87cba61c1a822a17998b163819d9d9ffb45f4e1cfaad85154aa3bbe0834010be88eb#npm:0.9.16"], ["theme-ui", "npm:0.4.0-highlight.0"], - ["typescript", "patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=a45b0e"], + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=fadafe"], ["urql", "virtual:e721af34745e2aded5d4d499d50f62b576dd2080eb1f2bb52977c4bfa58f87cba61c1a822a17998b163819d9d9ffb45f4e1cfaad85154aa3bbe0834010be88eb#npm:1.9.8"], ["yup", "npm:0.29.1"] ], @@ -27070,7 +27080,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["widest-line", "npm:3.1.0"], ["wrap-ansi", "npm:6.2.0"], ["ws", "virtual:4ac7945935c7b9baa1c648c30910b97cc4b5310bd9c6e7f82899f24717f03acba3019fca67c456aeaef29db72c35d787ebde17b426ca35ee56f8bb84bc683d77#npm:7.3.1"], - ["yoga-layout-prebuilt", "patch:yoga-layout-prebuilt@npm%3A1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch::version=1.10.0&hash=1b07e1&locator=%40yarnpkg%2Fmonorepo%40workspace%3A."] + ["yoga-layout-prebuilt", "patch:yoga-layout-prebuilt@npm%3A1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch::version=1.10.0&hash=f2f3a3&locator=%40yarnpkg%2Fmonorepo%40workspace%3A."] ], "packagePeers": [ "@types/react", @@ -27101,7 +27111,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["string-length", "npm:3.1.0"], ["widest-line", "npm:3.1.0"], ["wrap-ansi", "npm:6.2.0"], - ["yoga-layout-prebuilt", "patch:yoga-layout-prebuilt@npm%3A1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch::version=1.10.0&hash=1b07e1&locator=%40yarnpkg%2Fmonorepo%40workspace%3A."] + ["yoga-layout-prebuilt", "patch:yoga-layout-prebuilt@npm%3A1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch::version=1.10.0&hash=f2f3a3&locator=%40yarnpkg%2Fmonorepo%40workspace%3A."] ], "packagePeers": [ "@types/react", @@ -27132,7 +27142,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["string-length", "npm:3.1.0"], ["widest-line", "npm:3.1.0"], ["wrap-ansi", "npm:6.2.0"], - ["yoga-layout-prebuilt", "patch:yoga-layout-prebuilt@npm%3A1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch::version=1.10.0&hash=1b07e1&locator=%40yarnpkg%2Fmonorepo%40workspace%3A."] + ["yoga-layout-prebuilt", "patch:yoga-layout-prebuilt@npm%3A1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch::version=1.10.0&hash=f2f3a3&locator=%40yarnpkg%2Fmonorepo%40workspace%3A."] ], "packagePeers": [ "@types/react", @@ -28712,7 +28722,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/graceful-fs", "npm:4.1.3"], ["anymatch", "npm:3.1.1"], ["fb-watchman", "npm:2.0.0"], - ["fsevents", "patch:fsevents@npm%3A2.1.3#builtin::version=2.1.3&hash=11e9ea"], + ["fsevents", "patch:fsevents@npm%3A2.1.3#~builtin::version=2.1.3&hash=1cc4b2"], ["graceful-fs", "npm:4.2.4"], ["jest-serializer", "npm:26.0.0"], ["jest-util", "npm:26.0.1"], @@ -28891,7 +28901,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest-pnp-resolver", "virtual:631d11a244cf9e8543d845f9233371049f6acc7a371f8cdc0328ac0915c7fea1f5e43b0c6464606ba013212ee8e56784c791cb67764091471a2a31ac041ce93f#npm:1.2.1"], ["jest-util", "npm:26.0.1"], ["read-pkg-up", "npm:7.0.1"], - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["slash", "npm:3.0.0"] ], "linkType": "HARD", @@ -30879,7 +30889,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["react-dom", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:16.13.1"], ["react-lifecycles-compat", "npm:3.0.4"], ["shallowequal", "npm:1.1.0"], - ["typescript", "patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=fadafe"] ], "packagePeers": [ "@types/react-dom", @@ -31673,7 +31683,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [ ["normalize-package-data", "npm:2.5.0"], ["hosted-git-info", "npm:2.7.1"], - ["resolve", "patch:resolve@npm%3A1.14.1#builtin::version=1.14.1&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff"], ["semver", "npm:5.6.0"], ["validate-npm-package-license", "npm:3.0.4"] ], @@ -34431,7 +34441,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["js-reporters", "npm:1.2.1"], ["minimatch", "npm:3.0.4"], ["node-watch", "npm:0.6.0"], - ["resolve", "patch:resolve@npm%3A1.9.0#builtin::version=1.9.0&hash=3388aa"] + ["resolve", "patch:resolve@npm%3A1.9.0#~builtin::version=1.9.0&hash=00b1ff"] ], "linkType": "HARD", }] @@ -35755,7 +35765,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/rechoir-npm-0.6.2-0df5f171ec-fe76bf9c21.zip/node_modules/rechoir/", "packageDependencies": [ ["rechoir", "npm:0.6.2"], - ["resolve", "patch:resolve@npm%3A1.14.1#builtin::version=1.14.1&hash=3388aa"] + ["resolve", "patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff"] ], "linkType": "HARD", }], @@ -35763,7 +35773,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/rechoir-npm-0.7.0-9bea79bab8-15f55f55e0.zip/node_modules/rechoir/", "packageDependencies": [ ["rechoir", "npm:0.7.0"], - ["resolve", "patch:resolve@npm%3A1.14.1#builtin::version=1.14.1&hash=3388aa"] + ["resolve", "patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff"] ], "linkType": "HARD", }] @@ -36511,26 +36521,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["resolve", [ - ["patch:resolve@npm%3A1.14.1#builtin::version=1.14.1&hash=3388aa", { - "packageLocation": "./.yarn/cache/resolve-patch-493d9f7c02-babb8c184c.zip/node_modules/resolve/", + ["patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff", { + "packageLocation": "./.yarn/cache/resolve-patch-e402faf642-babb8c184c.zip/node_modules/resolve/", "packageDependencies": [ - ["resolve", "patch:resolve@npm%3A1.14.1#builtin::version=1.14.1&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff"], ["path-parse", "npm:1.0.6"] ], "linkType": "HARD", }], - ["patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa", { - "packageLocation": "./.yarn/cache/resolve-patch-38ce149af0-a360630804.zip/node_modules/resolve/", + ["patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff", { + "packageLocation": "./.yarn/cache/resolve-patch-8f9f00d98d-a360630804.zip/node_modules/resolve/", "packageDependencies": [ - ["resolve", "patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff"], ["path-parse", "npm:1.0.6"] ], "linkType": "HARD", }], - ["patch:resolve@npm%3A1.9.0#builtin::version=1.9.0&hash=3388aa", { - "packageLocation": "./.yarn/cache/resolve-patch-23a3403570-d608d2915f.zip/node_modules/resolve/", + ["patch:resolve@npm%3A1.9.0#~builtin::version=1.9.0&hash=00b1ff", { + "packageLocation": "./.yarn/cache/resolve-patch-3fc886ec33-d608d2915f.zip/node_modules/resolve/", "packageDependencies": [ - ["resolve", "patch:resolve@npm%3A1.9.0#builtin::version=1.9.0&hash=3388aa"], + ["resolve", "patch:resolve@npm%3A1.9.0#~builtin::version=1.9.0&hash=00b1ff"], ["path-parse", "npm:1.0.6"] ], "linkType": "HARD", @@ -39661,7 +39671,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["loader-utils", "npm:1.2.3"], ["micromatch", "npm:4.0.2"], ["semver", "npm:6.3.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/typescript", @@ -39749,7 +39759,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["tsutils", "virtual:2ae55ed8ee0df5c5f27d6073707b1f25bcdc980314bc3c8d57c3fe2245d235c8c4745392a5af57ae4d8682511e779924129eed1a2b77951c3643749e1e53479e#npm:3.17.1"], ["@types/typescript", null], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@types/typescript", @@ -39763,7 +39773,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["tsutils", "virtual:5f54d2b1a1f006985d0fdd9ec5559662aecdedf927326cad5264ae047905157bfa09fd75849ec664b5eb3a2d1ec3e16961d252b89cc360af383c9a7c3760e002#npm:3.17.1"], ["@types/typescript", null], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=fadafe"] ], "packagePeers": [ "@types/typescript", @@ -39973,7 +39983,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/__virtual__/typedoc-virtual-bfc0864653/0/cache/typedoc-npm-0.17.0-3-0ce05847cf-fba4c70481.zip/node_modules/typedoc/", "packageDependencies": [ ["typedoc", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:0.17.0-3"], - ["@strictsoftware/typedoc-plugin-monorepo", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=3cb6af&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], + ["@strictsoftware/typedoc-plugin-monorepo", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=c53b58&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], ["@types/minimatch", "npm:3.0.3"], ["@types/typescript", null], ["fs-extra", "npm:8.1.0"], @@ -39987,7 +39997,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["typedoc-default-themes", "npm:0.8.0-0"], ["typedoc-neo-theme", "npm:1.0.7"], ["typedoc-plugin-yarn", "portal:./typedoc-plugin-yarn::locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "packagePeers": [ "@strictsoftware/typedoc-plugin-monorepo", @@ -40016,7 +40026,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["typedoc-default-themes", "npm:0.8.0-0"], ["typedoc-neo-theme", null], ["typedoc-plugin-yarn", "portal:./typedoc-plugin-yarn::locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], - ["typescript", "patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=fadafe"] ], "packagePeers": [ "@strictsoftware/typedoc-plugin-monorepo", @@ -40044,7 +40054,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["typedoc-default-themes", "npm:0.7.2"], ["typedoc-neo-theme", "npm:1.0.7"], ["typedoc-plugin-yarn", null], - ["typescript", "patch:typescript@npm%3A3.7.5#builtin::version=3.7.5&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=fadafe"] ], "packagePeers": [ "@strictsoftware/typedoc-plugin-monorepo", @@ -40094,30 +40104,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [ ["typedoc-plugin-yarn", "portal:./typedoc-plugin-yarn::locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], ["typedoc", "virtual:258c95d7dd1da51c9c624f238593e0bc1c34b7bd8de0b85fefd9552f2220a4555cad458eb72d96f0c7b341784726b6a8e9c8b4e838a9d27aac3796b29de01981#npm:0.17.0-3"], - ["typescript", "patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=fadafe"] ], "linkType": "SOFT", }] ]], ["typescript", [ - ["patch:typescript@npm%3A3.7.5#builtin::version=3.7.5&hash=a45b0e", { - "packageLocation": "./.yarn/cache/typescript-patch-91b1ac9b3b-fb62f24bfd.zip/node_modules/typescript/", + ["patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=fadafe", { + "packageLocation": "./.yarn/cache/typescript-patch-bc0257cdd6-fb62f24bfd.zip/node_modules/typescript/", "packageDependencies": [ - ["typescript", "patch:typescript@npm%3A3.7.5#builtin::version=3.7.5&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=fadafe"] ], "linkType": "HARD", }], - ["patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=a45b0e", { - "packageLocation": "./.yarn/cache/typescript-patch-c001a83e51-ac6b67d951.zip/node_modules/typescript/", + ["patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=fadafe", { + "packageLocation": "./.yarn/cache/typescript-patch-221ef62ccd-ac6b67d951.zip/node_modules/typescript/", "packageDependencies": [ - ["typescript", "patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=fadafe"] ], "linkType": "HARD", }], - ["patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e", { - "packageLocation": "./.yarn/cache/typescript-patch-3fdb043cfb-894288b401.zip/node_modules/typescript/", + ["patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe", { + "packageLocation": "./.yarn/cache/typescript-patch-def50d8c94-894288b401.zip/node_modules/typescript/", "packageDependencies": [ - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"] + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"] ], "linkType": "HARD", }] @@ -41262,7 +41272,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/pnpify", "virtual:c44c4b6360dc34d25da6d32e39622e7e40f36f37b99dc66b6ebbd615fdd49465f496bf10f81b6fa5f71b95443fda61174ad51d2799fc7ca433af9a9666cd0f37#workspace:packages/yarnpkg-pnpify"], ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e"], + ["typescript", "patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe"], ["vsce", "npm:1.85.1"], ["webpack", "virtual:4bb0e72ae00ec402a28e80560124ee13357b1a5221665b7175877ddc6b8b2b98eebe4584a111245801ecf7cecb9de577d076505c0dbcf9292aaff35440a2302f#npm:5.1.1"], ["webpack-cli", "virtual:4bb0e72ae00ec402a28e80560124ee13357b1a5221665b7175877ddc6b8b2b98eebe4584a111245801ecf7cecb9de577d076505c0dbcf9292aaff35440a2302f#npm:4.0.0-beta.8"] @@ -42735,10 +42745,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["yoga-layout-prebuilt", [ - ["patch:yoga-layout-prebuilt@npm%3A1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch::version=1.10.0&hash=1b07e1&locator=%40yarnpkg%2Fmonorepo%40workspace%3A.", { - "packageLocation": "./.yarn/cache/yoga-layout-prebuilt-patch-9ccf399fa4-704a9fee9d.zip/node_modules/yoga-layout-prebuilt/", + ["patch:yoga-layout-prebuilt@npm%3A1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch::version=1.10.0&hash=f2f3a3&locator=%40yarnpkg%2Fmonorepo%40workspace%3A.", { + "packageLocation": "./.yarn/cache/yoga-layout-prebuilt-patch-ca225257fc-704a9fee9d.zip/node_modules/yoga-layout-prebuilt/", "packageDependencies": [ - ["yoga-layout-prebuilt", "patch:yoga-layout-prebuilt@npm%3A1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch::version=1.10.0&hash=1b07e1&locator=%40yarnpkg%2Fmonorepo%40workspace%3A."], + ["yoga-layout-prebuilt", "patch:yoga-layout-prebuilt@npm%3A1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch::version=1.10.0&hash=f2f3a3&locator=%40yarnpkg%2Fmonorepo%40workspace%3A."], ["@types/yoga-layout", "npm:1.9.2"] ], "linkType": "HARD", diff --git a/.yarn/cache/@actions-core-npm-1.2.6-f205abe96a-f07d105cd5.zip b/.yarn/cache/@actions-core-npm-1.2.6-f205abe96a-f07d105cd5.zip new file mode 100644 index 0000000000000000000000000000000000000000..723709f72ad93d28884f831a9ed6d08130b7b300 GIT binary patch literal 13269 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 literal 0 HcmV?d00001 diff --git a/.yarn/cache/@strictsoftware-typedoc-plugin-monorepo-patch-9155b53ad6-b7a09743fd.zip b/.yarn/cache/@strictsoftware-typedoc-plugin-monorepo-patch-3af4fe7cee-b7a09743fd.zip similarity index 100% rename from .yarn/cache/@strictsoftware-typedoc-plugin-monorepo-patch-9155b53ad6-b7a09743fd.zip rename to .yarn/cache/@strictsoftware-typedoc-plugin-monorepo-patch-3af4fe7cee-b7a09743fd.zip diff --git a/.yarn/cache/fsevents-patch-b051797a41-b31f577c1a.zip b/.yarn/cache/fsevents-patch-166e093fda-b31f577c1a.zip similarity index 100% rename from .yarn/cache/fsevents-patch-b051797a41-b31f577c1a.zip rename to .yarn/cache/fsevents-patch-166e093fda-b31f577c1a.zip diff --git a/.yarn/cache/fsevents-patch-5794df231e-37502954e1.zip b/.yarn/cache/fsevents-patch-fef26eaad3-37502954e1.zip similarity index 100% rename from .yarn/cache/fsevents-patch-5794df231e-37502954e1.zip rename to .yarn/cache/fsevents-patch-fef26eaad3-37502954e1.zip diff --git a/.yarn/cache/resolve-patch-23a3403570-d608d2915f.zip b/.yarn/cache/resolve-patch-3fc886ec33-d608d2915f.zip similarity index 100% rename from .yarn/cache/resolve-patch-23a3403570-d608d2915f.zip rename to .yarn/cache/resolve-patch-3fc886ec33-d608d2915f.zip diff --git a/.yarn/cache/resolve-patch-38ce149af0-a360630804.zip b/.yarn/cache/resolve-patch-8f9f00d98d-a360630804.zip similarity index 100% rename from .yarn/cache/resolve-patch-38ce149af0-a360630804.zip rename to .yarn/cache/resolve-patch-8f9f00d98d-a360630804.zip diff --git a/.yarn/cache/resolve-patch-493d9f7c02-babb8c184c.zip b/.yarn/cache/resolve-patch-e402faf642-babb8c184c.zip similarity index 100% rename from .yarn/cache/resolve-patch-493d9f7c02-babb8c184c.zip rename to .yarn/cache/resolve-patch-e402faf642-babb8c184c.zip diff --git a/.yarn/cache/typescript-patch-c001a83e51-ac6b67d951.zip b/.yarn/cache/typescript-patch-221ef62ccd-ac6b67d951.zip similarity index 100% rename from .yarn/cache/typescript-patch-c001a83e51-ac6b67d951.zip rename to .yarn/cache/typescript-patch-221ef62ccd-ac6b67d951.zip diff --git a/.yarn/cache/typescript-patch-91b1ac9b3b-fb62f24bfd.zip b/.yarn/cache/typescript-patch-bc0257cdd6-fb62f24bfd.zip similarity index 100% rename from .yarn/cache/typescript-patch-91b1ac9b3b-fb62f24bfd.zip rename to .yarn/cache/typescript-patch-bc0257cdd6-fb62f24bfd.zip diff --git a/.yarn/cache/typescript-patch-3fdb043cfb-894288b401.zip b/.yarn/cache/typescript-patch-def50d8c94-894288b401.zip similarity index 100% rename from .yarn/cache/typescript-patch-3fdb043cfb-894288b401.zip rename to .yarn/cache/typescript-patch-def50d8c94-894288b401.zip diff --git a/.yarn/cache/yoga-layout-prebuilt-patch-9ccf399fa4-704a9fee9d.zip b/.yarn/cache/yoga-layout-prebuilt-patch-ca225257fc-704a9fee9d.zip similarity index 100% rename from .yarn/cache/yoga-layout-prebuilt-patch-9ccf399fa4-704a9fee9d.zip rename to .yarn/cache/yoga-layout-prebuilt-patch-ca225257fc-704a9fee9d.zip diff --git a/.yarn/versions/36d85c5f.yml b/.yarn/versions/36d85c5f.yml new file mode 100644 index 000000000000..0ea2ebce264c --- /dev/null +++ b/.yarn/versions/36d85c5f.yml @@ -0,0 +1,22 @@ +releases: + "@yarnpkg/cli": minor + "@yarnpkg/plugin-compat": minor + "@yarnpkg/plugin-patch": minor + +declined: + - "@yarnpkg/plugin-constraints" + - "@yarnpkg/plugin-dlx" + - "@yarnpkg/plugin-essentials" + - "@yarnpkg/plugin-init" + - "@yarnpkg/plugin-interactive-tools" + - "@yarnpkg/plugin-node-modules" + - "@yarnpkg/plugin-npm-cli" + - "@yarnpkg/plugin-pack" + - "@yarnpkg/plugin-pnp" + - "@yarnpkg/plugin-stage" + - "@yarnpkg/plugin-typescript" + - "@yarnpkg/plugin-version" + - "@yarnpkg/plugin-workspace-tools" + - "@yarnpkg/builder" + - "@yarnpkg/core" + - "@yarnpkg/doctor" diff --git a/package.json b/package.json index 1dc4017f337d..1b4a6bfcf2a4 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "packages/*" ], "dependencies": { - "@arcanis/sherlock": "^1.0.38", + "@arcanis/sherlock": "^2.0.2", "@babel/cli": "^7.10.1", "@babel/core": "^7.10.2", "@babel/plugin-proposal-class-properties": "^7.10.1", diff --git a/packages/plugin-compat/sources/index.ts b/packages/plugin-compat/sources/index.ts index d05d2504495e..50412ed0e44b 100644 --- a/packages/plugin-compat/sources/index.ts +++ b/packages/plugin-compat/sources/index.ts @@ -39,7 +39,7 @@ const plugin: Plugin = { return structUtils.makeDescriptor(dependency, structUtils.makeRange({ protocol: `patch:`, source: structUtils.stringifyDescriptor(dependency), - selector: `builtin`, + selector: `~builtin`, params: null, })); }, diff --git a/packages/plugin-patch/sources/PatchFetcher.ts b/packages/plugin-patch/sources/PatchFetcher.ts index 6c51f4e38af5..a8b10f221702 100644 --- a/packages/plugin-patch/sources/PatchFetcher.ts +++ b/packages/plugin-patch/sources/PatchFetcher.ts @@ -1,12 +1,12 @@ -import {Fetcher, FetchOptions, MinimalFetchOptions, ReportError, MessageName} from '@yarnpkg/core'; -import {Locator} from '@yarnpkg/core'; -import {miscUtils, structUtils} from '@yarnpkg/core'; -import {ppath, xfs, ZipFS, Filename, CwdFS, PortablePath} from '@yarnpkg/fslib'; -import {getLibzipPromise} from '@yarnpkg/libzip'; +import {Fetcher, FetchOptions, MinimalFetchOptions, ReportError, MessageName, Report} from '@yarnpkg/core'; +import {Locator} from '@yarnpkg/core'; +import {miscUtils, structUtils} from '@yarnpkg/core'; +import {ppath, xfs, ZipFS, Filename, CwdFS, PortablePath} from '@yarnpkg/fslib'; +import {getLibzipPromise} from '@yarnpkg/libzip'; -import * as patchUtils from './patchUtils'; -import {UnmatchedHunkError} from './tools/UnmatchedHunkError'; -import {reportHunk} from './tools/format'; +import * as patchUtils from './patchUtils'; +import {UnmatchedHunkError} from './tools/UnmatchedHunkError'; +import {reportHunk} from './tools/format'; export class PatchFetcher implements Fetcher { supports(locator: Locator, opts: MinimalFetchOptions) { @@ -44,56 +44,87 @@ export class PatchFetcher implements Fetcher { const patchFiles = await patchUtils.loadPatchFiles(parentLocator, patchPaths, opts); const tmpDir = await xfs.mktempPromise(); - const tmpFile = ppath.join(tmpDir, `patched.zip` as Filename); + const currentFile = ppath.join(tmpDir, `current.zip` as Filename); const sourceFetch = await opts.fetcher.fetch(sourceLocator, opts); const prefixPath = structUtils.getIdentVendorPath(locator); const libzip = await getLibzipPromise(); - const patchedPackage = new ZipFS(tmpFile, { + // First we create a copy of the package that we'll be free to mutate + const initialCopy = new ZipFS(currentFile, { libzip, create: true, level: opts.project.configuration.get(`compressionLevel`), }); - await patchedPackage.mkdirpPromise(prefixPath); + await initialCopy.mkdirpPromise(prefixPath); await miscUtils.releaseAfterUseAsync(async () => { - await patchedPackage.copyPromise(prefixPath, sourceFetch.prefixPath, {baseFs: sourceFetch.packageFs, stableSort: true}); + await initialCopy.copyPromise(prefixPath, sourceFetch.prefixPath, {baseFs: sourceFetch.packageFs, stableSort: true}); }, sourceFetch.releaseFs); - const patchFs = new CwdFS(ppath.resolve(PortablePath.root, prefixPath), {baseFs: patchedPackage}); - - for (const patchFile of patchFiles) { - if (patchFile !== null) { - try { - await patchUtils.applyPatchFile(patchUtils.parsePatchFile(patchFile), { - baseFs: patchFs, - version: sourceVersion, - }); - } catch (err) { - if (!(err instanceof UnmatchedHunkError)) - throw err; - - const enableInlineHunks = opts.project.configuration.get(`enableInlineHunks`); - const suggestion = !enableInlineHunks - ? ` (set enableInlineHunks for details)` - : ``; - - throw new ReportError(MessageName.PATCH_HUNK_FAILED, err.message + suggestion, report => { - if (!enableInlineHunks) - return; - - reportHunk(err.hunk, { - configuration: opts.project.configuration, - report, - }); + initialCopy.saveAndClose(); + + for (const {source, optional} of patchFiles) { + if (source === null) + continue; + + // Then for each patchfile, we open this copy anew, and try to apply the + // changeset. We need to open it for each patchfile (rather than only a + // single time) because it lets us easily rollback when hitting errors + // on optional patches (we just need to call `discardAndClose`). + const patchedPackage = new ZipFS(currentFile, { + libzip, + level: opts.project.configuration.get(`compressionLevel`), + }); + + const patchFs = new CwdFS(ppath.resolve(PortablePath.root, prefixPath), { + baseFs: patchedPackage, + }); + + try { + await patchUtils.applyPatchFile(patchUtils.parsePatchFile(source), { + baseFs: patchFs, + version: sourceVersion, + }); + } catch (err) { + if (!(err instanceof UnmatchedHunkError)) + throw err; + + const enableInlineHunks = opts.project.configuration.get(`enableInlineHunks`); + const suggestion = !enableInlineHunks && !optional + ? ` (set enableInlineHunks for details)` + : ``; + + const message = `${structUtils.prettyLocator(opts.project.configuration, locator)}: ${err.message}${suggestion}`; + const reportExtra = (report: Report) => { + if (!enableInlineHunks) + return; + + reportHunk(err.hunk, { + configuration: opts.project.configuration, + report, }); + }; + + // By discarding the current changes, the next patch will start from + // where we were. + patchedPackage.discardAndClose(); + + if (optional) { + opts.report.reportWarningOnce(MessageName.PATCH_HUNK_FAILED, message, {reportExtra}); + } else { + throw new ReportError(MessageName.PATCH_HUNK_FAILED, message, reportExtra); } } + + patchedPackage.saveAndClose(); } - return patchedPackage; + return new ZipFS(currentFile, { + libzip, + level: opts.project.configuration.get(`compressionLevel`), + }); } } diff --git a/packages/plugin-patch/sources/PatchResolver.ts b/packages/plugin-patch/sources/PatchResolver.ts index d15e47c3d273..55dc3e66ca93 100644 --- a/packages/plugin-patch/sources/PatchResolver.ts +++ b/packages/plugin-patch/sources/PatchResolver.ts @@ -56,7 +56,7 @@ export class PatchResolver implements Resolver { if (typeof sourcePackage === `undefined`) throw new Error(`Assertion failed: The dependency should have been resolved`); - const patchHash = hashUtils.makeHash(`${CACHE_VERSION}`, ...patchFiles).slice(0, 6); + const patchHash = hashUtils.makeHash(`${CACHE_VERSION}`, ...patchFiles.map(spec => JSON.stringify(spec))).slice(0, 6); return [patchUtils.makeLocator(descriptor, {parentLocator, sourcePackage, patchPaths, patchHash})]; } diff --git a/packages/plugin-patch/sources/patchUtils.ts b/packages/plugin-patch/sources/patchUtils.ts index 5a42e8a7e1e1..b07b7488617e 100644 --- a/packages/plugin-patch/sources/patchUtils.ts +++ b/packages/plugin-patch/sources/patchUtils.ts @@ -80,6 +80,10 @@ type VisitPatchPathOptions = { }; function visitPatchPath({onAbsolute, onRelative, onBuiltin}: VisitPatchPathOptions, patchPath: PortablePath) { + const optional = patchPath.startsWith(`~`); + if (optional) + patchPath = patchPath.slice(1) as PortablePath; + const builtinMatch = patchPath.match(BUILTIN_REGEXP); if (builtinMatch !== null) return onBuiltin(builtinMatch[1]); @@ -91,6 +95,14 @@ function visitPatchPath({onAbsolute, onRelative, onBuiltin}: VisitPatchPathOp } } +export function extractPatchFlags(patchPath: PortablePath) { + const optional = patchPath.startsWith(`~`); + if (optional) + patchPath = patchPath.slice(1) as PortablePath; + + return {optional}; +} + export function isParentRequired(patchPath: PortablePath) { return visitPatchPath({ onAbsolute: () => false, @@ -119,36 +131,40 @@ export async function loadPatchFiles(parentLocator: Locator | null, patchPaths: // First we obtain the specification for all the patches that we'll have to // apply to the original package. const patchFiles = await miscUtils.releaseAfterUseAsync(async () => { - return await Promise.all(patchPaths.map(async patchPath => visitPatchPath({ - onAbsolute: async () => { - return await xfs.readFilePromise(patchPath, `utf8`); - }, - - onRelative: async () => { - if (effectiveParentFetch === null) - throw new Error(`Assertion failed: The parent locator should have been fetched`); - - return await effectiveParentFetch.packageFs.readFilePromise(ppath.join(effectiveParentFetch.prefixPath, patchPath), `utf8`); - }, - - onBuiltin: async name => { - return await opts.project.configuration.firstHook((hooks: PatchHooks) => { - return hooks.getBuiltinPatch; - }, opts.project, name); - }, - }, patchPath))); + return await Promise.all(patchPaths.map(async patchPath => { + const flags = extractPatchFlags(patchPath); + + const source = await visitPatchPath({ + onAbsolute: async () => { + return await xfs.readFilePromise(patchPath, `utf8`); + }, + + onRelative: async () => { + if (effectiveParentFetch === null) + throw new Error(`Assertion failed: The parent locator should have been fetched`); + + return await effectiveParentFetch.packageFs.readFilePromise(ppath.join(effectiveParentFetch.prefixPath, patchPath), `utf8`); + }, + + onBuiltin: async name => { + return await opts.project.configuration.firstHook((hooks: PatchHooks) => { + return hooks.getBuiltinPatch; + }, opts.project, name); + }, + }, patchPath); + + return {...flags, source}; + })); }); // Normalizes the line endings to prevent mismatches when cloning a // repository on Windows systems (the default settings for Git are to // convert newlines back and forth, which would mess with the checksum) - return patchFiles.map(definition => { - if (typeof definition === `string`) { - return definition.replace(/\r\n?/g, `\n`); - } else { - return definition; - } - }); + for (const spec of patchFiles) + if (typeof spec.source === `string`) + spec.source = spec.source.replace(/\r\n?/g, `\n`); + + return patchFiles; } export async function extractPackageToDisk(locator: Locator, {cache, project}: {cache: Cache, project: Project}) { diff --git a/packages/yarnpkg-core/sources/Report.ts b/packages/yarnpkg-core/sources/Report.ts index 13d1a8603ba5..3f6415df4c98 100644 --- a/packages/yarnpkg-core/sources/Report.ts +++ b/packages/yarnpkg-core/sources/Report.ts @@ -93,21 +93,25 @@ export abstract class Report { }; } - reportInfoOnce(name: MessageName, text: string, opts?: {key?: any}) { + reportInfoOnce(name: MessageName, text: string, opts?: {key?: any, reportExtra?: (report: Report) => void}) { const key = opts && opts.key ? opts.key : text; if (!this.reportedInfos.has(key)) { this.reportedInfos.add(key); this.reportInfo(name, text); + + opts?.reportExtra?.(this); } } - reportWarningOnce(name: MessageName, text: string, opts?: {key?: any}) { + reportWarningOnce(name: MessageName, text: string, opts?: {key?: any, reportExtra?: (report: Report) => void}) { const key = opts && opts.key ? opts.key : text; if (!this.reportedWarnings.has(key)) { this.reportedWarnings.add(key); this.reportWarning(name, text); + + opts?.reportExtra?.(this); } } diff --git a/yarn.lock b/yarn.lock index 8daf1485274f..ed40ae471e8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,6 +5,13 @@ __metadata: version: 4 cacheKey: 8 +"@actions/core@npm:^1.2.6": + version: 1.2.6 + resolution: "@actions/core@npm:1.2.6" + checksum: f07d105cd5b1d309da8b5c55aad8c92a03915451455f267ac5b03220214d7f7e457b3ac6b874f592e856214491295ae8c106789b2fd5757bfcaf64fe7e0d0546 + languageName: node + linkType: hard + "@algolia/cache-browser-local-storage@npm:4.2.0": version: 4.2.0 resolution: "@algolia/cache-browser-local-storage@npm:4.2.0" @@ -144,10 +151,11 @@ __metadata: languageName: node linkType: hard -"@arcanis/sherlock@npm:^1.0.38": - version: 1.0.38 - resolution: "@arcanis/sherlock@npm:1.0.38" +"@arcanis/sherlock@npm:^2.0.2": + version: 2.0.2 + resolution: "@arcanis/sherlock@npm:2.0.2" dependencies: + "@actions/core": ^1.2.6 "@octokit/rest": ^16.28.7 clipanion: 2.0.0-rc.16 expect: ^24.8.0 @@ -163,7 +171,7 @@ __metadata: built: false bin: sherlock: lib/boot.js - checksum: f99a8393010d514fd8b61ae23b689702553df9ab61d72db9c6b3127f5ad102292063d4103093e1064d1f964dfb850f7e9574822008f575e248326d18e9c69b23 + checksum: 627bee24a738edb07d177afb16586593e926e435b8055c888b7505a225215bb7a77997dfd2f4f4596c82c8b22b7dfa7a7c0521efb44e72857be07790fa059240 languageName: node linkType: hard @@ -3860,7 +3868,7 @@ __metadata: "@strictsoftware/typedoc-plugin-monorepo@patch:@strictsoftware/typedoc-plugin-monorepo@^0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby": version: 0.2.2 - resolution: "@strictsoftware/typedoc-plugin-monorepo@patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=3cb6af&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby" + resolution: "@strictsoftware/typedoc-plugin-monorepo@patch:@strictsoftware/typedoc-plugin-monorepo@npm%3A0.2.2#./.patches/@strictsoftware/typedoc-plugin-monorepo.patch::version=0.2.2&hash=c53b58&locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby" dependencies: highlight.js: ^9.15.6 marked: ^0.8.0 @@ -5757,7 +5765,7 @@ __metadata: version: 0.0.0-use.local resolution: "@yarnpkg/monorepo@workspace:." dependencies: - "@arcanis/sherlock": ^1.0.38 + "@arcanis/sherlock": ^2.0.2 "@babel/cli": ^7.10.1 "@babel/core": ^7.10.2 "@babel/plugin-proposal-class-properties": ^7.10.1 @@ -12915,9 +12923,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"fsevents@patch:fsevents@^1.2.7#builtin": +"fsevents@patch:fsevents@^1.2.7#~builtin": version: 1.2.7 - resolution: "fsevents@patch:fsevents@npm%3A1.2.7#builtin::version=1.2.7&hash=11e9ea" + resolution: "fsevents@patch:fsevents@npm%3A1.2.7#~builtin::version=1.2.7&hash=1cc4b2" dependencies: nan: ^2.9.2 node-pre-gyp: ^0.10.0 @@ -12925,9 +12933,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"fsevents@patch:fsevents@^2.1.2#builtin, fsevents@patch:fsevents@~2.1.2#builtin": +"fsevents@patch:fsevents@^2.1.2#~builtin, fsevents@patch:fsevents@~2.1.2#~builtin": version: 2.1.3 - resolution: "fsevents@patch:fsevents@npm%3A2.1.3#builtin::version=2.1.3&hash=11e9ea" + resolution: "fsevents@patch:fsevents@npm%3A2.1.3#~builtin::version=2.1.3&hash=1cc4b2" dependencies: node-gyp: latest checksum: 37502954e1b2cf7d1f555561e45956521afa12e12cbfe05445ffa1f2852a3d8932980cacb808d504b1def84b12b3b7b41c26673180691295001fa7740cc63fba @@ -23552,27 +23560,27 @@ resolve@1.9.0: languageName: node linkType: hard -"resolve@patch:resolve@1.9.0#builtin": +"resolve@patch:resolve@1.9.0#~builtin": version: 1.9.0 - resolution: "resolve@patch:resolve@npm%3A1.9.0#builtin::version=1.9.0&hash=3388aa" + resolution: "resolve@patch:resolve@npm%3A1.9.0#~builtin::version=1.9.0&hash=00b1ff" dependencies: path-parse: ^1.0.6 checksum: d608d2915f41efa41a27533c5e331c10f382c55d8d54b4400a35feedc9adab4458fb2ccb6c569751fdadeb5b55d7a6b829e5b2a0271145a0e4d4ca777c57f483 languageName: node linkType: hard -"resolve@patch:resolve@^1.1.6#builtin, resolve@patch:resolve@^1.10.0#builtin, resolve@patch:resolve@^1.12.0#builtin, resolve@patch:resolve@^1.13.1#builtin, resolve@patch:resolve@^1.3.2#builtin, resolve@patch:resolve@^1.8.1#builtin, resolve@patch:resolve@^1.9.0#builtin": +"resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.13.1#~builtin, resolve@patch:resolve@^1.3.2#~builtin, resolve@patch:resolve@^1.8.1#~builtin, resolve@patch:resolve@^1.9.0#~builtin": version: 1.14.1 - resolution: "resolve@patch:resolve@npm%3A1.14.1#builtin::version=1.14.1&hash=3388aa" + resolution: "resolve@patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff" dependencies: path-parse: ^1.0.6 checksum: babb8c184c88bc1589d6ea2d29d8f602e0905361e967a381d42b35fb938f9b552a59716a47ab69fa795112efdc5df90e6cc655195fcda882c8baada8a2c9cec3 languageName: node linkType: hard -"resolve@patch:resolve@^1.15.1#builtin, resolve@patch:resolve@^1.17.0#builtin": +"resolve@patch:resolve@^1.15.1#~builtin, resolve@patch:resolve@^1.17.0#~builtin": version: 1.17.0 - resolution: "resolve@patch:resolve@npm%3A1.17.0#builtin::version=1.17.0&hash=3388aa" + resolution: "resolve@patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff" dependencies: path-parse: ^1.0.6 checksum: a3606308046ca75c0a6350c26df636b64a71904a8e00f3181fd838b46b4fc303c32ae3e694c156eae5d9102cbe194c444f85822d8e6ce30cf7c510e412029908 @@ -26616,9 +26624,9 @@ typescript@4.1.0-beta: languageName: node linkType: hard -"typescript@patch:typescript@3.7.x#builtin": +"typescript@patch:typescript@3.7.x#~builtin": version: 3.7.5 - resolution: "typescript@patch:typescript@npm%3A3.7.5#builtin::version=3.7.5&hash=a45b0e" + resolution: "typescript@patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=fadafe" bin: tsc: bin/tsc tsserver: bin/tsserver @@ -26626,9 +26634,9 @@ typescript@4.1.0-beta: languageName: node linkType: hard -"typescript@patch:typescript@4.1.0-beta#builtin": +"typescript@patch:typescript@4.1.0-beta#~builtin": version: 4.1.0-beta - resolution: "typescript@patch:typescript@npm%3A4.1.0-beta#builtin::version=4.1.0-beta&hash=a45b0e" + resolution: "typescript@patch:typescript@npm%3A4.1.0-beta#~builtin::version=4.1.0-beta&hash=fadafe" bin: tsc: bin/tsc tsserver: bin/tsserver @@ -26636,9 +26644,9 @@ typescript@4.1.0-beta: languageName: node linkType: hard -"typescript@patch:typescript@^3.8.3#builtin, typescript@patch:typescript@^3.9.3#builtin": +"typescript@patch:typescript@^3.8.3#~builtin, typescript@patch:typescript@^3.9.3#~builtin": version: 3.9.5 - resolution: "typescript@patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=a45b0e" + resolution: "typescript@patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=fadafe" bin: tsc: bin/tsc tsserver: bin/tsserver @@ -28806,7 +28814,7 @@ yoga-layout-prebuilt@1.10.0: "yoga-layout-prebuilt@patch:yoga-layout-prebuilt@1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch::locator=%40yarnpkg%2Fmonorepo%40workspace%3A.": version: 1.10.0 - resolution: "yoga-layout-prebuilt@patch:yoga-layout-prebuilt@npm%3A1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch::version=1.10.0&hash=1b07e1&locator=%40yarnpkg%2Fmonorepo%40workspace%3A." + resolution: "yoga-layout-prebuilt@patch:yoga-layout-prebuilt@npm%3A1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch::version=1.10.0&hash=f2f3a3&locator=%40yarnpkg%2Fmonorepo%40workspace%3A." dependencies: "@types/yoga-layout": 1.9.2 checksum: 704a9fee9da6ece88eae796a640ed9187cfaa1fc6a2cffbfd58491768cf8c9e59c67402a7675446ac48ae216127dd5f6cdd1f35074dc240809195292d79bd558