Skip to content

Commit

Permalink
[7.17] Narrow scope of forced minimatch resolution (elastic#151290) (e…
Browse files Browse the repository at this point in the history
…lastic#151425)

# Backport

This will backport the following commits from `main` to `7.17`:
- [Narrow scope of forced minimatch resolution
(elastic#151290)](elastic#151290)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Thomas
Watson","email":"watson@elastic.co"},"sourceCommit":{"committedDate":"2023-02-16T10:46:52Z","message":"Narrow
scope of forced minimatch resolution (elastic#151290)\n\nThe \"global\" forced
resolution of the `minimatch` package\r\nunintentionally downgraded some
v5.x dependencies to v3.x. The only\r\npackage where we need to force
upgrade `minimatch` is the `globule`\r\npackage which depends on
`minimatch@~3.0.2`. So in this PR I've scoped\r\nthe resolution to only
concern itself with the `globule`
dependencies.","sha":"860bc493cdf2634e39131c6755e874cce483b9cc","branchLabelMapping":{"^v8.8.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:all-open","v8.8.0"],"number":151290,"url":"https://github.com/elastic/kibana/pull/151290","mergeCommit":{"message":"Narrow
scope of forced minimatch resolution (elastic#151290)\n\nThe \"global\" forced
resolution of the `minimatch` package\r\nunintentionally downgraded some
v5.x dependencies to v3.x. The only\r\npackage where we need to force
upgrade `minimatch` is the `globule`\r\npackage which depends on
`minimatch@~3.0.2`. So in this PR I've scoped\r\nthe resolution to only
concern itself with the `globule`
dependencies.","sha":"860bc493cdf2634e39131c6755e874cce483b9cc"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.8.0","labelRegex":"^v8.8.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/151290","number":151290,"mergeCommit":{"message":"Narrow
scope of forced minimatch resolution (elastic#151290)\n\nThe \"global\" forced
resolution of the `minimatch` package\r\nunintentionally downgraded some
v5.x dependencies to v3.x. The only\r\npackage where we need to force
upgrade `minimatch` is the `globule`\r\npackage which depends on
`minimatch@~3.0.2`. So in this PR I've scoped\r\nthe resolution to only
concern itself with the `globule`
dependencies.","sha":"860bc493cdf2634e39131c6755e874cce483b9cc"}},{"url":"https://github.com/elastic/kibana/pull/151421","number":151421,"branch":"8.7","state":"OPEN"}]}]
BACKPORT-->
  • Loading branch information
Thomas Watson authored Feb 16, 2023
1 parent 00d91f1 commit 8126db8
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,16 @@
"**/chokidar": "^3.4.3",
"**/deepmerge": "^4.2.2",
"**/fast-deep-equal": "^3.1.1",
"**/globule/minimatch": "^3.1.2",
"**/hoist-non-react-statics": "^3.3.2",
"**/html-minifier/uglify-js": "^3.14.3",
"**/isomorphic-fetch/node-fetch": "^2.6.7",
"**/istanbul-instrumenter-loader/schema-utils": "1.0.0",
"**/json-schema": "^0.4.0",
"**/minimatch": "^3.1.2",
"**/pdfkit/crypto-js": "4.0.0",
"**/react-syntax-highlighter": "^15.3.1",
"**/react-syntax-highlighter/**/highlight.js": "^10.4.1",
"**/recursive-readdir/minimatch": "^3.1.2",
"**/refractor/prismjs": "~1.27.0",
"**/trim": "1.0.1",
"**/typescript": "4.1.3",
Expand Down
23 changes: 22 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8774,6 +8774,13 @@ brace-expansion@^1.1.7:
balanced-match "^1.0.0"
concat-map "0.0.1"

brace-expansion@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
dependencies:
balanced-match "^1.0.0"

brace@0.11.1, brace@^0.11.1:
version "0.11.1"
resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58"
Expand Down Expand Up @@ -19961,13 +19968,27 @@ minimalistic-crypto-utils@^1.0.1:
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=

"minimatch@2 || 3", minimatch@3.0.4, minimatch@5.0.1, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.2, minimatch@^5.0.1, minimatch@~3.0.2:
"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.2, minimatch@~3.0.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
dependencies:
brace-expansion "^1.1.7"

minimatch@5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
dependencies:
brace-expansion "^2.0.1"

minimatch@^5.0.1:
version "5.1.6"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
dependencies:
brace-expansion "^2.0.1"

minimist-options@4.1.0, minimist-options@^4.0.2:
version "4.1.0"
resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
Expand Down

0 comments on commit 8126db8

Please sign in to comment.