From fb95e58b4c31d2ef154733c8f324a70169c98796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Mon, 1 Mar 2021 14:05:49 +0100 Subject: [PATCH 1/5] Tolerates failing patches; fallback on the original sources --- .pnp.cjs | 20 +++-- ...s-core-npm-1.2.6-f205abe96a-984c7d5ae9.zip | Bin 0 -> 13269 bytes ...rlock-npm-1.0.38-d4f5e2dbf3-63f998598d.zip | Bin 14696 -> 0 bytes ...erlock-npm-2.0.2-91650a2501-b54f9a893b.zip | Bin 0 -> 14975 bytes package.json | 2 +- packages/plugin-patch/sources/PatchFetcher.ts | 72 +++++++++++------- packages/yarnpkg-core/sources/Report.ts | 8 +- yarn.lock | 18 +++-- 8 files changed, 78 insertions(+), 42 deletions(-) create mode 100644 .yarn/cache/@actions-core-npm-1.2.6-f205abe96a-984c7d5ae9.zip delete mode 100644 .yarn/cache/@arcanis-sherlock-npm-1.0.38-d4f5e2dbf3-63f998598d.zip create mode 100644 .yarn/cache/@arcanis-sherlock-npm-2.0.2-91650a2501-b54f9a893b.zip diff --git a/.pnp.cjs b/.pnp.cjs index b2b0f4a7065d..4d1689e6ec0d 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"], @@ -283,6 +283,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "SOFT", }] ]], + ["@actions/core", [ + ["npm:1.2.6", { + "packageLocation": "./.yarn/cache/@actions-core-npm-1.2.6-f205abe96a-984c7d5ae9.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-b7807ef499.zip/node_modules/@algolia/cache-browser-local-storage/", @@ -440,10 +449,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["@arcanis/sherlock", [ - ["npm:1.0.38", { - "packageLocation": "./.yarn/cache/@arcanis-sherlock-npm-1.0.38-d4f5e2dbf3-63f998598d.zip/node_modules/@arcanis/sherlock/", + ["npm:2.0.2", { + "packageLocation": "./.yarn/cache/@arcanis-sherlock-npm-2.0.2-91650a2501-b54f9a893b.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"], @@ -10568,7 +10578,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"], diff --git a/.yarn/cache/@actions-core-npm-1.2.6-f205abe96a-984c7d5ae9.zip b/.yarn/cache/@actions-core-npm-1.2.6-f205abe96a-984c7d5ae9.zip new file mode 100644 index 0000000000000000000000000000000000000000..bdc7f707ff720a88c77ca9502d263099de929a15 GIT binary patch literal 13269 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 V2@3YJEArcq^X)G1=h;2r{{Un)=tuwn literal 0 HcmV?d00001 diff --git a/.yarn/cache/@arcanis-sherlock-npm-1.0.38-d4f5e2dbf3-63f998598d.zip b/.yarn/cache/@arcanis-sherlock-npm-1.0.38-d4f5e2dbf3-63f998598d.zip deleted file mode 100644 index 5c9accdd49f6f11da70eae0ef7ebefe63d3d115a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14696 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

^&+9PCf* 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 literal 0 HcmV?d00001 diff --git a/package.json b/package.json index a90221d85fcc..4fd9d670ecca 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-patch/sources/PatchFetcher.ts b/packages/plugin-patch/sources/PatchFetcher.ts index 6c51f4e38af5..23d747a88181 100644 --- a/packages/plugin-patch/sources/PatchFetcher.ts +++ b/packages/plugin-patch/sources/PatchFetcher.ts @@ -1,6 +1,7 @@ -import {Fetcher, FetchOptions, MinimalFetchOptions, ReportError, MessageName} from '@yarnpkg/core'; -import {Locator} from '@yarnpkg/core'; +import {copyPackage} from '@yarnpkg/core/sources/structUtils'; import {miscUtils, structUtils} from '@yarnpkg/core'; +import {Locator} from '@yarnpkg/core'; +import {Fetcher, FetchOptions, MinimalFetchOptions, ReportError, MessageName} from '@yarnpkg/core'; import {ppath, xfs, ZipFS, Filename, CwdFS, PortablePath} from '@yarnpkg/fslib'; import {getLibzipPromise} from '@yarnpkg/libzip'; @@ -51,37 +52,45 @@ export class PatchFetcher implements Fetcher { const libzip = await getLibzipPromise(); - const patchedPackage = new ZipFS(tmpFile, { - libzip, - create: true, - level: opts.project.configuration.get(`compressionLevel`), - }); + const prepareCopy = async () => { + const copy = new ZipFS(tmpFile, { + libzip, + create: true, + level: opts.project.configuration.get(`compressionLevel`), + }); - await patchedPackage.mkdirpPromise(prefixPath); + await copy.mkdirpPromise(prefixPath); - await miscUtils.releaseAfterUseAsync(async () => { - await patchedPackage.copyPromise(prefixPath, sourceFetch.prefixPath, {baseFs: sourceFetch.packageFs, stableSort: true}); - }, sourceFetch.releaseFs); + await miscUtils.releaseAfterUseAsync(async () => { + await copy.copyPromise(prefixPath, sourceFetch.prefixPath, {baseFs: sourceFetch.packageFs, stableSort: true}); + }, sourceFetch.releaseFs); + return copy; + }; + + const patchedPackage = await prepareCopy(); 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 (patchFile === null) + continue; + + 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)` + : ``; + + opts.report.reportWarningOnce(MessageName.PATCH_HUNK_FAILED, `${structUtils.prettyLocator(opts.project.configuration, locator)}: ${err.message}${suggestion}`, { + reportExtra: report => { if (!enableInlineHunks) return; @@ -89,8 +98,13 @@ export class PatchFetcher implements Fetcher { configuration: opts.project.configuration, report, }); - }); - } + }, + }); + + patchedPackage.discardAndClose(); + + // If the patch cannot be cleanly applied, we fallback to the original sources + return await prepareCopy(); } } 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 0ad17ac37929..f7fa2d578a71 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,6 +5,13 @@ __metadata: version: 4 cacheKey: 7 +"@actions/core@npm:^1.2.6": + version: 1.2.6 + resolution: "@actions/core@npm:1.2.6" + checksum: 984c7d5ae95c02f62f69549a9d5cfbc0db0b035f519775301b397c167791ceee269fb504cb622da541d1fa305ee4ad3fc30d017c6407045aa4eb6809eee4c549 + 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: 63f998598df4a22be0930a26cdd35e02047efe4d90076eea83392795772af208083fe485807da078eaaf544d03f2c3bec5f26b834e335c3f0baf9846ba424764 + checksum: b54f9a893b6f4a230ec25576e288868d8c145040c457656dadd8525d903babd9c5b1ebc83add7dbaa28de5153272205846d13b2ade63930718da2fe9ee854978 languageName: node linkType: hard @@ -5727,7 +5735,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 From 72b18e888389465f573cbede8a318f2241538f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Mon, 1 Mar 2021 15:16:03 +0100 Subject: [PATCH 2/5] Adds support for optional patches --- .pnp.cjs | 192 +++++++++--------- ...-monorepo-patch-3af4fe7cee-b8d5cc2e8a.zip} | Bin ... fsevents-patch-166e093fda-8e4b5f5276.zip} | Bin ... fsevents-patch-fef26eaad3-e2b8c37934.zip} | Bin ...> resolve-patch-3fc886ec33-1e933a9825.zip} | Bin ...> resolve-patch-8f9f00d98d-4bcfb56886.zip} | Bin ...> resolve-patch-e402faf642-3a0acfc6cc.zip} | Bin ...ypescript-patch-221ef62ccd-251df026e8.zip} | Bin ...ypescript-patch-bc0257cdd6-cc7bbd5b74.zip} | Bin ...ypescript-patch-def50d8c94-8f8f9508d0.zip} | Bin ...-prebuilt-patch-ca225257fc-5aebe6c637.zip} | Bin packages/plugin-compat/sources/index.ts | 2 +- packages/plugin-patch/sources/PatchFetcher.ts | 101 +++++---- .../plugin-patch/sources/PatchResolver.ts | 2 +- packages/plugin-patch/sources/patchUtils.ts | 66 +++--- yarn.lock | 36 ++-- 16 files changed, 216 insertions(+), 183 deletions(-) rename .yarn/cache/{@strictsoftware-typedoc-plugin-monorepo-patch-9155b53ad6-b8d5cc2e8a.zip => @strictsoftware-typedoc-plugin-monorepo-patch-3af4fe7cee-b8d5cc2e8a.zip} (100%) rename .yarn/cache/{fsevents-patch-b051797a41-8e4b5f5276.zip => fsevents-patch-166e093fda-8e4b5f5276.zip} (100%) rename .yarn/cache/{fsevents-patch-5794df231e-e2b8c37934.zip => fsevents-patch-fef26eaad3-e2b8c37934.zip} (100%) rename .yarn/cache/{resolve-patch-23a3403570-1e933a9825.zip => resolve-patch-3fc886ec33-1e933a9825.zip} (100%) rename .yarn/cache/{resolve-patch-38ce149af0-4bcfb56886.zip => resolve-patch-8f9f00d98d-4bcfb56886.zip} (100%) rename .yarn/cache/{resolve-patch-493d9f7c02-3a0acfc6cc.zip => resolve-patch-e402faf642-3a0acfc6cc.zip} (100%) rename .yarn/cache/{typescript-patch-c001a83e51-251df026e8.zip => typescript-patch-221ef62ccd-251df026e8.zip} (100%) rename .yarn/cache/{typescript-patch-91b1ac9b3b-cc7bbd5b74.zip => typescript-patch-bc0257cdd6-cc7bbd5b74.zip} (100%) rename .yarn/cache/{typescript-patch-3fdb043cfb-8f8f9508d0.zip => typescript-patch-def50d8c94-8f8f9508d0.zip} (100%) rename .yarn/cache/{yoga-layout-prebuilt-patch-9ccf399fa4-5aebe6c637.zip => yoga-layout-prebuilt-patch-ca225257fc-5aebe6c637.zip} (100%) diff --git a/.pnp.cjs b/.pnp.cjs index 4d1689e6ec0d..a2a3135a40d9 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -278,7 +278,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", }] @@ -549,7 +549,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"] ], @@ -572,7 +572,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"] ], @@ -3478,7 +3478,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": [ @@ -3495,7 +3495,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": [ @@ -7985,17 +7985,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-b8d5cc2e8a.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-b8d5cc2e8a.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-b8d5cc2e8a.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-b8d5cc2e8a.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"], @@ -9432,7 +9432,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", @@ -9456,7 +9456,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", @@ -9588,7 +9588,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", @@ -9608,7 +9608,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", @@ -9687,7 +9687,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", @@ -9746,7 +9746,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" @@ -10125,7 +10125,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"] @@ -10162,7 +10162,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"] @@ -10209,7 +10209,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", @@ -10254,7 +10254,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", }] @@ -10326,7 +10326,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", }] @@ -10379,7 +10379,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", @@ -10431,7 +10431,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"], @@ -10505,7 +10505,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"], @@ -10611,7 +10611,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", }] @@ -10643,7 +10643,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": [ @@ -10667,7 +10667,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": [ @@ -10689,7 +10689,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"] ], "linkType": "SOFT", @@ -10710,7 +10710,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", }] @@ -10874,7 +10874,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", }] @@ -11079,7 +11079,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", }] @@ -11578,7 +11578,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", @@ -11600,7 +11600,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", @@ -11620,7 +11620,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", }] @@ -11640,7 +11640,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", }] @@ -11664,7 +11664,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", }] @@ -11684,7 +11684,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", }] @@ -11701,7 +11701,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"] ], @@ -11728,7 +11728,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", @@ -11754,7 +11754,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", }] @@ -12991,7 +12991,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", @@ -13219,7 +13219,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", }] @@ -14749,7 +14749,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"], @@ -14767,7 +14767,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"], @@ -17903,7 +17903,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", }] @@ -18032,7 +18032,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": [ @@ -18095,7 +18095,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"] ], @@ -19384,7 +19384,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"] ], @@ -19650,19 +19650,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", @@ -20044,7 +20044,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"] ], @@ -23281,7 +23281,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", @@ -23312,7 +23312,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", @@ -23343,7 +23343,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", @@ -24923,7 +24923,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"], @@ -25102,7 +25102,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", @@ -27090,7 +27090,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", @@ -27884,7 +27884,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"] ], @@ -30642,7 +30642,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", }] @@ -31966,7 +31966,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/rechoir-npm-0.6.2-0df5f171ec-6646a6bce7.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", }], @@ -31974,7 +31974,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/rechoir-npm-0.7.0-9bea79bab8-1d4cc8db1d.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", }] @@ -32722,26 +32722,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-3a0acfc6cc.zip/node_modules/resolve/", + ["patch:resolve@npm%3A1.14.1#~builtin::version=1.14.1&hash=00b1ff", { + "packageLocation": "./.yarn/cache/resolve-patch-e402faf642-3a0acfc6cc.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-4bcfb56886.zip/node_modules/resolve/", + ["patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=00b1ff", { + "packageLocation": "./.yarn/cache/resolve-patch-8f9f00d98d-4bcfb56886.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-1e933a9825.zip/node_modules/resolve/", + ["patch:resolve@npm%3A1.9.0#~builtin::version=1.9.0&hash=00b1ff", { + "packageLocation": "./.yarn/cache/resolve-patch-3fc886ec33-1e933a9825.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", @@ -35872,7 +35872,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", @@ -35960,7 +35960,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", @@ -35974,7 +35974,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", @@ -36184,7 +36184,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/$$virtual/typedoc-virtual-bfc0864653/0/cache/typedoc-npm-0.17.0-3-0ce05847cf-bc3155f665.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"], @@ -36198,7 +36198,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", @@ -36227,7 +36227,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", @@ -36255,7 +36255,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", @@ -36305,30 +36305,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-cc7bbd5b74.zip/node_modules/typescript/", + ["patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=fadafe", { + "packageLocation": "./.yarn/cache/typescript-patch-bc0257cdd6-cc7bbd5b74.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-251df026e8.zip/node_modules/typescript/", + ["patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=fadafe", { + "packageLocation": "./.yarn/cache/typescript-patch-221ef62ccd-251df026e8.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-8f8f9508d0.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-8f8f9508d0.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", }] @@ -37473,7 +37473,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/pnpify", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#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.76.1"], ["webpack", "virtual:4bb0e72ae00ec402a28e80560124ee13357b1a5221665b7175877ddc6b8b2b98eebe4584a111245801ecf7cecb9de577d076505c0dbcf9292aaff35440a2302f#npm:5.1.1"], ["webpack-cli", "virtual:4bb0e72ae00ec402a28e80560124ee13357b1a5221665b7175877ddc6b8b2b98eebe4584a111245801ecf7cecb9de577d076505c0dbcf9292aaff35440a2302f#npm:4.0.0-beta.8"] @@ -38946,10 +38946,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-5aebe6c637.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-5aebe6c637.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/@strictsoftware-typedoc-plugin-monorepo-patch-9155b53ad6-b8d5cc2e8a.zip b/.yarn/cache/@strictsoftware-typedoc-plugin-monorepo-patch-3af4fe7cee-b8d5cc2e8a.zip similarity index 100% rename from .yarn/cache/@strictsoftware-typedoc-plugin-monorepo-patch-9155b53ad6-b8d5cc2e8a.zip rename to .yarn/cache/@strictsoftware-typedoc-plugin-monorepo-patch-3af4fe7cee-b8d5cc2e8a.zip diff --git a/.yarn/cache/fsevents-patch-b051797a41-8e4b5f5276.zip b/.yarn/cache/fsevents-patch-166e093fda-8e4b5f5276.zip similarity index 100% rename from .yarn/cache/fsevents-patch-b051797a41-8e4b5f5276.zip rename to .yarn/cache/fsevents-patch-166e093fda-8e4b5f5276.zip diff --git a/.yarn/cache/fsevents-patch-5794df231e-e2b8c37934.zip b/.yarn/cache/fsevents-patch-fef26eaad3-e2b8c37934.zip similarity index 100% rename from .yarn/cache/fsevents-patch-5794df231e-e2b8c37934.zip rename to .yarn/cache/fsevents-patch-fef26eaad3-e2b8c37934.zip diff --git a/.yarn/cache/resolve-patch-23a3403570-1e933a9825.zip b/.yarn/cache/resolve-patch-3fc886ec33-1e933a9825.zip similarity index 100% rename from .yarn/cache/resolve-patch-23a3403570-1e933a9825.zip rename to .yarn/cache/resolve-patch-3fc886ec33-1e933a9825.zip diff --git a/.yarn/cache/resolve-patch-38ce149af0-4bcfb56886.zip b/.yarn/cache/resolve-patch-8f9f00d98d-4bcfb56886.zip similarity index 100% rename from .yarn/cache/resolve-patch-38ce149af0-4bcfb56886.zip rename to .yarn/cache/resolve-patch-8f9f00d98d-4bcfb56886.zip diff --git a/.yarn/cache/resolve-patch-493d9f7c02-3a0acfc6cc.zip b/.yarn/cache/resolve-patch-e402faf642-3a0acfc6cc.zip similarity index 100% rename from .yarn/cache/resolve-patch-493d9f7c02-3a0acfc6cc.zip rename to .yarn/cache/resolve-patch-e402faf642-3a0acfc6cc.zip diff --git a/.yarn/cache/typescript-patch-c001a83e51-251df026e8.zip b/.yarn/cache/typescript-patch-221ef62ccd-251df026e8.zip similarity index 100% rename from .yarn/cache/typescript-patch-c001a83e51-251df026e8.zip rename to .yarn/cache/typescript-patch-221ef62ccd-251df026e8.zip diff --git a/.yarn/cache/typescript-patch-91b1ac9b3b-cc7bbd5b74.zip b/.yarn/cache/typescript-patch-bc0257cdd6-cc7bbd5b74.zip similarity index 100% rename from .yarn/cache/typescript-patch-91b1ac9b3b-cc7bbd5b74.zip rename to .yarn/cache/typescript-patch-bc0257cdd6-cc7bbd5b74.zip diff --git a/.yarn/cache/typescript-patch-3fdb043cfb-8f8f9508d0.zip b/.yarn/cache/typescript-patch-def50d8c94-8f8f9508d0.zip similarity index 100% rename from .yarn/cache/typescript-patch-3fdb043cfb-8f8f9508d0.zip rename to .yarn/cache/typescript-patch-def50d8c94-8f8f9508d0.zip diff --git a/.yarn/cache/yoga-layout-prebuilt-patch-9ccf399fa4-5aebe6c637.zip b/.yarn/cache/yoga-layout-prebuilt-patch-ca225257fc-5aebe6c637.zip similarity index 100% rename from .yarn/cache/yoga-layout-prebuilt-patch-9ccf399fa4-5aebe6c637.zip rename to .yarn/cache/yoga-layout-prebuilt-patch-ca225257fc-5aebe6c637.zip 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 23d747a88181..a8b10f221702 100644 --- a/packages/plugin-patch/sources/PatchFetcher.ts +++ b/packages/plugin-patch/sources/PatchFetcher.ts @@ -1,13 +1,12 @@ -import {copyPackage} from '@yarnpkg/core/sources/structUtils'; -import {miscUtils, structUtils} from '@yarnpkg/core'; -import {Locator} from '@yarnpkg/core'; -import {Fetcher, FetchOptions, MinimalFetchOptions, ReportError, MessageName} 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) { @@ -45,38 +44,47 @@ 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 prepareCopy = async () => { - const copy = new ZipFS(tmpFile, { - libzip, - create: true, - level: opts.project.configuration.get(`compressionLevel`), - }); - - await copy.mkdirpPromise(prefixPath); + // 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 miscUtils.releaseAfterUseAsync(async () => { - await copy.copyPromise(prefixPath, sourceFetch.prefixPath, {baseFs: sourceFetch.packageFs, stableSort: true}); - }, sourceFetch.releaseFs); + await initialCopy.mkdirpPromise(prefixPath); - return copy; - }; + await miscUtils.releaseAfterUseAsync(async () => { + await initialCopy.copyPromise(prefixPath, sourceFetch.prefixPath, {baseFs: sourceFetch.packageFs, stableSort: true}); + }, sourceFetch.releaseFs); - const patchedPackage = await prepareCopy(); - const patchFs = new CwdFS(ppath.resolve(PortablePath.root, prefixPath), {baseFs: patchedPackage}); + initialCopy.saveAndClose(); - for (const patchFile of patchFiles) { - if (patchFile === null) + 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(patchFile), { + await patchUtils.applyPatchFile(patchUtils.parsePatchFile(source), { baseFs: patchFs, version: sourceVersion, }); @@ -85,29 +93,38 @@ export class PatchFetcher implements Fetcher { throw err; const enableInlineHunks = opts.project.configuration.get(`enableInlineHunks`); - const suggestion = !enableInlineHunks + const suggestion = !enableInlineHunks && !optional ? ` (set enableInlineHunks for details)` : ``; - opts.report.reportWarningOnce(MessageName.PATCH_HUNK_FAILED, `${structUtils.prettyLocator(opts.project.configuration, locator)}: ${err.message}${suggestion}`, { - reportExtra: report => { - if (!enableInlineHunks) - return; + 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, - }); - }, - }); + 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 the patch cannot be cleanly applied, we fallback to the original sources - return await prepareCopy(); + 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/yarn.lock b/yarn.lock index f7fa2d578a71..405393ae2f5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3838,7 +3838,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 @@ -12885,9 +12885,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 @@ -12895,9 +12895,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: e2b8c379340e21a786d32c653854c8876f94eb1202dd5be378fd42c062bc123aab5051c32bf0011865257c85982c41ded203f9fe8c9f9c8f8c84dc4672abc0e0 @@ -23522,27 +23522,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: 1e933a982563a6e032c81b1cd211b299f1474e7e41c4c1d7a745d5cb70e46a668e7413f3ee90b6f9a6a9242e3026e8f975f82eb52d562db8ce49959e6f71c376 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: 3a0acfc6ccd4e0a401b0cf540bcdb5c9d9a30bf71343ee83b9a1aac66b14e05ff07ebcdf37924be24bcb7642d557b730371cbf6de774696cb92b5e8476518a66 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: 4bcfb568860d0c361fd16c26b6fce429711138ff0de7dd353bdd73fcb5c7eede2f4602d40ccfa08ff45ec7ef9830845eab2021a46036af0a6e5b58bab1ff6399 @@ -26586,9 +26586,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 @@ -26596,9 +26596,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 @@ -26606,9 +26606,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 @@ -28776,7 +28776,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: 5aebe6c637ab4f63e08a87f11820d487dfed1850f658607891e04bac50f756c8b7fb2ec8606fd561dc96f63123ce99f5a97bd229c61a35910c0541f48b936216 From 505e48e60beb79a17069b7d96c84192b26c143d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Mon, 1 Mar 2021 15:16:55 +0100 Subject: [PATCH 3/5] Versions --- .yarn/versions/36d85c5f.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .yarn/versions/36d85c5f.yml 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" From 11e97a7131f36eeaa4a6336935d58df3dda9e276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Wed, 24 Mar 2021 17:24:45 +0100 Subject: [PATCH 4/5] Fixes cache --- .pnp.cjs | 2 +- ...-core-npm-1.2.6-f205abe96a-f07d105cd5.zip} | Bin 13269 -> 13269 bytes yarn.lock | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename .yarn/cache/{@actions-core-npm-1.2.6-f205abe96a-984c7d5ae9.zip => @actions-core-npm-1.2.6-f205abe96a-f07d105cd5.zip} (81%) diff --git a/.pnp.cjs b/.pnp.cjs index acf6e47fd1a3..38a2752906ca 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -286,7 +286,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ]], ["@actions/core", [ ["npm:1.2.6", { - "packageLocation": "./.yarn/cache/@actions-core-npm-1.2.6-f205abe96a-984c7d5ae9.zip/node_modules/@actions/core/", + "packageLocation": "./.yarn/cache/@actions-core-npm-1.2.6-f205abe96a-f07d105cd5.zip/node_modules/@actions/core/", "packageDependencies": [ ["@actions/core", "npm:1.2.6"] ], diff --git a/.yarn/cache/@actions-core-npm-1.2.6-f205abe96a-984c7d5ae9.zip b/.yarn/cache/@actions-core-npm-1.2.6-f205abe96a-f07d105cd5.zip similarity index 81% rename from .yarn/cache/@actions-core-npm-1.2.6-f205abe96a-984c7d5ae9.zip rename to .yarn/cache/@actions-core-npm-1.2.6-f205abe96a-f07d105cd5.zip index bdc7f707ff720a88c77ca9502d263099de929a15..723709f72ad93d28884f831a9ed6d08130b7b300 100644 GIT binary patch delta 396 zcmcbbel?vhz?+#xgaHH`)?MS6$fwQ%rY#L1bgn6cUS`P$67RguCgjA-z>v>5`GSt> zW+BEfX0ZI`9F{Up21%nxr^aCIQA^H&z#s>XB2!quC%7`)uhlp%7 r2!Swo4PzjTT*FWZi}U0>$yT0F?ya5#!9_lFk_N_07M`}KLWzopdScfuo^%aQ3l}918$_vP(n& diff --git a/yarn.lock b/yarn.lock index 6dae5ef659c8..ed40ae471e8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8,7 +8,7 @@ __metadata: "@actions/core@npm:^1.2.6": version: 1.2.6 resolution: "@actions/core@npm:1.2.6" - checksum: 984c7d5ae95c02f62f69549a9d5cfbc0db0b035f519775301b397c167791ceee269fb504cb622da541d1fa305ee4ad3fc30d017c6407045aa4eb6809eee4c549 + checksum: f07d105cd5b1d309da8b5c55aad8c92a03915451455f267ac5b03220214d7f7e457b3ac6b874f592e856214491295ae8c106789b2fd5757bfcaf64fe7e0d0546 languageName: node linkType: hard From 8c770cbd440b5b930e2ddb9b585631353e920a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Wed, 24 Mar 2021 17:25:02 +0100 Subject: [PATCH 5/5] Removes comments --- .yarnrc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index a1c01420da7d..4efbf59a3aab 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,5 +1,5 @@ -#changesetIgnorePatterns: -# - "**/*.test.{js,ts}" +changesetIgnorePatterns: + - "**/*.test.{js,ts}" enableGlobalCache: false