From b03383d0bc79f399a8f52eba4a082f1e84e6bec6 Mon Sep 17 00:00:00 2001 From: Jack Kavanagh Date: Thu, 4 Apr 2024 17:41:29 +0200 Subject: [PATCH] Bump/electron-29 (#34) * bump node * bump electron * bump nan * bump lockfile * remove max conflict macro * remove max conflict macro move to top * and in easy.cc * remove max conflict macro for goof * show node version in debug log * debug * move node under brew --- .github/workflows/build-and-release.yaml | 36 +++--- .github/workflows/build-lint-test.yaml | 62 +++++----- .github/workflows/publish.yaml | 2 +- .nvmrc | 2 +- package.json | 8 +- scripts/ci/build.sh | 7 +- src/Curl.cc | 3 + src/CurlHttpPost.cc | 3 + src/CurlVersionInfo.cc | 3 + src/Easy.cc | 3 + src/Http2PushFrameHeaders.cc | 3 + src/Multi.cc | 3 + src/Share.cc | 3 + src/node_libcurl.cc | 3 + yarn.lock | 151 +++++++++++++++-------- 15 files changed, 187 insertions(+), 105 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 45a7615ef..a1d390f40 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -31,19 +31,13 @@ jobs: node-libcurl-cpp-std: - c++17 node: - - 18.18.2 + - 20.9.0 env: LIBCURL_RELEASE: ${{ matrix.libcurl-release }} LATEST_LIBCURL_RELEASE: ${{ matrix.libcurl-release }} NODE_LIBCURL_CPP_STD: ${{ matrix.node-libcurl-cpp-std }} steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Setup Node.js ${{ matrix.node }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - if: runner.os == 'macOS' name: Install Needed packages on macOS run: brew install coreutils wget automake libtool cmake gnu-sed m4 @@ -62,6 +56,12 @@ jobs: - if: runner.os == 'Linux' name: Install Needed packages on Linux run: sudo apt-get install -y cmake + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Node.js ${{ matrix.node }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node }} - name: Output yarn cache dir id: yarn-cache-dir run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT @@ -110,21 +110,15 @@ jobs: libcurl-release: - 7.79.1 node: - - 18.18.2 + - 20.9.0 electron-version: - - 28.0.0 + - 29.0.0 env: LIBCURL_RELEASE: ${{ matrix.libcurl-release }} LATEST_LIBCURL_RELEASE: ${{ matrix.libcurl-release }} ELECTRON_VERSION: ${{ matrix.electron-version }} NODE_LIBCURL_CPP_STD: c++17 steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Setup Node.js ${{ matrix.node }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - if: runner.os == 'macOS' name: Install Needed packages run: brew install coreutils wget automake libtool cmake gnu-sed m4 @@ -143,6 +137,12 @@ jobs: - if: runner.os == 'Linux' name: Install Needed packages on Linux run: sudo apt-get install -y cmake + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Node.js ${{ matrix.node }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node }} - name: Output yarn cache dir id: yarn-cache-dir run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT @@ -194,7 +194,7 @@ jobs: fail-fast: false matrix: node: - - 18.18.2 + - 20.9.0 env: npm_config_msvs_version: 2022 npm_config_build_from_source: true @@ -237,9 +237,9 @@ jobs: fail-fast: false matrix: node: - - 18.18.2 + - 20.9.0 electron-version: - - 28.0.0 + - 29.0.0 env: ELECTRON_VERSION: ${{ matrix.electron-version }} npm_config_msvs_version: 2022 diff --git a/.github/workflows/build-lint-test.yaml b/.github/workflows/build-lint-test.yaml index 59dd07489..dfa1ddb4c 100644 --- a/.github/workflows/build-lint-test.yaml +++ b/.github/workflows/build-lint-test.yaml @@ -26,11 +26,11 @@ jobs: node-libcurl-cpp-std: - c++17 node: - - 18.18.2 + - 20.9.0 include: # Lint - os: ubuntu-latest - node: 18.18.2 + node: 20.9.0 node-libcurl-cpp-std: c++17 libcurl-release: 7.79.1 run-lint-and-tsc: true @@ -52,12 +52,6 @@ jobs: ${{ github.run_id }}-${{ github.job }}- - id: run_result run: cat run_result 2>/dev/null || echo 'default' - - name: Checkout - uses: actions/checkout@v3 - - name: Setup Node.js ${{ matrix.node }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - if: runner.os == 'macOS' name: Install Needed packages on macOS run: brew install coreutils wget automake libtool cmake gnu-sed m4 @@ -76,18 +70,24 @@ jobs: - if: runner.os == 'Linux' name: Install Needed packages on Linux run: sudo apt-get install -y cmake + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Node.js ${{ matrix.node }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node }} - name: Output yarn cache dir id: yarn-cache-dir run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - - name: Restore Yarn Cache + - name: Restore Yarn Cache ${{ matrix.node }}-${{ github.ref }} uses: actions/cache@v1 id: yarn-cache with: path: ${{ steps.yarn-cache-dir.outputs.dir }} - key: v1-${{ runner.os }}-yarn-cache-${{ github.ref }}-${{ hashFiles('**/yarn.lock') }} + key: v1-${{ runner.os }}-yarn-cache-${{ matrix.node }}-${{ github.ref }}-${{ hashFiles('**/yarn.lock') }} restore-keys: | - v1-${{ runner.os }}-yarn-cache-${{ github.ref }}- - v1-${{ runner.os }}-yarn-cache- + v1-${{ runner.os }}-yarn-cache-${{ matrix.node }}-${{ github.ref }}- + v1-${{ runner.os }}-yarn-cache-${{ matrix.node }}- - name: Restore libcurl deps cache uses: actions/cache@v3 id: libcurl-deps-cache @@ -98,7 +98,7 @@ jobs: key: v4-build-lint-test-${{ runner.os }}-libcurl-deps-cache-node-${{ matrix.node }} restore-keys: | v4-build-lint-test-${{ runner.os }}-libcurl-deps-cache-node-${{ matrix.node }} - - name: 'Build node-libcurl' + - name: Build node-libcurl ${{ matrix.node }} if: steps.run_result.outputs.run_result != 'success' run: | RUN_TESTS=false \ @@ -144,9 +144,9 @@ jobs: libcurl-release: - 7.79.1 node: - - 18.18.2 + - 20.9.0 electron-version: - - 28.0.0 + - 29.0.0 env: LIBCURL_RELEASE: ${{ matrix.libcurl-release }} LATEST_LIBCURL_RELEASE: ${{ matrix.libcurl-release }} @@ -165,12 +165,6 @@ jobs: ${{ github.run_id }}-${{ github.job }}- - id: run_result run: cat run_result 2>/dev/null || echo 'default' - - name: Checkout - uses: actions/checkout@v3 - - name: Setup Node.js ${{ matrix.node }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - name: Set up Homebrew id: set-up-homebrew uses: Homebrew/actions/setup-homebrew@master @@ -188,18 +182,24 @@ jobs: make install autoconf --version ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Node.js ${{ matrix.node }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node }} - name: Output yarn cache dir id: yarn-cache-dir run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - - name: Restore Yarn Cache + - name: Restore Yarn Cache ${{ matrix.node }}-${{ github.ref }} uses: actions/cache@v3 id: yarn-cache with: path: ${{ steps.yarn-cache-dir.outputs.dir }} - key: v1-${{ runner.os }}-yarn-cache-${{ github.ref }}-${{ hashFiles('**/yarn.lock') }} + key: v1-${{ runner.os }}-yarn-cache-${{ matrix.node }}-${{ github.ref }}-${{ hashFiles('**/yarn.lock') }} restore-keys: | - v1-${{ runner.os }}-yarn-cache-${{ github.ref }}- - v1-${{ runner.os }}-yarn-cache- + v1-${{ runner.os }}-yarn-cache-${{ matrix.node }}-${{ github.ref }}- + v1-${{ runner.os }}-yarn-cache-${{ matrix.node }}- - name: Restore Electron Cache uses: actions/cache@v3 with: @@ -221,7 +221,7 @@ jobs: - name: 'Set GIT_TAG' if: startsWith(github.ref, 'refs/tags') run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - name: 'Build node-libcurl' + - name: Build node-libcurl ${{ matrix.node }} ${{ matrix.electron-version }} if: steps.run_result.outputs.run_result != 'success' run: | RUN_TESTS=true \ @@ -244,7 +244,7 @@ jobs: fail-fast: false matrix: node: - - 18.18.2 + - 20.9.0 env: npm_config_msvs_version: 2022 npm_config_build_from_source: true @@ -262,7 +262,7 @@ jobs: choco install nasm -y $env:PATH=$env:PROGRAMFILES + "\NASM;" + $env:Path python deps\curl-for-windows\configure.py - - name: Build + - name: Build ${{ matrix.node }} run: | $env:PATH=$env:PROGRAMFILES + "\NASM;" + $env:Path yarn install --frozen-lockfile @@ -281,9 +281,9 @@ jobs: fail-fast: false matrix: node: - - 18.18.2 + - 20.9.0 electron-version: - - 28.0.0 + - 29.0.0 env: ELECTRON_VERSION: ${{ matrix.electron-version }} npm_config_msvs_version: 2022 @@ -306,7 +306,7 @@ jobs: $env:PATH=$env:PROGRAMFILES + "\NASM;" + $env:Path python deps\curl-for-windows\configure.py yarn global add electron@${env:ELECTRON_VERSION} - - name: Build + - name: Build ${{ matrix.node }} run: | $env:PATH=$env:PROGRAMFILES + "\NASM;" + $env:Path yarn install --frozen-lockfile diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index fc03fd236..77cafd3ac 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -17,7 +17,7 @@ jobs: - name: Setup Node.js ${{ matrix.node }} uses: actions/setup-node@v3 with: - node-version: 18.18.2 + node-version: 20.9.0 registry-url: 'https://registry.npmjs.org' - name: Install run: yarn install --ignore-scripts diff --git a/.nvmrc b/.nvmrc index a58d2d2c2..43bff1f8c 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.18.2 \ No newline at end of file +20.9.0 \ No newline at end of file diff --git a/package.json b/package.json index 8488a7066..42a4f3a3f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@getinsomnia/node-libcurl", - "version": "2.4.1-9", + "version": "2.4.29-1", "description": "The fastest http(s) client (and much more) for Node.js - Node.js bindings for libcurl", "keywords": [ "node-curl", @@ -75,9 +75,9 @@ ] }, "dependencies": { - "@mapbox/node-pre-gyp": "1.0.5", + "@mapbox/node-pre-gyp": "1.0.11", "env-paths": "2.2.0", - "nan": "2.18.0", + "nan": "2.19.0", "node-gyp": "10.0.1", "npmlog": "4.1.2", "rimraf": "^3.0.2", @@ -129,7 +129,7 @@ "typescript": "^4.0.3" }, "engines": { - "node": ">= 18" + "node": ">= 20" }, "np": { "cleanup": false diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index a7ec3e76b..ba1070158 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -357,6 +357,9 @@ echo "npm_config_dist_url=$npm_config_dist_url" echo "npm_config_target=$npm_config_target" echo "npm_config_target_arch=$npm_config_target_arch" +echo "node version: $(node -v)" +echo "yarn version: $(yarn -v)" + yarn install --frozen-lockfile --network-timeout 300000 if [ "$STOP_ON_INSTALL" == "true" ]; then @@ -406,12 +409,14 @@ if [[ $PUBLISH_BINARY == true && $LIBCURL_RELEASE == $LATEST_LIBCURL_RELEASE ]]; node scripts/module-packaging.js --publish "$(yarn --silent pregyp reveal staged_tarball --silent)" fi fi - +echo "node version: $(node -v)" +echo "yarn version: $(yarn -v)" # In case we published the binaries, verify if we can download them, and that they work # Otherwise, unpublish them INSTALL_RESULT=0 if [[ $PUBLISH_BINARY == true ]]; then echo "Publish binary is true - Testing if it was published correctly" + INSTALL_RESULT=$(npm_config_fallback_to_build=false yarn install --frozen-lockfile --network-timeout 300000 > /dev/null)$? || true fi if [[ $INSTALL_RESULT != 0 ]]; then diff --git a/src/Curl.cc b/src/Curl.cc index ef42798ce..d79f8d0db 100644 --- a/src/Curl.cc +++ b/src/Curl.cc @@ -1,3 +1,6 @@ +#ifndef NOMINMAX +# define NOMINMAX // To remove conflicts with recent v8 code std::numeric_limits::max() +#endif /** * Copyright (c) Jonathan Cardoso Machado. All Rights Reserved. * diff --git a/src/CurlHttpPost.cc b/src/CurlHttpPost.cc index 405feef4f..417104732 100755 --- a/src/CurlHttpPost.cc +++ b/src/CurlHttpPost.cc @@ -1,3 +1,6 @@ +#ifndef NOMINMAX +# define NOMINMAX // To remove conflicts with recent v8 code std::numeric_limits::max() +#endif /** * Copyright (c) Jonathan Cardoso Machado. All Rights Reserved. * diff --git a/src/CurlVersionInfo.cc b/src/CurlVersionInfo.cc index 72f640dae..80feb28ed 100644 --- a/src/CurlVersionInfo.cc +++ b/src/CurlVersionInfo.cc @@ -1,3 +1,6 @@ +#ifndef NOMINMAX +# define NOMINMAX // To remove conflicts with recent v8 code std::numeric_limits::max() +#endif /** * Copyright (c) Jonathan Cardoso Machado. All Rights Reserved. * diff --git a/src/Easy.cc b/src/Easy.cc index 68ac78fd6..299bace38 100644 --- a/src/Easy.cc +++ b/src/Easy.cc @@ -1,3 +1,6 @@ +#ifndef NOMINMAX +# define NOMINMAX // To remove conflicts with recent v8 code std::numeric_limits::max() +#endif /** * Copyright (c) Jonathan Cardoso Machado. All Rights Reserved. * diff --git a/src/Http2PushFrameHeaders.cc b/src/Http2PushFrameHeaders.cc index 5d50f5bbe..86fc6d18e 100644 --- a/src/Http2PushFrameHeaders.cc +++ b/src/Http2PushFrameHeaders.cc @@ -1,3 +1,6 @@ +#ifndef NOMINMAX +# define NOMINMAX // To remove conflicts with recent v8 code std::numeric_limits::max() +#endif /** * Copyright (c) Jonathan Cardoso Machado. All Rights Reserved. * diff --git a/src/Multi.cc b/src/Multi.cc index 5c5616687..b70471198 100644 --- a/src/Multi.cc +++ b/src/Multi.cc @@ -1,3 +1,6 @@ +#ifndef NOMINMAX +# define NOMINMAX // To remove conflicts with recent v8 code std::numeric_limits::max() +#endif /** * Copyright (c) Jonathan Cardoso Machado. All Rights Reserved. * diff --git a/src/Share.cc b/src/Share.cc index 90e6c9e5d..dcef8e45d 100644 --- a/src/Share.cc +++ b/src/Share.cc @@ -1,3 +1,6 @@ +#ifndef NOMINMAX +# define NOMINMAX // To remove conflicts with recent v8 code std::numeric_limits::max() +#endif /** * Copyright (c) Jonathan Cardoso Machado. All Rights Reserved. * diff --git a/src/node_libcurl.cc b/src/node_libcurl.cc index 94834ad24..3447fff75 100644 --- a/src/node_libcurl.cc +++ b/src/node_libcurl.cc @@ -1,3 +1,6 @@ +#ifndef NOMINMAX +# define NOMINMAX // To remove conflicts with recent v8 code std::numeric_limits::max() +#endif /** * Copyright (c) Jonathan Cardoso Machado. All Rights Reserved. * diff --git a/yarn.lock b/yarn.lock index c2ea04533..cc43b94ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -410,20 +410,20 @@ resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@mapbox/node-pre-gyp@1.0.5": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.5.tgz#2a0b32fcb416fb3f2250fd24cb2a81421a4f5950" - integrity sha512-4srsKPXWlIxp5Vbqz5uLfBN+du2fJChBoYn/f2h991WLdk7jUvcSk/McVLSv/X+xQIPI8eGD5GjrnygdyHnhPA== +"@mapbox/node-pre-gyp@1.0.11": + version "1.0.11" + resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz#417db42b7f5323d79e93b34a6d7a2a12c0df43fa" + integrity sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ== dependencies: - detect-libc "^1.0.3" + detect-libc "^2.0.0" https-proxy-agent "^5.0.0" make-dir "^3.1.0" - node-fetch "^2.6.1" + node-fetch "^2.6.7" nopt "^5.0.0" - npmlog "^4.1.2" + npmlog "^5.0.1" rimraf "^3.0.2" - semver "^7.3.4" - tar "^6.1.0" + semver "^7.3.5" + tar "^6.1.11" "@microsoft/api-documenter@^7.9.10": version "7.9.10" @@ -1040,11 +1040,24 @@ aproba@^1.0.3: resolved "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + archy@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= +are-we-there-yet@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" + integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + are-we-there-yet@~1.1.2: version "1.1.5" resolved "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" @@ -1595,6 +1608,11 @@ color-name@~1.1.4: resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-support@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + colors@~1.2.1: version "1.2.5" resolved "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc" @@ -1652,10 +1670,10 @@ configstore@^5.0.1: write-file-atomic "^3.0.0" xdg-basedir "^4.0.0" -console-control-strings@^1.0.0, console-control-strings@~1.1.0: +console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0: version "1.1.0" - resolved "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== contains-path@^0.1.0: version "0.1.0" @@ -1958,10 +1976,10 @@ detect-indent@^6.0.0: resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd" integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA== -detect-libc@^1.0.3: - version "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: + version "2.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700" + integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw== detect-newline@3.1.0: version "3.1.0" @@ -2846,6 +2864,21 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= +gauge@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395" + integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.2" + console-control-strings "^1.0.0" + has-unicode "^2.0.1" + object-assign "^4.1.1" + signal-exit "^3.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.2" + gauge@~2.7.3: version "2.7.4" resolved "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -3177,10 +3210,10 @@ has-symbols@^1.0.0, has-symbols@^1.0.1: resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== -has-unicode@^2.0.0: +has-unicode@^2.0.0, has-unicode@^2.0.1: version "2.0.1" - resolved "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== has-yarn@^2.1.0: version "2.1.0" @@ -4649,10 +4682,10 @@ mute-stream@0.0.8: resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nan@2.18.0: - version "2.18.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" - integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w== +nan@2.19.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.19.0.tgz#bb58122ad55a6c5bc973303908d5b16cfdd5a8c0" + integrity sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw== nanoid@3.3.3: version "3.3.3" @@ -4694,10 +4727,10 @@ node-environment-flags@1.0.6: object.getownpropertydescriptors "^2.0.3" semver "^5.7.0" -node-fetch@^2.6.1: - version "2.6.5" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" - integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ== +node-fetch@^2.6.7: + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== dependencies: whatwg-url "^5.0.0" @@ -4821,7 +4854,7 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" -npmlog@4.1.2, npmlog@^4.1.2: +npmlog@4.1.2: version "4.1.2" resolved "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -4831,6 +4864,16 @@ npmlog@4.1.2, npmlog@^4.1.2: gauge "~2.7.3" set-blocking "~2.0.0" +npmlog@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0" + integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw== + dependencies: + are-we-there-yet "^2.0.0" + console-control-strings "^1.1.0" + gauge "^3.0.0" + set-blocking "^2.0.0" + nth-check@~1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" @@ -4881,10 +4924,10 @@ oauth-sign@~0.9.0: resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4.0.1, object-assign@^4.1.0: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" - resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-inspect@^1.7.0: version "1.7.0" @@ -5503,6 +5546,15 @@ readable-stream@^2.0.6, readable-stream@~2.3.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@^3.6.0: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readdirp@~3.2.0: version "3.2.0" resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839" @@ -5784,13 +5836,6 @@ semver@^7.1.1: resolved "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6" integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA== -semver@^7.3.4: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - semver@^7.3.5: version "7.3.8" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" @@ -6102,7 +6147,7 @@ string-argv@0.3.1, string-argv@~0.3.1: resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -6359,26 +6404,26 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -tar@^6.1.0, 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== +tar@^6.1.11: + version "6.1.15" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69" + integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^3.0.0" + minipass "^5.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" -tar@^6.1.11: - version "6.1.15" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69" - integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A== +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== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^5.0.0" + minipass "^3.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" @@ -6905,6 +6950,13 @@ wide-align@1.1.3, wide-align@^1.1.0: dependencies: string-width "^1.0.2 || 2" +wide-align@^1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + widest-line@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" @@ -6928,6 +6980,7 @@ workerpool@6.2.1: integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: + name wrap-ansi-cjs version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==