mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 17:59:23 -04:00
# Backport This will backport the following commits from `main` to `8.12`: - [chore(NA): add sharp resolution for v0.32.6 (#175720)](https://github.com/elastic/kibana/pull/175720) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Tiago Costa","email":"tiago.costa@elastic.co"},"sourceCommit":{"committedDate":"2024-01-26T21:29:00Z","message":"chore(NA): add sharp resolution for v0.32.6 (#175720)\n\nCloses https://github.com/elastic/kibana/issues/175544\r\n\r\nI think what we were seeing around the sharp issue was the same problem\r\nof other native modules which is the install step not running and\r\ninstalling the correct native binaries because of corrupted caches when\r\nchanging branches.\r\n\r\nCurrently moving to v0.33+ will be problematic because we are using yarn\r\nv1 so this PR is making a resolution pin which will help on not making\r\nthe upgrade for the moment as well as to a correct dep installation when\r\nresetting the environment.","sha":"85013e943b895e09d9df335fbe14dc2ec010dac8","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Operations","release_note:skip","backport:all-open","v8.13.0"],"number":175720,"url":"https://github.com/elastic/kibana/pull/175720","mergeCommit":{"message":"chore(NA): add sharp resolution for v0.32.6 (#175720)\n\nCloses https://github.com/elastic/kibana/issues/175544\r\n\r\nI think what we were seeing around the sharp issue was the same problem\r\nof other native modules which is the install step not running and\r\ninstalling the correct native binaries because of corrupted caches when\r\nchanging branches.\r\n\r\nCurrently moving to v0.33+ will be problematic because we are using yarn\r\nv1 so this PR is making a resolution pin which will help on not making\r\nthe upgrade for the moment as well as to a correct dep installation when\r\nresetting the environment.","sha":"85013e943b895e09d9df335fbe14dc2ec010dac8"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.13.0","labelRegex":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/175720","number":175720,"mergeCommit":{"message":"chore(NA): add sharp resolution for v0.32.6 (#175720)\n\nCloses https://github.com/elastic/kibana/issues/175544\r\n\r\nI think what we were seeing around the sharp issue was the same problem\r\nof other native modules which is the install step not running and\r\ninstalling the correct native binaries because of corrupted caches when\r\nchanging branches.\r\n\r\nCurrently moving to v0.33+ will be problematic because we are using yarn\r\nv1 so this PR is making a resolution pin which will help on not making\r\nthe upgrade for the moment as well as to a correct dep installation when\r\nresetting the environment.","sha":"85013e943b895e09d9df335fbe14dc2ec010dac8"}}]}] BACKPORT-->
This commit is contained in:
parent
f6f6059cff
commit
6e9144f9db
2 changed files with 3 additions and 24 deletions
|
@ -86,6 +86,7 @@
|
|||
"**/hoist-non-react-statics": "^3.3.2",
|
||||
"**/isomorphic-fetch/node-fetch": "^2.6.7",
|
||||
"**/remark-parse/trim": "1.0.1",
|
||||
"**/sharp": "0.32.6",
|
||||
"**/typescript": "4.7.4",
|
||||
"globby/fast-glob": "^3.2.11"
|
||||
},
|
||||
|
@ -1442,7 +1443,6 @@
|
|||
"@types/selenium-webdriver": "^4.1.21",
|
||||
"@types/semver": "^7",
|
||||
"@types/set-value": "^2.0.0",
|
||||
"@types/sharp": "^0.30.4",
|
||||
"@types/sinon": "^7.0.13",
|
||||
"@types/source-map-support": "^0.5.3",
|
||||
"@types/stats-lite": "^2.2.0",
|
||||
|
|
25
yarn.lock
25
yarn.lock
|
@ -10039,13 +10039,6 @@
|
|||
resolved "https://registry.yarnpkg.com/@types/set-value/-/set-value-2.0.0.tgz#63d386b103926dcf49b50e16e0f6dd49983046be"
|
||||
integrity sha512-k8dCJEC80F/mbsIOZ5Hj3YSzTVVVBwMdtP/M9Rtc2TM4F5etVd+2UG8QUiAUfbXm4fABedL2tBZnrBheY7UwpA==
|
||||
|
||||
"@types/sharp@^0.30.4":
|
||||
version "0.30.4"
|
||||
resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.30.4.tgz#7430b5fcf37f35dd860112c4cf6dcd6a1ba0011b"
|
||||
integrity sha512-6oJEzKt7wZeS7e+6x9QFEOWGs0T/6of00+0onZGN1zSmcSjcTDZKgIGZ6YWJnHowpaKUCFBPH52mYljWqU32Eg==
|
||||
dependencies:
|
||||
"@types/node" "*"
|
||||
|
||||
"@types/sinon@^7.0.13":
|
||||
version "7.0.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.0.13.tgz#ca039c23a9e27ebea53e0901ef928ea2a1a6d313"
|
||||
|
@ -27333,21 +27326,7 @@ shallowequal@^1.1.0:
|
|||
resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
|
||||
integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
|
||||
|
||||
sharp@0.32.1:
|
||||
version "0.32.1"
|
||||
resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.1.tgz#41aa0d0b2048b2e0ee453d9fcb14ec1f408390fe"
|
||||
integrity sha512-kQTFtj7ldpUqSe8kDxoGLZc1rnMFU0AO2pqbX6pLy3b7Oj8ivJIdoKNwxHVQG2HN6XpHPJqCSM2nsma2gOXvOg==
|
||||
dependencies:
|
||||
color "^4.2.3"
|
||||
detect-libc "^2.0.1"
|
||||
node-addon-api "^6.1.0"
|
||||
prebuild-install "^7.1.1"
|
||||
semver "^7.5.0"
|
||||
simple-get "^4.0.1"
|
||||
tar-fs "^2.1.1"
|
||||
tunnel-agent "^0.6.0"
|
||||
|
||||
sharp@^0.32.6:
|
||||
sharp@0.32.1, sharp@0.32.6, sharp@^0.32.6:
|
||||
version "0.32.6"
|
||||
resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.6.tgz#6ad30c0b7cd910df65d5f355f774aa4fce45732a"
|
||||
integrity sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==
|
||||
|
@ -28709,7 +28688,7 @@ tar-fs@3.0.4, tar-fs@^3.0.4:
|
|||
pump "^3.0.0"
|
||||
tar-stream "^3.1.5"
|
||||
|
||||
tar-fs@^2.0.0, tar-fs@^2.1.1:
|
||||
tar-fs@^2.0.0:
|
||||
version "2.1.1"
|
||||
resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
|
||||
integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue