feat: build IDE2 on darwin arm64

- Use Node.js 16+, - All workflow files use `.yml` instead of `.yaml`, - Use Arduino LS `0.7.2`, - Updated `electron-builder` to `23.3.3`, - Removed unused `conf-node-gyp.sh`, - Removed unused `THEIA_ELECTRON_SKIP_REPLACE_FFMPEG`, and - Aligned `node-gyp@9.3.0`, `electron-rebuild@3.2.9` to Theia. Co-authored-by: per1234 <accounts@perglass.com> Co-authored-by: Akos Kitta <a.kitta@arduino.cc> Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
2025-04-19 12:57:17 +00:00 · 2022-05-30 15:28:33 +02:00 · 2022-05-30 15:28:33 +02:00 · f6275f9f62
commit f6275f9f62
parent 0d0550974a
21 changed files with 81 additions and 164 deletions
--- a/.github/workflows/arduino-stats.yaml
+++ b/.github/workflows/arduino-stats.yaml
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -57,10 +57,10 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v2

-      - name: Install Node.js 14.x
+      - name: Install Node.js 16.x
        uses: actions/setup-node@v1
        with:
-          node-version: '14.x'
+          node-version: '16.x'
          registry-url: 'https://registry.npmjs.org'

      - name: Install Python 3.x
--- a/.github/workflows/check-i18n-task.yml
+++ b/.github/workflows/check-i18n-task.yml
@ -29,10 +29,10 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v2

-      - name: Install Node.js 14.x
+      - name: Install Node.js 16.x
        uses: actions/setup-node@v2
        with:
-          node-version: '14.x'
+          node-version: '16.x'
          registry-url: 'https://registry.npmjs.org'

      - name: Install Go
--- a/.github/workflows/compose-full-changelog.yaml
+++ b/.github/workflows/compose-full-changelog.yaml
@ -8,7 +8,7 @@ on:
 env:
  CHANGELOG_ARTIFACTS: changelog
  # See: https://github.com/actions/setup-node/#readme
-  NODE_VERSION: 14.x
+  NODE_VERSION: 16.x

 jobs:
  create-changelog:
--- a/.github/workflows/github-stats.yaml
+++ b/.github/workflows/github-stats.yaml
--- a/.github/workflows/i18n-nightly-push.yml
+++ b/.github/workflows/i18n-nightly-push.yml
@ -16,10 +16,10 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v2

-      - name: Install Node.js 14.x
+      - name: Install Node.js 16.x
        uses: actions/setup-node@v2
        with:
-          node-version: '14.x'
+          node-version: '16.x'
          registry-url: 'https://registry.npmjs.org'

      - name: Install Go
--- a/.github/workflows/i18n-weekly-pull.yml
+++ b/.github/workflows/i18n-weekly-pull.yml
@ -16,10 +16,10 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v2

-      - name: Install Node.js 14.x
+      - name: Install Node.js 16.x
        uses: actions/setup-node@v2
        with:
-          node-version: '14.x'
+          node-version: '16.x'
          registry-url: 'https://registry.npmjs.org'

      - name: Install Go
--- a/.github/workflows/themes-weekly-pull.yml
+++ b/.github/workflows/themes-weekly-pull.yml
@ -9,7 +9,7 @@ on:
 env:
  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
  GO_VERSION: "1.17"
-  NODE_VERSION: 14.x
+  NODE_VERSION: 16.x

 jobs:
  pull-from-jsonbin:
--- a/arduino-ide-extension/package.json
+++ b/arduino-ide-extension/package.json
@ -168,7 +168,7 @@
      "version": "14.0.0"
    },
    "languageServer": {
-      "version": "0.7.1"
+      "version": "0.7.2"
    }
  }
 }
