diff --git a/bin/generate-fixtures.js b/bin/generate-fixtures.js index bbfe851fd..12ac26b2a 100755 --- a/bin/generate-fixtures.js +++ b/bin/generate-fixtures.js @@ -3,7 +3,9 @@ const fs = require('fs') const path = require('path') const fetch = require('node-fetch') +const dotenv = require('dotenv') const { findCommitsWithAssociatedPullRequestsQuery } = require('../lib/commits') +dotenv.config() const REPO_NAME = 'release-drafter-test-repo' const GITHUB_GRAPHQL_API_ENDPOINT = 'https://api.github.com/graphql' @@ -53,6 +55,8 @@ for (const repo of repos) { ref: repo.branch, withPullRequestBody: true, withPullRequestURL: true, + withBaseRefName: true, + withHeadRefName: true, }, }), } diff --git a/dist/index.js b/dist/index.js index c6519e1af..02c0311fc 100644 --- a/dist/index.js +++ b/dist/index.js @@ -133128,6 +133128,7 @@ const findCommitsWithAssociatedPullRequestsQuery = /* GraphQL */ ` name } } + merged baseRefName @include(if: $withBaseRefName) headRefName @include(if: $withHeadRefName) } @@ -133192,7 +133193,9 @@ const findCommitsWithAssociatedPullRequests = async ({ const pullRequests = _.uniqBy( commits.flatMap((commit) => commit.associatedPullRequests.nodes), 'number' - ).filter((pr) => pr.baseRepository.nameWithOwner === repoNameWithOwner) + ).filter( + (pr) => pr.baseRepository.nameWithOwner === repoNameWithOwner && pr.merged + ) return { commits, pullRequests } } diff --git a/lib/commits.js b/lib/commits.js index dd259c89c..37d171115 100644 --- a/lib/commits.js +++ b/lib/commits.js @@ -52,6 +52,7 @@ const findCommitsWithAssociatedPullRequestsQuery = /* GraphQL */ ` name } } + merged baseRefName @include(if: $withBaseRefName) headRefName @include(if: $withHeadRefName) } @@ -116,7 +117,9 @@ const findCommitsWithAssociatedPullRequests = async ({ const pullRequests = _.uniqBy( commits.flatMap((commit) => commit.associatedPullRequests.nodes), 'number' - ).filter((pr) => pr.baseRepository.nameWithOwner === repoNameWithOwner) + ).filter( + (pr) => pr.baseRepository.nameWithOwner === repoNameWithOwner && pr.merged + ) return { commits, pullRequests } } diff --git a/package.json b/package.json index 7e0cbe038..4112d33c0 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "mocked-env": "^1.3.5", "nock": "13.2.2", "nock-knock": "2.0.0", - "node-fetch": "3.1.0", + "node-fetch": "2.6.7", "nodemon": "2.0.15", "prettier": "2.5.1", "smee-client": "1.2.2" diff --git a/test/fixtures/__generated__/graphql-commits-forking.json b/test/fixtures/__generated__/graphql-commits-forking.json index 61049de97..09802af7c 100644 --- a/test/fixtures/__generated__/graphql-commits-forking.json +++ b/test/fixtures/__generated__/graphql-commits-forking.json @@ -36,7 +36,10 @@ "isCrossRepository": true, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "forking", + "headRefName": "forking" } ] } @@ -72,7 +75,10 @@ "name": "skip-changelog" } ] - } + }, + "merged": true, + "baseRefName": "forking", + "headRefName": "add-documentation" }, { "title": "🙅‍♂️ Forking PR 🙅‍♂️", @@ -89,7 +95,10 @@ "isCrossRepository": true, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "forking", + "headRefName": "forking" } ] } @@ -121,7 +130,10 @@ "isCrossRepository": false, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "forking", + "headRefName": "chore/update-dependencies" }, { "title": "🙅‍♂️ Forking PR 🙅‍♂️", @@ -138,7 +150,10 @@ "isCrossRepository": true, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "forking", + "headRefName": "forking" } ] } @@ -177,7 +192,10 @@ "name": "patch" } ] - } + }, + "merged": true, + "baseRefName": "forking", + "headRefName": "fix/bug-fixes" }, { "title": "🙅‍♂️ Forking PR 🙅‍♂️", @@ -194,7 +212,10 @@ "isCrossRepository": true, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "forking", + "headRefName": "forking" } ] } @@ -233,7 +254,10 @@ "name": "patch" } ] - } + }, + "merged": true, + "baseRefName": "forking", + "headRefName": "fix/bug-fixes" }, { "title": "🙅‍♂️ Forking PR 🙅‍♂️", @@ -250,7 +274,10 @@ "isCrossRepository": true, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "forking", + "headRefName": "forking" } ] } @@ -289,7 +316,10 @@ "name": "minor" } ] - } + }, + "merged": true, + "baseRefName": "forking", + "headRefName": "feature/big-feature" }, { "title": "🙅‍♂️ Forking PR 🙅‍♂️", @@ -306,7 +336,10 @@ "isCrossRepository": true, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "forking", + "headRefName": "forking" } ] } @@ -345,7 +378,10 @@ "name": "major" } ] - } + }, + "merged": true, + "baseRefName": "forking", + "headRefName": "feature/alien-technology" }, { "title": "🙅‍♂️ Forking PR 🙅‍♂️", @@ -362,7 +398,10 @@ "isCrossRepository": true, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "forking", + "headRefName": "forking" } ] } @@ -398,7 +437,10 @@ "name": "skip-changelog" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "add-documentation" } ] } @@ -434,7 +476,10 @@ "name": "skip-changelog" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "add-documentation" } ] } @@ -466,7 +511,10 @@ "isCrossRepository": false, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "chore/update-dependencies" } ] } @@ -498,7 +546,10 @@ "isCrossRepository": false, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "chore/update-dependencies" } ] } @@ -534,7 +585,10 @@ "name": "feature" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "feature/alien-technology" } ] } diff --git a/test/fixtures/__generated__/graphql-commits-merge-commit.json b/test/fixtures/__generated__/graphql-commits-merge-commit.json index f7cfd1d8c..5fb21c19f 100644 --- a/test/fixtures/__generated__/graphql-commits-merge-commit.json +++ b/test/fixtures/__generated__/graphql-commits-merge-commit.json @@ -40,7 +40,10 @@ "name": "skip-changelog" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "add-documentation" } ] } @@ -72,7 +75,10 @@ "isCrossRepository": false, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "chore/update-dependencies" } ] } @@ -111,7 +117,10 @@ "name": "patch" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "fix/bug-fixes" } ] } @@ -150,7 +159,10 @@ "name": "minor" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "feature/big-feature" } ] } @@ -186,7 +198,10 @@ "name": "feature" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "feature/alien-technology" } ] } @@ -222,7 +237,10 @@ "name": "skip-changelog" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "add-documentation" } ] } @@ -258,7 +276,10 @@ "name": "skip-changelog" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "add-documentation" } ] } @@ -290,7 +311,10 @@ "isCrossRepository": false, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "chore/update-dependencies" } ] } @@ -322,7 +346,10 @@ "isCrossRepository": false, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "chore/update-dependencies" } ] } @@ -361,7 +388,10 @@ "name": "patch" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "fix/bug-fixes" } ] } @@ -400,7 +430,10 @@ "name": "patch" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "fix/bug-fixes" } ] } @@ -439,7 +472,10 @@ "name": "minor" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "feature/big-feature" } ] } @@ -478,7 +514,10 @@ "name": "minor" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "feature/big-feature" } ] } @@ -514,7 +553,10 @@ "name": "feature" } ] - } + }, + "merged": true, + "baseRefName": "merge-commit", + "headRefName": "feature/alien-technology" } ] } diff --git a/test/fixtures/__generated__/graphql-commits-overlapping-label.json b/test/fixtures/__generated__/graphql-commits-overlapping-label.json index fb44ebc7a..96b00ec6c 100644 --- a/test/fixtures/__generated__/graphql-commits-overlapping-label.json +++ b/test/fixtures/__generated__/graphql-commits-overlapping-label.json @@ -40,7 +40,10 @@ "name": "skip-changelog" } ] - } + }, + "merged": true, + "baseRefName": "overlapping-label", + "headRefName": "add-documentation" } ] } @@ -72,7 +75,10 @@ "isCrossRepository": false, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "overlapping-label", + "headRefName": "chore/update-dependencies" } ] } @@ -108,13 +114,16 @@ "name": "bug" }, { - "name": "patch" + "name": "sentry" }, { - "name": "sentry" + "name": "patch" } ] - } + }, + "merged": true, + "baseRefName": "overlapping-label", + "headRefName": "fix/bug-fixes" } ] } @@ -153,7 +162,10 @@ "name": "minor" } ] - } + }, + "merged": true, + "baseRefName": "overlapping-label", + "headRefName": "feature/big-feature" } ] } @@ -192,7 +204,10 @@ "name": "major" } ] - } + }, + "merged": true, + "baseRefName": "overlapping-label", + "headRefName": "feature/alien-technology" } ] } diff --git a/test/fixtures/__generated__/graphql-commits-rebase-merging.json b/test/fixtures/__generated__/graphql-commits-rebase-merging.json index 649e23935..23754b273 100644 --- a/test/fixtures/__generated__/graphql-commits-rebase-merging.json +++ b/test/fixtures/__generated__/graphql-commits-rebase-merging.json @@ -40,7 +40,10 @@ "name": "skip-changelog" } ] - } + }, + "merged": true, + "baseRefName": "rebase-merging", + "headRefName": "add-documentation" } ] } @@ -76,7 +79,10 @@ "name": "skip-changelog" } ] - } + }, + "merged": true, + "baseRefName": "rebase-merging", + "headRefName": "add-documentation" } ] } @@ -108,7 +114,10 @@ "isCrossRepository": false, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "rebase-merging", + "headRefName": "chore/update-dependencies" } ] } @@ -140,7 +149,10 @@ "isCrossRepository": false, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "rebase-merging", + "headRefName": "chore/update-dependencies" } ] } @@ -179,7 +191,10 @@ "name": "patch" } ] - } + }, + "merged": true, + "baseRefName": "rebase-merging", + "headRefName": "fix/bug-fixes" } ] } @@ -218,7 +233,10 @@ "name": "patch" } ] - } + }, + "merged": true, + "baseRefName": "rebase-merging", + "headRefName": "fix/bug-fixes" } ] } @@ -257,7 +275,10 @@ "name": "minor" } ] - } + }, + "merged": true, + "baseRefName": "rebase-merging", + "headRefName": "feature/big-feature" } ] } @@ -296,7 +317,10 @@ "name": "minor" } ] - } + }, + "merged": true, + "baseRefName": "rebase-merging", + "headRefName": "feature/big-feature" } ] } @@ -335,7 +359,10 @@ "name": "major" } ] - } + }, + "merged": true, + "baseRefName": "rebase-merging", + "headRefName": "feature/alien-technology" } ] } diff --git a/test/fixtures/__generated__/graphql-commits-squash-merging.json b/test/fixtures/__generated__/graphql-commits-squash-merging.json index 3f5a918dc..6886ad3d8 100644 --- a/test/fixtures/__generated__/graphql-commits-squash-merging.json +++ b/test/fixtures/__generated__/graphql-commits-squash-merging.json @@ -40,7 +40,10 @@ "name": "skip-changelog" } ] - } + }, + "merged": true, + "baseRefName": "squash-merging", + "headRefName": "add-documentation" } ] } @@ -72,7 +75,10 @@ "isCrossRepository": false, "labels": { "nodes": [] - } + }, + "merged": true, + "baseRefName": "squash-merging", + "headRefName": "chore/update-dependencies" } ] } @@ -111,7 +117,10 @@ "name": "patch" } ] - } + }, + "merged": true, + "baseRefName": "squash-merging", + "headRefName": "fix/bug-fixes" } ] } @@ -150,7 +159,10 @@ "name": "minor" } ] - } + }, + "merged": true, + "baseRefName": "squash-merging", + "headRefName": "feature/big-feature" } ] } @@ -189,7 +201,10 @@ "name": "major" } ] - } + }, + "merged": true, + "baseRefName": "squash-merging", + "headRefName": "feature/alien-technology" } ] } diff --git a/test/fixtures/graphql-commits-paginated-1.json b/test/fixtures/graphql-commits-paginated-1.json index 44de0856c..4f3f6fd51 100644 --- a/test/fixtures/graphql-commits-paginated-1.json +++ b/test/fixtures/graphql-commits-paginated-1.json @@ -331,7 +331,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -359,7 +360,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -387,7 +389,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -415,7 +418,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -443,7 +447,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -484,7 +489,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -512,7 +518,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -748,7 +755,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -776,7 +784,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -804,7 +813,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -832,7 +842,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -951,7 +962,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -979,7 +991,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1007,7 +1020,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1035,7 +1049,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1089,7 +1104,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1117,7 +1133,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1158,7 +1175,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1186,7 +1204,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1214,7 +1233,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1242,7 +1262,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1270,7 +1291,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1298,7 +1320,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1326,7 +1349,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1354,7 +1378,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1382,7 +1407,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1410,7 +1436,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1438,7 +1465,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1583,7 +1611,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1611,7 +1640,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -1639,7 +1669,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } diff --git a/test/fixtures/graphql-commits-paginated-2.json b/test/fixtures/graphql-commits-paginated-2.json index 4e2cc552c..efb4a39cf 100644 --- a/test/fixtures/graphql-commits-paginated-2.json +++ b/test/fixtures/graphql-commits-paginated-2.json @@ -253,7 +253,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } @@ -281,7 +282,8 @@ }, "baseRepository": { "nameWithOwner": "toolmantim/release-drafter-test-project" - } + }, + "merged": true } ] } diff --git a/yarn.lock b/yarn.lock index 85fb62530..9dcb30033 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2114,11 +2114,6 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -data-uri-to-buffer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b" - integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA== - data-urls@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" @@ -2680,13 +2675,6 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" -fetch-blob@^3.1.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.1.3.tgz#a7dca4855e39d3e3c5a1da62d4ee335c37d26012" - integrity sha512-ax1Y5I9w+9+JiM+wdHkhBoxew+zG4AJ2SvAD1v1szpddUIiPERVGBxrMcB2ZqW0Y3PP8bOWYv2zqQq1Jp2kqUQ== - dependencies: - web-streams-polyfill "^3.0.3" - file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -2775,13 +2763,6 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -formdata-polyfill@^4.0.10: - version "4.0.10" - resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423" - integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g== - dependencies: - fetch-blob "^3.1.2" - formidable@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9" @@ -4361,14 +4342,12 @@ nock@13.2.2: lodash.set "^4.3.2" propagate "^2.0.0" -node-fetch@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.1.0.tgz#714f4922dc270239487654eaeeab86b8206cb52e" - integrity sha512-QU0WbIfMUjd5+MUzQOYhenAazakV7Irh1SGkWCsRzBwvm4fAhzEUaHMJ6QLP7gWT6WO9/oH2zhKMMGMuIrDyKw== +node-fetch@2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== dependencies: - data-uri-to-buffer "^4.0.0" - fetch-blob "^3.1.2" - formdata-polyfill "^4.0.10" + whatwg-url "^5.0.0" node-fetch@^2.6.1: version "2.6.1" @@ -5738,6 +5717,11 @@ tr46@^2.1.0: dependencies: punycode "^2.1.1" +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" @@ -6023,10 +6007,10 @@ walker@^1.0.7: dependencies: makeerror "1.0.x" -web-streams-polyfill@^3.0.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz#a6b74026b38e4885869fb5c589e90b95ccfc7965" - integrity sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA== +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= webidl-conversions@^5.0.0: version "5.0.0" @@ -6050,6 +6034,14 @@ whatwg-mimetype@^2.3.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + whatwg-url@^8.0.0: version "8.1.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.1.0.tgz#c628acdcf45b82274ce7281ee31dd3c839791771"