From b707a3e7a5c23a970ac553ae9a01a4890a7319f8 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Fri, 26 Jan 2024 21:29:00 +0000 Subject: [PATCH] chore(NA): add sharp resolution for v0.32.6 (#175720) Closes https://github.com/elastic/kibana/issues/175544 I think what we were seeing around the sharp issue was the same problem of other native modules which is the install step not running and installing the correct native binaries because of corrupted caches when changing branches. Currently moving to v0.33+ will be problematic because we are using yarn v1 so this PR is making a resolution pin which will help on not making the upgrade for the moment as well as to a correct dep installation when resetting the environment. (cherry picked from commit 85013e943b895e09d9df335fbe14dc2ec010dac8) # Conflicts: # yarn.lock --- package.json | 2 +- yarn.lock | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 10a00e21d79df..2e26ba270aa87 100644 --- a/package.json +++ b/package.json @@ -84,6 +84,7 @@ "**/react-syntax-highlighter": "^15.3.1", "**/recursive-readdir/minimatch": "^3.1.2", "**/remark-parse/trim": "1.0.1", + "**/sharp": "0.32.6", "**/typescript": "4.7.4", "**/underscore": "^1.13.1", "globby/fast-glob": "^3.2.11", @@ -613,7 +614,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", diff --git a/yarn.lock b/yarn.lock index 599f1c6065fd7..221bcc91326e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6587,13 +6587,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" @@ -25262,7 +25255,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.0: +sharp@0.32.6, sharp@^0.32.0: 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==