--- a/arduino-ide-extension/scripts/download-cli.js
+++ b/arduino-ide-extension/scripts/download-cli.js
@ -42,6 +42,9 @@
    const suffix = (() => {
      switch (platform) {
        case 'darwin':
+          if (arch === 'arm64') {
+            return 'macOS_ARM64.tar.gz';
+          }
          return 'macOS_64bit.tar.gz';
        case 'win32':
          return 'Windows_64bit.zip';
--- a/arduino-ide-extension/scripts/download-ls.js
+++ b/arduino-ide-extension/scripts/download-ls.js
@ -76,6 +76,12 @@
      lsSuffix = 'macOS_64bit.tar.gz';
      clangdSuffix = 'macOS_64bit';
      break;
+    case 'darwin-arm64':
+      clangdExecutablePath = path.join(build, 'clangd');
+      clangFormatExecutablePath = path.join(build, 'clang-format');
+      lsSuffix = 'macOS_ARM64.tar.gz';
+      clangdSuffix = 'macOS_ARM64';
+      break;
    case 'linux-x64':
      clangdExecutablePath = path.join(build, 'clangd');
      clangFormatExecutablePath = path.join(build, 'clang-format');
--- a/docs/development.md
+++ b/docs/development.md
@ -54,7 +54,7 @@ This repository contains the main code, but two more repositories are included d
 If you’re familiar with TypeScript, the [Theia IDE](https://theia-ide.org/), and if you want to contribute to the
 project, you should be able to build the Arduino IDE locally.
 Please refer to the [Theia IDE prerequisites](https://github.com/eclipse-theia/theia/blob/master/doc/Developing.md#prerequisites) documentation for the setup instructions.
-> **Note**: Node.js 14 must be used instead of the version 12 recommended at the link above.
+> **Note**: Node.js 16 must be used instead of the version 14 recommended at the link above.

 Once you have all the tools installed, you can build the editor following these steps

--- a/docs/internal/Arm.md
+++ b/docs/internal/Arm.md
@ -2,14 +2,14 @@

 Building the Pro IDE on Linux `armv7l` (aka `armhf`) and `aarch64` (aka `arm64`):

-1. Install Node.js 14.x with [nvm](https://github.com/nvm-sh/nvm#install--update-script):
+1. Install Node.js 16.x with [nvm](https://github.com/nvm-sh/nvm#install--update-script):
    ```
    wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
    ```
    Restart your shell then:
    ```
-    nvm install 14
-    nvm use 14
+    nvm install 16
+    nvm use 16
    ```
    Verify:
    ```
--- a/docs/internal/Ubuntu.md
+++ b/docs/internal/Ubuntu.md
@ -18,9 +18,9 @@ sudo apt update \
  build-essential \
 && wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash \
 && source ~/.bashrc \
-&& nvm install 14 \
-&& nvm use 14 \
-&& nvm alias default 14 \
+&& nvm install 16 \
+&& nvm use 16 \
+&& nvm alias default 16 \
 && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - \
 && echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list \
 && sudo apt update && sudo apt install --no-install-recommends yarn \
--- a/electron/build/template-package.json
+++ b/electron/build/template-package.json
@ -11,7 +11,7 @@
  "devDependencies": {
    "@theia/cli": "1.25.0",
    "cross-env": "^7.0.2",
-    "electron-builder": "23.0.2",
+    "electron-builder": "23.3.3",
    "electron-notarize": "^1.1.1",
    "is-ci": "^2.0.0",
    "ncp": "^2.0.0",
@ -26,7 +26,7 @@
    "patch": "ncp ./patch/backend/main.js ./src-gen/backend/main.js"
  },
  "engines": {
-    "node": ">=14.0.0 <15"
+    "node": ">=16.0.0 <17"
  },
  "repository": {
    "type": "git",
@ -89,7 +89,10 @@
      "hardenedRuntime": true,
      "gatekeeperAssess": false,
      "entitlements": "resources/entitlements.mac.plist",
-      "entitlementsInherit": "resources/entitlements.mac.plist"
+      "entitlementsInherit": "resources/entitlements.mac.plist",
+      "target": {
+        "target": "default"
+      }
    },
    "linux": {
      "target": [
--- a/electron/packager/conf-node-gyp.sh
+++ b/electron/packager/conf-node-gyp.sh
@ -1,11 +0,0 @@
-#!/bin/sh
-
-npm install --global node-gyp@7.0.0
-
-if [ "$OSTYPE" = "cygwin" ] || [ "$OSTYPE" = "msys" ]; then
-    npm config set node_gyp "`npm prefix -g`\node_modules\node-gyp\bin\node-gyp.js"
-else
-    npm config set node_gyp "`npm prefix -g`/lib/node_modules/node-gyp/bin/node-gyp.js"
-fi
-
-echo "npm config get node_gyp -> `npm config get node_gyp`"
--- a/electron/packager/config.js
+++ b/electron/packager/config.js
@ -27,6 +27,9 @@ function artifactName() {
      throw new Error(`Unsupported platform, arch: ${platform}, ${arch}`);
    }
    case 'darwin': {
+      if (arch === 'arm64') {
+        return `${name}_${id}_macOS_ARM64.\$\{ext}`;
+      }
      return `${name}_${id}_macOS_64bit.\$\{ext}`;
    }
    case 'linux': {
--- a/electron/packager/index.js
+++ b/electron/packager/index.js
@ -6,7 +6,6 @@
  const shell = require('shelljs');
  const glob = require('glob');
  const isCI = require('is-ci');
-  shell.env.THEIA_ELECTRON_SKIP_REPLACE_FFMPEG = '1'; // Do not run the ffmpeg validation for the packager.
  // Note, this will crash on PI if the available memory is less than desired heap size.
  // https://github.com/shelljs/shelljs/issues/1024#issuecomment-1001552543
  shell.env.NODE_OPTIONS = '--max_old_space_size=4096'; // Increase heap size for the CI
--- a/electron/packager/package.json
+++ b/electron/packager/package.json
@ -33,7 +33,7 @@
    "yargs": "^12.0.5"
  },
  "engines": {
-    "node": ">=14.0.0 <15"
+    "node": ">=16.0.0 <17"
  },
  "mocha": {
    "reporter": "spec",
--- a/package.json
+++ b/package.json
@ -7,7 +7,7 @@
  "license": "AGPL-3.0-or-later",
  "private": true,
  "engines": {
-    "node": ">=14.0.0 <15"
+    "node": ">=16.0.0 <17"
  },
  "devDependencies": {
    "@theia/cli": "1.25.0",
@ -26,7 +26,7 @@
    "ignore-styles": "^5.0.1",
    "lerna": "^3.20.2",
    "lint-staged": "^11.0.0",
-    "node-gyp": "^9.0.0",
+    "node-gyp": "^9.3.0",
    "prettier": "^2.3.1",
    "reflect-metadata": "^0.1.10",
    "rimraf": "^2.6.1",
@ -37,7 +37,8 @@
    "xhr2": "^0.2.1"
  },
  "resolutions": {
-    "@types/react": "16.14.25"
+    "@types/react": "16.14.25",
+    "electron-rebuild": "3.2.9"
  },
  "scripts": {
    "prepare": "lerna run prepare && yarn download:plugins",
--- a/yarn.lock
+++ b/yarn.lock
@ -1100,7 +1100,7 @@
    unique-filename "^1.1.1"
    which "^1.3.1"

-"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
+"@gar/promisify@^1.1.3":
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
@ -1919,14 +1919,6 @@
    "@nodelib/fs.scandir" "2.1.5"
    fastq "^1.6.0"

-"@npmcli/fs@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
-  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
-  dependencies:
-    "@gar/promisify" "^1.0.1"
-    semver "^7.3.5"
-
 "@npmcli/fs@^2.1.0":
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.0.tgz#f2a21c28386e299d1a9fae8051d35ad180e33109"
@ -1935,14 +1927,6 @@
    "@gar/promisify" "^1.1.3"
    semver "^7.3.5"

-"@npmcli/move-file@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
-  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@npmcli/move-file@^2.0.0":
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.0.tgz#417f585016081a0184cef3e38902cd917a9bbd02"
@ -2930,11 +2914,6 @@
  dependencies:
    tippy.js "^6.3.1"

-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
-
 "@tootallnate/once@2":
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
@ -3811,7 +3790,7 @@ abab@^2.0.0, abab@^2.0.5:
  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==

-abbrev@1:
+abbrev@1, abbrev@^1.0.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@ -3900,7 +3879,7 @@ agentkeepalive@^3.4.1:
  dependencies:
    humanize-ms "^1.2.1"

-agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
+agentkeepalive@^4.2.1:
  version "4.2.1"
  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
  integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
@ -4934,30 +4913,6 @@ cacache@^12.0.0, cacache@^12.0.3:
    unique-filename "^1.1.1"
    y18n "^4.0.0"

-cacache@^15.2.0:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
-  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
-  dependencies:
-    "@npmcli/fs" "^1.0.0"
-    "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
-
 cacache@^16.1.0:
  version "16.1.0"
  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.0.tgz#87a6bae558a511c9cb2a13768073e240ca76153a"
@ -6307,7 +6262,7 @@ detect-libc@^1.0.3:
  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=

-detect-libc@^2.0.0:
+detect-libc@^2.0.0, detect-libc@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
  integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
@ -6488,21 +6443,21 @@ ee-first@1.1.1:
  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=

-electron-rebuild@^3.2.7:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-3.2.7.tgz#0f56c1cc99a6fec0a5b990532283c2a8c838c19b"
-  integrity sha512-WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw==
+electron-rebuild@3.2.9, electron-rebuild@^3.2.7:
+  version "3.2.9"
+  resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-3.2.9.tgz#ea372be15f591f8d6d978ee9bca6526dadbcf20f"
+  integrity sha512-FkEZNFViUem3P0RLYbZkUjC8LUFIK+wKq09GHoOITSJjfDAVQv964hwaNseTTWt58sITQX3/5fHNYcTefqaCWw==
  dependencies:
    "@malept/cross-spawn-promise" "^2.0.0"
    chalk "^4.0.0"
    debug "^4.1.1"
-    detect-libc "^1.0.3"
+    detect-libc "^2.0.1"
    fs-extra "^10.0.0"
    got "^11.7.0"
    lzma-native "^8.0.5"
    node-abi "^3.0.0"
    node-api-version "^0.1.4"
-    node-gyp "^8.4.0"
+    node-gyp "^9.0.0"
    ora "^5.1.0"
    semver "^7.3.5"
    tar "^6.0.5"
@ -6564,7 +6519,7 @@ encodeurl@^1.0.2, encodeurl@~1.0.2:
  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=

-encoding@^0.1.11, encoding@^0.1.12, encoding@^0.1.13:
+encoding@^0.1.11, encoding@^0.1.13:
  version "0.1.13"
  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@ -8430,15 +8385,6 @@ http-proxy-agent@^2.1.0:
    agent-base "4"
    debug "3.1.0"

-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
-  dependencies:
-    "@tootallnate/once" "1"
-    agent-base "6"
-    debug "4"
-
 http-proxy-agent@^5.0.0:
  version "5.0.0"
  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
@ -10085,28 +10031,6 @@ make-fetch-happen@^5.0.0:
    socks-proxy-agent "^4.0.0"
    ssri "^6.0.0"

-make-fetch-happen@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
-  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
-  dependencies:
-    agentkeepalive "^4.1.3"
-    cacache "^15.2.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^6.0.0"
-    minipass "^3.1.3"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^1.3.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.2"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^6.0.0"
-    ssri "^8.0.0"
-
 map-age-cleaner@^0.1.1:
  version "0.1.3"
  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@ -10638,17 +10562,6 @@ minipass-collect@^1.0.2:
  dependencies:
    minipass "^3.0.0"

-minipass-fetch@^1.3.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
-  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
-  dependencies:
-    minipass "^3.1.0"
-    minipass-sized "^1.0.3"
-    minizlib "^2.0.0"
-  optionalDependencies:
-    encoding "^0.1.12"
-
 minipass-fetch@^2.0.3:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8"
@ -10667,7 +10580,7 @@ minipass-flush@^1.0.5:
  dependencies:
    minipass "^3.0.0"

-minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+minipass-pipeline@^1.2.4:
  version "1.2.4"
  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
@ -10689,7 +10602,7 @@ minipass@^2.3.5, minipass@^2.6.0, minipass@^2.9.0:
    safe-buffer "^5.1.2"
    yallist "^3.0.0"

-minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
+minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
  version "3.1.6"
  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
@ -10703,7 +10616,7 @@ minizlib@^1.3.3:
  dependencies:
    minipass "^2.9.0"

-minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.1.1, minizlib@^2.1.2:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@ -10972,7 +10885,7 @@ ncp@^2.0.0:
  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=

-negotiator@0.6.3, negotiator@^0.6.2, negotiator@^0.6.3:
+negotiator@0.6.3, negotiator@^0.6.3:
  version "0.6.3"
  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@ -11100,22 +11013,6 @@ node-gyp@^5.0.2:
    tar "^4.4.12"
    which "^1.3.1"

-node-gyp@^8.4.0:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
-  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^9.1.0"
-    nopt "^5.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
 node-gyp@^9.0.0:
  version "9.0.0"
  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.0.0.tgz#e1da2067427f3eb5bb56820cb62bc6b1e4bd2089"
@ -11132,6 +11029,22 @@ node-gyp@^9.0.0:
    tar "^6.1.2"
    which "^2.0.2"

+node-gyp@^9.3.0:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.0.tgz#f8eefe77f0ad8edb3b3b898409b53e697642b319"
+  integrity sha512-A6rJWfXFz7TQNjpldJ915WFb1LnhO4lIve3ANPbWreuEoLoKlFT3sxIepPBkLhM27crW8YmN+pjlgbasH6cH/Q==
+  dependencies:
+    env-paths "^2.2.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^10.0.3"
+    nopt "^6.0.0"
+    npmlog "^6.0.0"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
+    which "^2.0.2"
+
 node-pty@0.11.0-beta17:
  version "0.11.0-beta17"
  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.11.0-beta17.tgz#7df6a60dced6bf7a3a282b65cf51980c68954af6"
@ -11169,6 +11082,13 @@ nopt@^5.0.0:
  dependencies:
    abbrev "1"

+nopt@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
+  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
+  dependencies:
+    abbrev "^1.0.0"
+
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
  version "2.5.0"
  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@ -13682,7 +13602,7 @@ socks-proxy-agent@^4.0.0:
    agent-base "~4.2.1"
    socks "~2.3.2"

-socks-proxy-agent@^6.0.0, socks-proxy-agent@^6.1.1:
+socks-proxy-agent@^6.1.1:
  version "6.2.0"
  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.0.tgz#f6b5229cc0cbd6f2f202d9695f09d871e951c85e"
  integrity sha512-wWqJhjb32Q6GsrUqzuFkukxb/zzide5quXYcMVpIjxalDBBYy2nqKCFQ/9+Ie4dvOYSQdOk3hUlZSdzZOd3zMQ==
@ -13891,13 +13811,6 @@ ssri@^6.0.0, ssri@^6.0.1:
  dependencies:
    figgy-pudding "^3.5.1"

-ssri@^8.0.0, ssri@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
-  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
-  dependencies:
-    minipass "^3.1.1"
-
 ssri@^9.0.0:
  version "9.0.0"
  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.0.tgz#70ad90e339eb910f1a7ff1dcf4afc268326c4547"
@ -14345,7 +14258,7 @@ tar@^4.0.0, tar@^4.4.10, tar@^4.4.12, tar@^4.4.8:
    safe-buffer "^5.2.1"
    yallist "^3.1.1"

-tar@^6.0.2, tar@^6.0.5, tar@^6.1.11, tar@^6.1.2:
+tar@^6.0.5, tar@^6.1.11, tar@^6.1.2:
  version "6.1.11"
  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==