From d0eb1f374d6dd0569ee3d87a63d3a0db1b0e700c Mon Sep 17 00:00:00 2001 From: merceyz Date: Thu, 8 Oct 2020 01:31:42 +0200 Subject: [PATCH 1/6] chore(compat): lock some extensions --- packages/plugin-compat/sources/extensions.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/plugin-compat/sources/extensions.ts b/packages/plugin-compat/sources/extensions.ts index ca02539c5dc2..ed1134bc9575 100644 --- a/packages/plugin-compat/sources/extensions.ts +++ b/packages/plugin-compat/sources/extensions.ts @@ -10,7 +10,7 @@ const optionalPeerDep = { export const packageExtensions: Array<[string, PackageExtensionData]> = [ // https://github.com/SamVerschueren/stream-to-observable/pull/5 - [`@samverschueren/stream-to-observable@*`, { + [`@samverschueren/stream-to-observable@<0.3.1`, { peerDependenciesMeta: { [`rxjs`]: optionalPeerDep, [`zenObservable`]: optionalPeerDep, @@ -30,7 +30,7 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ }, }], // https://github.com/visionmedia/debug/pull/727 - [`debug@*`, { + [`debug@<4.2.0`, { peerDependenciesMeta: { [`supports-color`]: optionalPeerDep, }, @@ -78,7 +78,7 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ }, }], // https://github.com/vadimdemedes/ink-select-input/pull/26 - [`ink-select-input@*`, { + [`ink-select-input@<4.1.0`, { peerDependencies: { react: `^16.8.2`, }, From 84cf5e2860dc02b8a11eeb19f178297aaa9a08b3 Mon Sep 17 00:00:00 2001 From: merceyz Date: Thu, 8 Oct 2020 01:37:31 +0200 Subject: [PATCH 2/6] chore(compat): add extensions to react-instantsearch-core --- .yarnrc.yml | 4 ---- packages/plugin-compat/sources/extensions.ts | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index 0e8d3792b07e..6840d7aa7548 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -45,10 +45,6 @@ packageExtensions: monaco-editor-webpack-plugin@*: dependencies: webpack: ^4.5.0 - react-instantsearch-core@*: - peerDependenciesMeta: - algoliasearch: - optional: true react-instantsearch-dom@*: dependencies: react-fast-compare: "*" diff --git a/packages/plugin-compat/sources/extensions.ts b/packages/plugin-compat/sources/extensions.ts index ed1134bc9575..e1c046df0920 100644 --- a/packages/plugin-compat/sources/extensions.ts +++ b/packages/plugin-compat/sources/extensions.ts @@ -170,4 +170,10 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ graphql: `14 - 15`, }, }], + // https://github.com/algolia/react-instantsearch/pull/2975 + [`react-instantsearch-core@<=6.7.0`, { + peerDependencies: { + algoliasearch: `>= 3.1 < 5`, + }, + }], ]; From 8d5f547dfe0659f26e76738c677caf57d8b9cb16 Mon Sep 17 00:00:00 2001 From: merceyz Date: Thu, 8 Oct 2020 01:38:00 +0200 Subject: [PATCH 3/6] chore(compat): add extensions to react-instantsearch-dom --- .yarnrc.yml | 3 --- packages/plugin-compat/sources/extensions.ts | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index 6840d7aa7548..515bd27e78be 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -45,9 +45,6 @@ packageExtensions: monaco-editor-webpack-plugin@*: dependencies: webpack: ^4.5.0 - react-instantsearch-dom@*: - dependencies: - react-fast-compare: "*" typedoc@*: peerDependenciesMeta: "@strictsoftware/typedoc-plugin-monorepo": diff --git a/packages/plugin-compat/sources/extensions.ts b/packages/plugin-compat/sources/extensions.ts index e1c046df0920..6d0e4b088e77 100644 --- a/packages/plugin-compat/sources/extensions.ts +++ b/packages/plugin-compat/sources/extensions.ts @@ -176,4 +176,10 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ algoliasearch: `>= 3.1 < 5`, }, }], + // https://github.com/algolia/react-instantsearch/pull/2975 + [`react-instantsearch-dom@<=6.7.0`, { + dependencies: { + 'react-fast-compare': `^3.0.0`, + }, + }], ]; From e3978864929e123ad6bcc4f20437decd5dc77c7c Mon Sep 17 00:00:00 2001 From: merceyz Date: Mon, 23 Nov 2020 20:50:52 +0100 Subject: [PATCH 4/6] chore(compat): add extensions for ws --- .pnp.js | 70 ++++++++++++++------ packages/plugin-compat/sources/extensions.ts | 11 +++ yarn.lock | 14 ++-- 3 files changed, 69 insertions(+), 26 deletions(-) diff --git a/.pnp.js b/.pnp.js index 7edc02985713..97f5b7852756 100755 --- a/.pnp.js +++ b/.pnp.js @@ -15871,7 +15871,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["indexof", "npm:0.0.1"], ["parseqs", "npm:0.0.5"], ["parseuri", "npm:0.0.5"], - ["ws", "npm:6.1.4"], + ["ws", "virtual:3b5e69efaa2372701eeacd25836edffb24542c8451116315f985d26186b219fb4485f91e0a94a6978db5d292a078b1c57ceaae51a63ec1c16cb40561723db94c#npm:6.1.4"], ["xmlhttprequest-ssl", "npm:1.5.5"], ["yeast", "npm:0.1.2"] ], @@ -29102,6 +29102,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [ ["react-instantsearch-core", "virtual:eb5765c1be3f2b7a1a9c858067ab3666195e36c47c9b2fe716c62e4e446ec47422535a87f981ea7ae853716c3b5381687dfc4c840db6479d23905b3fdbd079bf#npm:6.6.0"], ["@babel/runtime", "npm:7.9.2"], + ["@types/algoliasearch", null], ["@types/react", "npm:16.9.2"], ["algoliasearch", null], ["algoliasearch-helper", "virtual:eb5765c1be3f2b7a1a9c858067ab3666195e36c47c9b2fe716c62e4e446ec47422535a87f981ea7ae853716c3b5381687dfc4c840db6479d23905b3fdbd079bf#npm:3.1.1"], @@ -29110,6 +29111,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["react-fast-compare", "npm:3.2.0"] ], "packagePeers": [ + "@types/algoliasearch", "@types/react", "algoliasearch", "react" @@ -32510,7 +32512,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["graphql", "npm:14.6.0"], ["iterall", "npm:1.3.0"], ["symbol-observable", "npm:1.2.0"], - ["ws", "npm:5.2.2"] + ["ws", "virtual:e464fcb33c75f7effd14d8ce91448bbbb5e16109d03794b02822b5c9b86352828ff3537ed9e4c4d0328f172629cd9d08d1bb12520c96e3f8c2ae4056cccfdb98#npm:5.2.2"] ], "packagePeers": [ "@types/graphql", @@ -32528,7 +32530,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["graphql", null], ["iterall", "npm:1.3.0"], ["symbol-observable", "npm:1.2.0"], - ["ws", "npm:5.2.2"] + ["ws", "virtual:e464fcb33c75f7effd14d8ce91448bbbb5e16109d03794b02822b5c9b86352828ff3537ed9e4c4d0328f172629cd9d08d1bb12520c96e3f8c2ae4056cccfdb98#npm:5.2.2"] ], "packagePeers": [ "@types/graphql", @@ -35405,7 +35407,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["webpack-cli", null], ["webpack-dev-middleware", "virtual:ed266f3f91846e29655aeac7183fc26f8d6448132d8946974d5a85cdc46821c27477c717701330a230e4751fd77548492ce17b4308c660bdf9b589cc31fc5b76#npm:3.7.2"], ["webpack-log", "npm:2.0.0"], - ["ws", "npm:6.2.1"], + ["ws", "virtual:464c40fef8cd9c4629dc57bdcbc0da6c064017043c87638761c4241ddfc4b2dd80534769ea6cc0e28caf4148d848798661a9641cbf76a47278b9010b2fe0ee9c#npm:6.2.1"], ["yargs", "npm:13.3.2"] ], "packagePeers": [ @@ -35969,27 +35971,39 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["ws", [ - ["npm:5.2.2", { - "packageLocation": "./.yarn/cache/ws-npm-5.2.2-173bcd57b2-c8217b5482.zip/node_modules/ws/", + ["virtual:3b5e69efaa2372701eeacd25836edffb24542c8451116315f985d26186b219fb4485f91e0a94a6978db5d292a078b1c57ceaae51a63ec1c16cb40561723db94c#npm:6.1.4", { + "packageLocation": "./.yarn/$$virtual/ws-virtual-f68ec3df6c/0/cache/ws-npm-6.1.4-7bee7fd05f-74c2245736.zip/node_modules/ws/", "packageDependencies": [ - ["ws", "npm:5.2.2"], - ["async-limiter", "npm:1.0.0"] + ["ws", "virtual:3b5e69efaa2372701eeacd25836edffb24542c8451116315f985d26186b219fb4485f91e0a94a6978db5d292a078b1c57ceaae51a63ec1c16cb40561723db94c#npm:6.1.4"], + ["@types/bufferutil", null], + ["@types/utf-8-validate", null], + ["async-limiter", "npm:1.0.0"], + ["bufferutil", null], + ["utf-8-validate", null] ], - "linkType": "HARD", - }], - ["npm:6.1.4", { - "packageLocation": "./.yarn/cache/ws-npm-6.1.4-7bee7fd05f-74c2245736.zip/node_modules/ws/", - "packageDependencies": [ - ["ws", "npm:6.1.4"], - ["async-limiter", "npm:1.0.0"] + "packagePeers": [ + "@types/bufferutil", + "@types/utf-8-validate", + "bufferutil", + "utf-8-validate" ], "linkType": "HARD", }], - ["npm:6.2.1", { - "packageLocation": "./.yarn/cache/ws-npm-6.2.1-bbe0ef9859-35d32b09e2.zip/node_modules/ws/", + ["virtual:464c40fef8cd9c4629dc57bdcbc0da6c064017043c87638761c4241ddfc4b2dd80534769ea6cc0e28caf4148d848798661a9641cbf76a47278b9010b2fe0ee9c#npm:6.2.1", { + "packageLocation": "./.yarn/$$virtual/ws-virtual-ffb2c9c635/0/cache/ws-npm-6.2.1-bbe0ef9859-35d32b09e2.zip/node_modules/ws/", "packageDependencies": [ - ["ws", "npm:6.2.1"], - ["async-limiter", "npm:1.0.0"] + ["ws", "virtual:464c40fef8cd9c4629dc57bdcbc0da6c064017043c87638761c4241ddfc4b2dd80534769ea6cc0e28caf4148d848798661a9641cbf76a47278b9010b2fe0ee9c#npm:6.2.1"], + ["@types/bufferutil", null], + ["@types/utf-8-validate", null], + ["async-limiter", "npm:1.0.0"], + ["bufferutil", null], + ["utf-8-validate", null] + ], + "packagePeers": [ + "@types/bufferutil", + "@types/utf-8-validate", + "bufferutil", + "utf-8-validate" ], "linkType": "HARD", }], @@ -36010,6 +36024,24 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ], "linkType": "HARD", }], + ["virtual:e464fcb33c75f7effd14d8ce91448bbbb5e16109d03794b02822b5c9b86352828ff3537ed9e4c4d0328f172629cd9d08d1bb12520c96e3f8c2ae4056cccfdb98#npm:5.2.2", { + "packageLocation": "./.yarn/$$virtual/ws-virtual-2a492a59ea/0/cache/ws-npm-5.2.2-173bcd57b2-c8217b5482.zip/node_modules/ws/", + "packageDependencies": [ + ["ws", "virtual:e464fcb33c75f7effd14d8ce91448bbbb5e16109d03794b02822b5c9b86352828ff3537ed9e4c4d0328f172629cd9d08d1bb12520c96e3f8c2ae4056cccfdb98#npm:5.2.2"], + ["@types/bufferutil", null], + ["@types/utf-8-validate", null], + ["async-limiter", "npm:1.0.0"], + ["bufferutil", null], + ["utf-8-validate", null] + ], + "packagePeers": [ + "@types/bufferutil", + "@types/utf-8-validate", + "bufferutil", + "utf-8-validate" + ], + "linkType": "HARD", + }], ["virtual:f46a660ce56337704b8772d09cd60654ec92e2e957e05a42a9b27979d2c9640a00c95c2bf30eb99c28f0be0acc0f9feb80809091a2e2a18c81d32477fc05adba#npm:7.3.0", { "packageLocation": "./.yarn/$$virtual/ws-virtual-52b3bfae27/0/cache/ws-npm-7.3.0-2881a35eae-c1f386013b.zip/node_modules/ws/", "packageDependencies": [ diff --git a/packages/plugin-compat/sources/extensions.ts b/packages/plugin-compat/sources/extensions.ts index 6d0e4b088e77..2984c56afdd2 100644 --- a/packages/plugin-compat/sources/extensions.ts +++ b/packages/plugin-compat/sources/extensions.ts @@ -182,4 +182,15 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ 'react-fast-compare': `^3.0.0`, }, }], + // https://github.com/websockets/ws/pull/1626 + [`ws@<7.2.1`, { + peerDependencies: { + bufferutil: `^4.0.1`, + 'utf-8-validate': `^5.0.2`, + }, + peerDependenciesMeta: { + bufferutil: optionalPeerDep, + 'utf-8-validate': optionalPeerDep, + }, + }], ]; diff --git a/yarn.lock b/yarn.lock index 8df11064eb5d..23c19d25ddfc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22158,13 +22158,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"react-fast-compare@npm:*, react-fast-compare@npm:^3.0.0, react-fast-compare@npm:^3.1.1": - version: 3.2.0 - resolution: "react-fast-compare@npm:3.2.0" - checksum: 6fe65c889eb4f326e97769135f97b3d63ac68737866f9c37f9625c9de4f5eaa9abed6f748eb3fd6a66808392118842916309cab7cfa99c67991f0c837433d6d2 - languageName: node - linkType: hard - "react-fast-compare@npm:^2.0.1": version: 2.0.4 resolution: "react-fast-compare@npm:2.0.4" @@ -22172,6 +22165,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"react-fast-compare@npm:^3.0.0, react-fast-compare@npm:^3.1.1": + version: 3.2.0 + resolution: "react-fast-compare@npm:3.2.0" + checksum: 6fe65c889eb4f326e97769135f97b3d63ac68737866f9c37f9625c9de4f5eaa9abed6f748eb3fd6a66808392118842916309cab7cfa99c67991f0c837433d6d2 + languageName: node + linkType: hard + "react-focus-lock@npm:^2.3.1": version: 2.3.1 resolution: "react-focus-lock@npm:2.3.1" From d5d6d70ea312ed66b2b39018007530271060dfe4 Mon Sep 17 00:00:00 2001 From: merceyz Date: Mon, 23 Nov 2020 22:23:54 +0100 Subject: [PATCH 5/6] chore(compat) add extensions for react-portal --- packages/plugin-compat/sources/extensions.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/plugin-compat/sources/extensions.ts b/packages/plugin-compat/sources/extensions.ts index 2984c56afdd2..912e588a1b6f 100644 --- a/packages/plugin-compat/sources/extensions.ts +++ b/packages/plugin-compat/sources/extensions.ts @@ -193,4 +193,10 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ 'utf-8-validate': optionalPeerDep, }, }], + // https://github.com/tajo/react-portal/pull/233 + [`react-portal@*`, { + peerDependencies: { + 'react-dom': `^15.0.0-0 || ^16.0.0-0 || ^17.0.0-0`, + }, + }], ]; From 46efc888c76eed166c860f39d50826169cc19cfe Mon Sep 17 00:00:00 2001 From: merceyz Date: Thu, 26 Nov 2020 22:59:51 +0100 Subject: [PATCH 6/6] chore: versions --- .yarn/versions/24923973.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .yarn/versions/24923973.yml diff --git a/.yarn/versions/24923973.yml b/.yarn/versions/24923973.yml new file mode 100644 index 000000000000..871c19814360 --- /dev/null +++ b/.yarn/versions/24923973.yml @@ -0,0 +1,22 @@ +releases: + "@yarnpkg/cli": patch + "@yarnpkg/plugin-compat": patch + +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-patch" + - "@yarnpkg/plugin-pnp" + - "@yarnpkg/plugin-stage" + - "@yarnpkg/plugin-typescript" + - "@yarnpkg/plugin-version" + - "@yarnpkg/plugin-workspace-tools" + - "@yarnpkg/builder" + - "@yarnpkg/core" + - "@yarnpkg/doctor"