github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[7.17] Added resolution for d3-color@2.0.0 version to point to elastic fork (#184945) (#185017)

Browse source 
# Backport

This will backport the following commits from `main` to `7.17`:
- [Added resolution for d3-color version to point to elastic fork
(#184945)](https://github.com/elastic/kibana/pull/184945)
 
 `npm list d3-color --all`
 ```
 ├─┬ @elastic/charts@40.3.2
│ ├─┬ d3-interpolate@1.4.0
│ │ └── d3-color@npm:@elastic/d3-color@1.4.2
│ └─┬ d3-scale@1.0.7
│   └── d3-color@npm:@elastic/d3-color@1.4.2
├─┬ d3-interpolate@3.0.1
│ └── d3-color@3.1.0
├─┬ d3-scale@2.2.2
│ └─┬ d3-interpolate@1.4.0
│   └── d3-color@npm:@elastic/d3-color@1.4.2
└─┬ vega@5.24.0
  ├─┬ vega-functions@5.13.1
  │ └── d3-color@3.1.0
  └─┬ vega-geo@4.4.1
    └── d3-color@3.1.0
 ```

<!--- Backport version: 8.9.8 -->

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

<!--BACKPORT
[{"author":{"name":"elena-shostak","email":"165678770+elena-shostak@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-06-07T11:47:41Z","message":"Added
resolution for d3-color@2.0.0 version to point to elastic fork
(#184945)\n\n## Summary\r\n\r\nAdded resolution for `d3-color@2.0.0`
version to point to elastic
fork.","sha":"217e29dc2af8d7458d4c2d95ac7d566c2280deb6","branchLabelMapping":{"^v8.15.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Security","release_note:skip","backport:prev-MAJOR","v8.15.0"],"number":184945,"url":"https://github.com/elastic/kibana/pull/184945","mergeCommit":{"message":"Added
resolution for d3-color@2.0.0 version to point to elastic fork
(#184945)\n\n## Summary\r\n\r\nAdded resolution for `d3-color@2.0.0`
version to point to elastic
fork.","sha":"217e29dc2af8d7458d4c2d95ac7d566c2280deb6"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.15.0","labelRegex":"^v8.15.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/184945","number":184945,"mergeCommit":{"message":"Added
resolution for d3-color@2.0.0 version to point to elastic fork
(#184945)\n\n## Summary\r\n\r\nAdded resolution for `d3-color@2.0.0`
version to point to elastic
fork.","sha":"217e29dc2af8d7458d4c2d95ac7d566c2280deb6"}},{"url":"https://github.com/elastic/kibana/pull/185002","number":185002,"branch":"8.14","state":"OPEN"}]}]
BACKPORT-->
This commit is contained in:
elena-shostak 2024-06-07 19:46:28 +02:00 • committed by GitHub
parent c6a09f0146
commit 96d34a379b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -70,12 +70,14 @@
"yarn": "^1.22.19"
},
"resolutions": {
"**/@elastic/charts/**/d3-color": "npm:@elastic/d3-color@1.4.2",
"**/@types/node": "20.10.6",
"**/@types/react": "^16.14.25",
"**/@types/react-dom": "^16.9.8",
"**/@typescript-eslint/utils": "5.62.0",
"**/axios": "1.6.3",
"**/chokidar": "^3.4.3",
"**/d3-scale/**/d3-color": "npm:@elastic/d3-color@1.4.2",
"**/globule/minimatch": "^3.1.2",
"**/hoist-non-react-statics": "^3.3.2",
"**/html-minifier/uglify-js": "^3.14.3",

8
yarn.lock
View file

@ -11064,10 +11064,10 @@ d3-collection@1, d3-collection@^1.0.7:
resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
d3-color@1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
d3-color@1, "d3-color@npm:@elastic/d3-color@1.4.2":
version "1.4.2"
resolved "https://registry.yarnpkg.com/@elastic/d3-color/-/d3-color-1.4.2.tgz#00437ecbed5b5631f5a8c30f457d7049795c3b5e"
integrity sha512-I9zIjF3GZLyxIFYEhumljYBwrZCRIA0eGyrP+Xw7qMxhYynoj9PWkHC7MI1sffFDPmvw6qgEfdhRyQ2fwCxgGQ==
"d3-color@1 - 3", d3-color@^3.1.0:
version "3.1.0"