diff --git a/.pnp.js b/.pnp.js index 5d51feef2c94..78787828185b 100755 --- a/.pnp.js +++ b/.pnp.js @@ -8867,7 +8867,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["react", "npm:16.13.1"], ["react-dom", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:16.13.1"], ["react-helmet", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:6.1.0"], - ["react-icons", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:3.10.0"], + ["react-icons", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:3.11.0"], ["react-instantsearch-dom", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:6.6.0"], ["react-monaco-editor", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:0.36.0"], ["react-select", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:3.1.0"], @@ -17344,21 +17344,29 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [ ["fork-ts-checker-webpack-plugin", "virtual:bfbe9d431aeea4f38ef0fbf5648a2193599d78433ad7f02d311def1742a6ccbefa9bf478308b848e37d3e342050fd5dd8b15514a9173e3fca5e1ba5c4271c000#npm:5.0.0"], ["@babel/code-frame", "npm:7.10.1"], + ["@types/eslint", null], ["@types/typescript", "npm:2.0.0"], + ["@types/webpack", null], ["chalk", "npm:2.4.2"], ["cosmiconfig", "npm:6.0.0"], ["deepmerge", "npm:4.2.2"], + ["eslint", null], ["fs-extra", "npm:9.0.1"], ["memfs", "npm:3.2.0"], ["minimatch", "npm:3.0.4"], ["schema-utils", "npm:1.0.0"], ["semver", "npm:5.6.0"], ["tapable", "npm:1.1.3"], - ["typescript", "patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=5b02a2"] + ["typescript", "patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=5b02a2"], + ["webpack", "npm:5.0.0-beta.17"] ], "packagePeers": [ + "@types/eslint", "@types/typescript", - "typescript" + "@types/webpack", + "eslint", + "typescript", + "webpack" ], "linkType": "HARD", }], @@ -17367,21 +17375,29 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [ ["fork-ts-checker-webpack-plugin", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.0.0"], ["@babel/code-frame", "npm:7.10.1"], + ["@types/eslint", null], ["@types/typescript", null], + ["@types/webpack", null], ["chalk", "npm:2.4.2"], ["cosmiconfig", "npm:6.0.0"], ["deepmerge", "npm:4.2.2"], + ["eslint", null], ["fs-extra", "npm:9.0.1"], ["memfs", "npm:3.2.0"], ["minimatch", "npm:3.0.4"], ["schema-utils", "npm:1.0.0"], ["semver", "npm:5.6.0"], ["tapable", "npm:1.1.3"], - ["typescript", "patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=5b02a2"] + ["typescript", "patch:typescript@npm%3A3.9.5#builtin::version=3.9.5&hash=5b02a2"], + ["webpack", "npm:5.0.0-beta.17"] ], "packagePeers": [ + "@types/eslint", "@types/typescript", - "typescript" + "@types/webpack", + "eslint", + "typescript", + "webpack" ], "linkType": "HARD", }] @@ -18021,7 +18037,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["react", "npm:16.13.1"], ["react-dom", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:16.13.1"], ["react-helmet", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:6.1.0"], - ["react-icons", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:3.10.0"], + ["react-icons", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:3.11.0"], ["strict-ui", "npm:0.1.3"], ["subscriptions-transport-ws", "virtual:e721af34745e2aded5d4d499d50f62b576dd2080eb1f2bb52977c4bfa58f87cba61c1a822a17998b163819d9d9ffb45f4e1cfaad85154aa3bbe0834010be88eb#npm:0.9.16"], ["theme-ui", "npm:0.4.0-highlight.0"], @@ -18246,7 +18262,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["prop-types", null], ["react", "npm:16.13.1"], ["react-dom", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:16.13.1"], - ["react-icons", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:3.10.0"], + ["react-icons", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:3.11.0"], ["theme-ui", "virtual:acc3efd1ae23f68a76a32cb0a48de2b0b49cb6cfce8c636777e69ac5b766857af1ca48a99632c4c09f16915cb408d53bcc01b4508715d4330dd21d070928755f#npm:0.2.52"], ["yup", "npm:0.29.1"] ], @@ -28606,10 +28622,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["react-icons", [ - ["virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:3.10.0", { - "packageLocation": "./.yarn/$$virtual/react-icons-virtual-aa1520ddb3/0/cache/react-icons-npm-3.10.0-a2589318d4-848c40d1db.zip/node_modules/react-icons/", + ["virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:3.11.0", { + "packageLocation": "./.yarn/$$virtual/react-icons-virtual-85633a4ba4/0/cache/react-icons-npm-3.11.0-e58c838053-b629e024d4.zip/node_modules/react-icons/", "packageDependencies": [ - ["react-icons", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:3.10.0"], + ["react-icons", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:3.11.0"], ["@types/react", null], ["camelcase", "npm:5.3.1"], ["react", "npm:16.13.1"] diff --git a/.yarn/cache/react-icons-npm-3.10.0-a2589318d4-848c40d1db.zip b/.yarn/cache/react-icons-npm-3.10.0-a2589318d4-848c40d1db.zip deleted file mode 100644 index 53084d7c326e..000000000000 Binary files a/.yarn/cache/react-icons-npm-3.10.0-a2589318d4-848c40d1db.zip and /dev/null differ diff --git a/.yarn/cache/react-icons-npm-3.11.0-e58c838053-b629e024d4.zip b/.yarn/cache/react-icons-npm-3.11.0-e58c838053-b629e024d4.zip new file mode 100644 index 000000000000..3937769940a5 Binary files /dev/null and b/.yarn/cache/react-icons-npm-3.11.0-e58c838053-b629e024d4.zip differ diff --git a/.yarn/versions/fdf77815.yml b/.yarn/versions/fdf77815.yml new file mode 100644 index 000000000000..871c19814360 --- /dev/null +++ b/.yarn/versions/fdf77815.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" diff --git a/.yarnrc.yml b/.yarnrc.yml index 42cf33b601f9..dd9f291a4deb 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -11,9 +11,6 @@ initScope: yarnpkg npmPublishAccess: public packageExtensions: - "@babel/parser@*": - dependencies: - "@babel/types": "*" "@emotion/babel-preset-css-prop@*": peerDependencies: "@babel/core": "*" @@ -23,9 +20,6 @@ packageExtensions: "@webpack-cli/package-utils@*": dependencies: cross-spawn: "*" - fork-ts-checker-webpack-plugin@*: - peerDependencies: - typescript: "*" gatsby-cli@*: peerDependencies: eslint: "*" @@ -57,22 +51,12 @@ packageExtensions: gatsby@*: peerDependencies: "@babel/core": "*" - peerDependenciesMeta: - "@types/react": - optional: true json-ref-lite@*: dependencies: sync-request: "*" monaco-editor-webpack-plugin@*: dependencies: webpack: ^4.5.0 - rc-animate@*: - peerDependencies: - react: "*" - react-dom: "*" - react-icons@*: - peerDependencies: - react: "*" react-instantsearch-core@*: peerDependenciesMeta: algoliasearch: diff --git a/packages/plugin-compat/sources/extensions.ts b/packages/plugin-compat/sources/extensions.ts index 42db3539726b..084c5f70732d 100644 --- a/packages/plugin-compat/sources/extensions.ts +++ b/packages/plugin-compat/sources/extensions.ts @@ -87,4 +87,66 @@ export const packageExtensions: Array<[string, any]> = [ [`bluebird`]: optionalPeerDep, }, }], + // https://github.com/casesandberg/reactcss/pull/153 + [`reactcss@*`, { + peerDependencies: { + react: `*`, + }, + }], + // https://github.com/casesandberg/react-color/pull/746 + [`react-color@<=2.19.0`, { + peerDependencies: { + react: `*`, + }, + }], + // https://github.com/angeloocana/gatsby-plugin-i18n/pull/145 + [`gatsby-plugin-i18n@*`, { + dependencies: { + ramda: `^0.24.1`, + }, + }], + // https://github.com/3rd-Eden/useragent/pull/159 + [`useragent@^2.0.0`, { + dependencies: { + request: `^2.88.0`, + yamlparser: `0.0.x`, + semver: `5.5.x`, + }, + }], + // https://github.com/apollographql/apollo-tooling/pull/2049 + [`@apollographql/apollo-tools@*`, { + peerDependencies: { + graphql: `^14.2.1 || ^15.0.0`, + }, + }], + // https://github.com/mbrn/material-table/pull/2374 + [`material-table@^2.0.0`, { + dependencies: { + "@babel/runtime": `^7.11.2`, + }, + }], + // https://github.com/babel/babel/pull/11118 + [`@babel/parser@*`, { + dependencies: { + "@babel/types": `^7.8.3`, + }, + }], + // https://github.com/TypeStrong/fork-ts-checker-webpack-plugin/pull/507 + [`fork-ts-checker-webpack-plugin@*`, { + peerDependencies: { + eslint: `>= 6`, + typescript: `>= 2.7`, + webpack: `>= 4`, + }, + peerDependenciesMeta: { + eslint: optionalPeerDep, + }, + }], + // https://github.com/react-component/animate/pull/89 + [`rc-animate@*`, { + peerDependencies: { + react: `^15.0.0 || ^16.0.0`, + "react-dom": `^15.0.0 || ^16.0.0`, + }, + }], ]; diff --git a/yarn.lock b/yarn.lock index 12dc3840f1d6..37edd9faf7dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1643,7 +1643,7 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:*, @babel/types@npm:7.10.2, @babel/types@npm:^7.0.0, @babel/types@npm:^7.10.1, @babel/types@npm:^7.10.2, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.7.0, @babel/types@npm:^7.9.6": +"@babel/types@npm:7.10.2, @babel/types@npm:^7.0.0, @babel/types@npm:^7.10.1, @babel/types@npm:^7.10.2, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.7.0, @babel/types@npm:^7.8.3, @babel/types@npm:^7.9.6": version: 7.10.2 resolution: "@babel/types@npm:7.10.2" dependencies: @@ -22048,13 +22048,13 @@ fsevents@^1.2.7: linkType: hard "react-icons@npm:^3.10.0": - version: 3.10.0 - resolution: "react-icons@npm:3.10.0" + version: 3.11.0 + resolution: "react-icons@npm:3.11.0" dependencies: camelcase: ^5.0.0 peerDependencies: react: "*" - checksum: 848c40d1db512cd58e97507b21a4aebf81df4623495235613186127ddbb96a338e320176d6ef042bb14f619f019fcb23ae35489a7784078fc82e8a1c3c8112ba + checksum: b629e024d4002b0d951e03256b30d20f9546add9bf30ad0721fba33a4cf8811b730e44f63341d7148eaad9785dfdb02cac2efa3b263dd703e95b8e535af140e9 languageName: node linkType: hard