diff --git a/.pnp.cjs b/.pnp.cjs index 32b3cc6d7216..4df848db922c 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -10054,7 +10054,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@webpack-cli/package-utils", "npm:1.0.1-alpha.4"], ["@webpack-cli/logger", "virtual:7aee127304dc95be1013a5768dcb7a1de9d65fbb71e5cb99aeb6bd050f1c61c7495836b797b34aab4877eda17c41626b72153fb7c7fb2142098b8521bda15f4b#npm:1.0.1-alpha.4"], ["chalk", "npm:3.0.0"], - ["cross-spawn", "npm:7.0.3"], ["enquirer", "npm:2.3.6"], ["execa", "npm:4.0.2"] ], @@ -16444,6 +16443,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ], "linkType": "SOFT", }], + ["npm:4.3.2", { + "packageLocation": "./.yarn/cache/debug-npm-4.3.2-f0148b6afe-5543570879.zip/node_modules/debug/", + "packageDependencies": [ + ["debug", "npm:4.3.2"] + ], + "linkType": "SOFT", + }], ["virtual:143147eb8dbdf7b460518a198f0ef110efa1d9c4edb6fcd3fa752efab8ea7be55bc17f11941eaf524b176ccca5dde77c8fef086126cf6c1b9b4da0734ce3fc62#npm:3.2.6", { "packageLocation": "./.yarn/$$virtual/debug-virtual-3b2bd64e52/0/cache/debug-npm-3.2.6-6214e40f12-619feb53b1.zip/node_modules/debug/", "packageDependencies": [ @@ -16468,6 +16474,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ], "linkType": "HARD", }], + ["virtual:460d9444915add735f87609474ac8cc53761acf2af668a7996b800b8378043218935fedd7557d2817bf8a9793a22d442589b43786dd84c67879d18507262fa4b#npm:4.3.2", { + "packageLocation": "./.yarn/$$virtual/debug-virtual-38dd63acae/0/cache/debug-npm-4.3.2-f0148b6afe-5543570879.zip/node_modules/debug/", + "packageDependencies": [ + ["debug", "virtual:460d9444915add735f87609474ac8cc53761acf2af668a7996b800b8378043218935fedd7557d2817bf8a9793a22d442589b43786dd84c67879d18507262fa4b#npm:4.3.2"], + ["ms", "npm:2.1.2"], + ["supports-color", null] + ], + "packagePeers": [ + "supports-color" + ], + "linkType": "HARD", + }], ["virtual:464c40fef8cd9c4629dc57bdcbc0da6c064017043c87638761c4241ddfc4b2dd80534769ea6cc0e28caf4148d848798661a9641cbf76a47278b9010b2fe0ee9c#npm:4.1.1", { "packageLocation": "./.yarn/$$virtual/debug-virtual-f3623a0aa9/0/cache/debug-npm-4.1.1-540248b3aa-3601a6ce96.zip/node_modules/debug/", "packageDependencies": [ @@ -19344,6 +19362,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@babel/code-frame", "npm:7.10.1"], ["@types/eslint", null], ["@types/typescript", null], + ["@types/vue-template-compiler", null], ["@types/webpack", null], ["chalk", "npm:2.4.2"], ["cosmiconfig", "npm:6.0.0"], @@ -19356,14 +19375,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["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"], + ["vue-template-compiler", null], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.1.1"] ], "packagePeers": [ "@types/eslint", "@types/typescript", + "@types/vue-template-compiler", "@types/webpack", "eslint", "typescript", + "vue-template-compiler", "webpack" ], "linkType": "HARD", @@ -20651,7 +20673,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/gatsby", null], ["async", "npm:2.6.3"], ["bluebird", "npm:3.7.2"], - ["debug", "virtual:2bcc47d217f870e3d52f0e55493dc34fd3da852877f7db32fa2940cc320151746026495daf6a34a974488cf5a949d93be1e2dc1ffba036faf081a9b15fcd2252#npm:2.6.9"], + ["debug", "virtual:460d9444915add735f87609474ac8cc53761acf2af668a7996b800b8378043218935fedd7557d2817bf8a9793a22d442589b43786dd84c67879d18507262fa4b#npm:4.3.2"], ["fs-extra", "npm:8.1.0"], ["gatsby", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:2.23.3"], ["gatsby-core-utils", "npm:1.3.5"], @@ -20984,7 +21006,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/gatsby", null], ["@types/prismjs", null], ["gatsby", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:2.23.3"], - ["lodash", "npm:4.17.15"], ["parse-numeric-range", "npm:0.0.2"], ["prismjs", "npm:1.16.0"], ["unist-util-visit", "npm:1.4.1"] @@ -27380,6 +27401,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["ms", "npm:2.1.1"] ], "linkType": "HARD", + }], + ["npm:2.1.2", { + "packageLocation": "./.yarn/cache/ms-npm-2.1.2-ec0c1512ff-9b65fb709b.zip/node_modules/ms/", + "packageDependencies": [ + ["ms", "npm:2.1.2"] + ], + "linkType": "HARD", }] ]], ["multicast-dns", [ diff --git a/.yarn/cache/debug-npm-4.3.2-f0148b6afe-5543570879.zip b/.yarn/cache/debug-npm-4.3.2-f0148b6afe-5543570879.zip new file mode 100644 index 000000000000..d95aff2b7cd3 Binary files /dev/null and b/.yarn/cache/debug-npm-4.3.2-f0148b6afe-5543570879.zip differ diff --git a/.yarn/cache/ms-npm-2.1.2-ec0c1512ff-9b65fb709b.zip b/.yarn/cache/ms-npm-2.1.2-ec0c1512ff-9b65fb709b.zip new file mode 100644 index 000000000000..c4fe24423969 Binary files /dev/null and b/.yarn/cache/ms-npm-2.1.2-ec0c1512ff-9b65fb709b.zip differ diff --git a/.yarn/versions/8983d5b0.yml b/.yarn/versions/8983d5b0.yml new file mode 100644 index 000000000000..871c19814360 --- /dev/null +++ b/.yarn/versions/8983d5b0.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 1bfa60015d60..614ed8fdb384 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -11,24 +11,12 @@ initScope: yarnpkg npmPublishAccess: public packageExtensions: - "@webpack-cli/package-utils@*": - dependencies: - cross-spawn: "*" gatsby-cli@*: peerDependencies: eslint: "*" gatsby: "*" react: "*" webpack: "*" - gatsby-plugin-favicon@*: - peerDependencies: - webpack: "*" - gatsby-plugin-sharp@*: - dependencies: - debug: "*" - gatsby-react-router-scroll@*: - dependencies: - prop-types: "*" gatsby-recipes@*: peerDependencies: eslint: "*" @@ -36,9 +24,6 @@ packageExtensions: ink: "*" react: "*" webpack: "*" - gatsby-remark-prismjs@*: - dependencies: - lodash: "*" gatsby@*: peerDependencies: "@babel/core": "*" diff --git a/packages/plugin-compat/sources/extensions.ts b/packages/plugin-compat/sources/extensions.ts index 22cd00dd3fa9..5ce976c284b0 100644 --- a/packages/plugin-compat/sources/extensions.ts +++ b/packages/plugin-compat/sources/extensions.ts @@ -139,16 +139,18 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ eslint: `>= 6`, typescript: `>= 2.7`, webpack: `>= 4`, + 'vue-template-compiler': `*`, }, peerDependenciesMeta: { eslint: optionalPeerDep, + 'vue-template-compiler': optionalPeerDep, }, }], - // https://github.com/react-component/animate/pull/89 - [`rc-animate@*`, { + // https://github.com/react-component/animate/pull/116 + [`rc-animate@<=3.1.1`, { peerDependencies: { - react: `^15.0.0 || ^16.0.0`, - "react-dom": `^15.0.0 || ^16.0.0`, + react: `>=16.9.0`, + 'react-dom': `>=16.9.0`, }, }], // https://github.com/react-bootstrap-table/react-bootstrap-table2/pull/1491 @@ -200,7 +202,7 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ }, }], // https://github.com/facebook/create-react-app/pull/9872 - [`create-react-app@*`, { + [`react-scripts@<=4.0.1`, { peerDependencies: { [`react`]: `*`, }, @@ -225,4 +227,55 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ protobufjs: `^6.8.6`, }, }], + // https://github.com/thinhle-agilityio/gatsby-source-apiserver/pull/58 + [`gatsby-source-apiserver@*`, { + dependencies: { + [`babel-polyfill`]: `^6.26.0`, + }, + }], + // https://github.com/webpack/webpack-cli/pull/2097 + [`@webpack-cli/package-utils@<=1.0.1-alpha.2`, { + dependencies: { + [`cross-spawn`]: `^7.0.3`, + }, + }], + // https://github.com/gatsbyjs/gatsby/pull/20156 + [`gatsby-remark-prismjs@<3.3.28`, { + dependencies: { + [`lodash`]: `^4`, + }, + }], + // https://github.com/Creatiwity/gatsby-plugin-favicon/pull/65 + [`gatsby-plugin-favicon@*`, { + peerDependencies: { + [`webpack`]: `*`, + }, + }], + // https://github.com/gatsbyjs/gatsby/pull/28759 + [`gatsby-plugin-sharp@*`, { + dependencies: { + [`debug`]: `^4.3.1`, + }, + }], + // https://github.com/gatsbyjs/gatsby/pull/28759 + [`gatsby-react-router-scroll@*`, { + dependencies: { + [`prop-types`]: `^15.7.2`, + }, + }], + // https://github.com/rebassjs/rebass/pull/934 + [`@rebass/forms@*`, { + dependencies: { + [`@styled-system/should-forward-prop`]: `^5.0.0`, + }, + peerDependencies: { + react: `^16.8.6`, + }, + }], + // https://github.com/rebassjs/rebass/pull/934 + [`rebass@*`, { + peerDependencies: { + react: `^16.8.6`, + }, + }], ]; diff --git a/yarn.lock b/yarn.lock index cb4c9ba6a91f..8f6c68566ee7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9621,17 +9621,6 @@ __metadata: languageName: node linkType: hard -"cross-spawn@npm:*, cross-spawn@npm:7.0.3, cross-spawn@npm:^7.0.0": - version: 7.0.3 - resolution: "cross-spawn@npm:7.0.3" - dependencies: - path-key: ^3.1.0 - shebang-command: ^2.0.0 - which: ^2.0.1 - checksum: 51f10036f5f1de781be98f4738d58b50c6d44f4f471069b8ab075b21605893ba1548654880f7310a29a732d6fc7cd481da6026169b9f0831cab0148a62fb397a - languageName: node - linkType: hard - "cross-spawn@npm:5.1.0, cross-spawn@npm:^5.0.1": version: 5.1.0 resolution: "cross-spawn@npm:5.1.0" @@ -9643,6 +9632,17 @@ __metadata: languageName: node linkType: hard +"cross-spawn@npm:7.0.3, cross-spawn@npm:^7.0.0": + version: 7.0.3 + resolution: "cross-spawn@npm:7.0.3" + dependencies: + path-key: ^3.1.0 + shebang-command: ^2.0.0 + which: ^2.0.1 + checksum: 51f10036f5f1de781be98f4738d58b50c6d44f4f471069b8ab075b21605893ba1548654880f7310a29a732d6fc7cd481da6026169b9f0831cab0148a62fb397a + languageName: node + linkType: hard + "cross-spawn@npm:^6.0.0, cross-spawn@npm:^6.0.5": version: 6.0.5 resolution: "cross-spawn@npm:6.0.5" @@ -10085,7 +10085,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:*, debug@npm:2, debug@npm:2.6.9, debug@npm:^2.1.2, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.0, debug@npm:^2.6.6, debug@npm:^2.6.9": +"debug@npm:2, debug@npm:2.6.9, debug@npm:^2.1.2, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.0, debug@npm:^2.6.6, debug@npm:^2.6.9": version: 2.6.9 resolution: "debug@npm:2.6.9" dependencies: @@ -10121,6 +10121,18 @@ __metadata: languageName: node linkType: hard +"debug@npm:^4.3.1": + version: 4.3.2 + resolution: "debug@npm:4.3.2" + dependencies: + ms: 2.1.2 + peerDependenciesMeta: + supports-color: + optional: true + checksum: 5543570879e2274f6725d4285a034d6e0822d35faefc6f55965933fb440e8c21eb3a0bef934e66f4b6b491f898ee2de37cab980e9d4fd61372136c19d3ce4527 + languageName: node + linkType: hard + "decamelize@npm:^1.1.1, decamelize@npm:^1.1.2, decamelize@npm:^1.2.0": version: 1.2.0 resolution: "decamelize@npm:1.2.0" @@ -17991,7 +18003,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"lodash@npm:*, lodash@npm:4.17.15, lodash@npm:^4.11.1, lodash@npm:^4.15.0, lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.13, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.4, lodash@npm:^4.17.5, lodash@npm:^4.3.0": +"lodash@npm:4.17.15, lodash@npm:^4.11.1, lodash@npm:^4.15.0, lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.13, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.4, lodash@npm:^4.17.5, lodash@npm:^4.3.0": version: 4.17.15 resolution: "lodash@npm:4.17.15" checksum: aec3fbb7570aa67bda500b8299b1b1821d60646bede87f76a74dfcc7666ab3445267d734ec71424d70809d52ad67a1356fab5ab694a3faa1908d68e9d48f00f5 @@ -19034,6 +19046,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"ms@npm:2.1.2": + version: 2.1.2 + resolution: "ms@npm:2.1.2" + checksum: 9b65fb709bc30c0c07289dcbdb61ca032acbb9ea5698b55fa62e2cebb04c5953f1876a1f3f7f4bc2e91d4bf4d86003f3e207c3bc6ee2f716f99827e62389cd0e + languageName: node + linkType: hard + "multicast-dns-service-types@npm:^1.1.0": version: 1.1.0 resolution: "multicast-dns-service-types@npm:1.1.0" @@ -21663,7 +21682,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"prop-types@npm:*, prop-types@npm:15.x, prop-types@npm:^15.5.10, prop-types@npm:^15.5.6, prop-types@npm:^15.5.8, prop-types@npm:^15.6.0, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2": +"prop-types@npm:15.x, prop-types@npm:^15.5.10, prop-types@npm:^15.5.6, prop-types@npm:^15.5.8, prop-types@npm:^15.6.0, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2": version: 15.7.2 resolution: "prop-types@npm:15.7.2" dependencies: