From a3428c3d9e1adbb316f57ee59323504f956ff9a1 Mon Sep 17 00:00:00 2001 From: Julian Waller Date: Sun, 22 Sep 2024 22:26:08 +0100 Subject: [PATCH] fix: use macos 10.15 compatible canvas library --- package.json | 3 ++- satellite/package.json | 2 +- yarn.lock | 18 +++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index ffafd02..3ee5b5a 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,8 @@ "node": "^20.14" }, "resolutions": { - "node-hid": "^3.1.0" + "@napi-rs/canvas-darwin-arm64": "npm:@julusian/napi-rs-canvas-darwin-arm64@0.1.55-c", + "@napi-rs/canvas-darwin-x64": "npm:@julusian/napi-rs-canvas-darwin-x64@0.1.55-c" }, "packageManager": "yarn@4.4.0" } diff --git a/satellite/package.json b/satellite/package.json index 064827d..3f9c987 100644 --- a/satellite/package.json +++ b/satellite/package.json @@ -53,7 +53,7 @@ "@julusian/image-rs": "^1.1.1", "@julusian/jpeg-turbo": "^2.2.0", "@loupedeck/node": "^1.2.0", - "@napi-rs/canvas": "^0.1.56", + "@napi-rs/canvas": "0.1.56", "@xencelabs-quick-keys/node": "^1.0.0", "conf": "^13.0.1", "debounce-fn": "^6.0.0", diff --git a/yarn.lock b/yarn.lock index fe6b2b4..35bdba5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -954,16 +954,16 @@ __metadata: languageName: node linkType: hard -"@napi-rs/canvas-darwin-arm64@npm:0.1.56": - version: 0.1.56 - resolution: "@napi-rs/canvas-darwin-arm64@npm:0.1.56" +"@napi-rs/canvas-darwin-arm64@npm:@julusian/napi-rs-canvas-darwin-arm64@0.1.55-c": + version: 0.1.55-c + resolution: "@julusian/napi-rs-canvas-darwin-arm64@npm:0.1.55-c" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@napi-rs/canvas-darwin-x64@npm:0.1.56": - version: 0.1.56 - resolution: "@napi-rs/canvas-darwin-x64@npm:0.1.56" +"@napi-rs/canvas-darwin-x64@npm:@julusian/napi-rs-canvas-darwin-x64@0.1.55-c": + version: 0.1.55-c + resolution: "@julusian/napi-rs-canvas-darwin-x64@npm:0.1.55-c" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -1010,7 +1010,7 @@ __metadata: languageName: node linkType: hard -"@napi-rs/canvas@npm:^0.1.56": +"@napi-rs/canvas@npm:0.1.56": version: 0.1.56 resolution: "@napi-rs/canvas@npm:0.1.56" dependencies: @@ -5819,7 +5819,7 @@ __metadata: languageName: node linkType: hard -"node-hid@npm:^3.1.0": +"node-hid@npm:^3.0.0, node-hid@npm:^3.1.0": version: 3.1.0 resolution: "node-hid@npm:3.1.0" dependencies: @@ -6726,7 +6726,7 @@ __metadata: "@julusian/image-rs": "npm:^1.1.1" "@julusian/jpeg-turbo": "npm:^2.2.0" "@loupedeck/node": "npm:^1.2.0" - "@napi-rs/canvas": "npm:^0.1.56" + "@napi-rs/canvas": "npm:0.1.56" "@sofie-automation/eslint-plugin": "npm:^0.1.1" "@types/eslint": "npm:^8.56.12" "@types/koa": "npm:^2.15.0"