Skip to content

Commit 275506b

Browse files
fix: use @pingghost/protoc to compile proto files
The npm package previously used (`protoc`) is still lacking apple arm32 support, see YePpHa/node-protoc#10
1 parent ecead31 commit 275506b

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

arduino-ide-extension/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
},
129129
"optionalDependencies": {
130130
"grpc-tools": "^1.12.4",
131-
"protoc": "^1.0.4"
131+
"@pingghost/protoc": "^1.0.2"
132132
},
133133
"mocha": {
134134
"require": [

arduino-ide-extension/scripts/generate-protocol.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
const { exec } = require('./utils');
88
const glob = require('glob');
99
const { SemVer, gte, valid: validSemVer } = require('semver');
10-
const protoc = path.dirname(require('protoc/protoc'));
11-
10+
// Use a node-protoc fork until apple arm32 is supported
11+
// https://github.com/YePpHa/node-protoc/pull/10
12+
const protoc = path.dirname(require('@pingghost/protoc/protoc'));
1213
const repository = await fs.mkdtemp(path.join(os.tmpdir(), 'arduino-cli-'));
1314

1415
const { owner, repo, commitish } = (() => {

yarn.lock

+13-13
Original file line numberDiff line numberDiff line change
@@ -1899,6 +1899,19 @@
18991899
"@phosphor/signaling" "^1.3.1"
19001900
"@phosphor/virtualdom" "^1.2.0"
19011901

1902+
"@pingghost/protoc@^1.0.2":
1903+
version "1.0.2"
1904+
resolved "https://registry.yarnpkg.com/@pingghost/protoc/-/protoc-1.0.2.tgz#68436fe6df7b700149dfb2b9a6a9db3b66fe758a"
1905+
integrity sha512-7ndq6JmrfcRfr6wIxdrjBqAipsrWwldFL5TQRmJXgpGrRi1yU6vKWID6Z4cs96iK+3yLIoUON11fE5CThNBrXA==
1906+
dependencies:
1907+
glob "^7.2.3"
1908+
mkdirp "^0.5.6"
1909+
node-fetch "^3.2.10"
1910+
rimraf "^3.0.2"
1911+
unzipper "^0.10.11"
1912+
uuid "^9.0.0"
1913+
vinyl "^2.2.1"
1914+
19021915
"@pkgjs/parseargs@^0.11.0":
19031916
version "0.11.0"
19041917
resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
@@ -11100,19 +11113,6 @@ protobufjs@^7.2.3, protobufjs@^7.2.4:
1110011113
"@types/node" ">=13.7.0"
1110111114
long "^5.0.0"
1110211115

11103-
protoc@^1.0.4:
11104-
version "1.1.3"
11105-
resolved "https://registry.yarnpkg.com/protoc/-/protoc-1.1.3.tgz#d9857ec2a43a683af8263032d519ce7ba0b7d99e"
11106-
integrity sha512-Vy4OBxCcF0W38YrZZRFix659gFu8ujIxVDP1SUBK9ELzyeMSBe8m8tYyYlX1PI5j9gse9hWu4c4nzQaHesAf8Q==
11107-
dependencies:
11108-
glob "^7.2.3"
11109-
mkdirp "^0.5.6"
11110-
node-fetch "^3.2.10"
11111-
rimraf "^3.0.2"
11112-
unzipper "^0.10.11"
11113-
uuid "^9.0.0"
11114-
vinyl "^2.2.1"
11115-
1111611116
protocols@^2.0.0, protocols@^2.0.1:
1111711117
version "2.0.1"
1111811118
resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86"

0 commit comments

Comments
 (0)