From 90e0acb3e787adb321e43cbbea2771dd1fcd3aea Mon Sep 17 00:00:00 2001 From: Jack Kavanagh Date: Thu, 20 Oct 2022 12:41:33 +0100 Subject: [PATCH] electron 21 (#6) * support electron 21 * add brew action https://github.com/actions/runner-images/issues/6283 * bump node-gyp * pin node 16.16.0 * and pin windows to 16.16.0 * pin the rest * GetCreationContext * fix attempt clean up GH actions old node versions + fix deprecated set-output * add debug log to failed script * try to force openssl version * [chore] Attempt latest OS and vs versions (#7) * Attempt latest OS and vs versions * Remove appveyor, circleci and travis Co-authored-by: Filipe Freire --- .appveyor.yml | 199 ---------- .circleci/config.yml | 461 ----------------------- .github/workflows/build-and-release.yaml | 46 +-- .github/workflows/build-lint-test.yaml | 57 ++- .github/workflows/codeql-analysis.yaml | 2 +- .travis.yml | 90 ----- package.json | 6 +- scripts/ci/build.sh | 7 +- src/Easy.cc | 4 +- yarn.lock | 312 +++++++++++++-- 10 files changed, 341 insertions(+), 843 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .circleci/config.yml delete mode 100644 .travis.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index bd8140108..000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,199 +0,0 @@ -# http://www.appveyor.com/docs/appveyor-yml -# mostly copied from nan appveyor.yml -## AppVeyor is used to build: -## - Electron (Win64, Win32) -## - Node.js (Win64, Win32) - -os: Visual Studio 2017 - -# Set build version format here instead of in the admin panel. -version: '{build}' - -environment: - DEBUG: 'node-libcurl' - NODE_LIBCURL_GITHUB_TOKEN: - secure: o8iCZIMbaOR5HKy9Q/ArQ6N+5LRepyRVYRtLTrxyCo2gCEXUp8xhUYjLMJmZgNu9 - NODE_LIBCURL_POSTINSTALL_SKIP_CLEANUP: 'true' - matrix: - # node.js - - nodejs_version: '10' - - nodejs_version: '12' - - nodejs_version: '14' - - nodejs_version: '16' - - nodejs_version: '17' - - nodejs_version: '16' - ELECTRON_VERSION: '15.3.0' - - nodejs_version: '16' - ELECTRON_VERSION: '14.2.0' - - nodejs_version: '16' - ELECTRON_VERSION: '13.6.1' - - nodejs_version: '16' - ELECTRON_VERSION: '12.2.2' - - nodejs_version: '16' - ELECTRON_VERSION: '11.5.0' - # - nodejs_version: '12' - # NWJS_VERSION: '0.44.5' - # - nodejs_version: '12' - # NWJS_VERSION: '0.43.6' - # - nodejs_version: '12' - # NWJS_VERSION: '0.42.6' - -# matrix: -# allow_failures: -# - nodejs_version: "11" - -platform: - - x86 - - x64 - -# git clone depth -clone_depth: 5 - -cache: - - build -> binding.gyp, LIBCURL_VERSION_WIN_DEPS - - '%USERPROFILE%\.node-gyp' - - '%USERPROFILE%\.nw-gyp' - - '%USERPROFILE%\.nw' - - '%LOCALAPPDATA%\Yarn\cache' - - '%LOCALAPPDATA%\electron\Cache' - -# Install scripts. (runs after repo cloning) -install: - # We need this because we are building libcurl with c-ares - # instead of the system DNS resolver, and on Windows, this - # means that localhost is not handled by default - - echo 127.0.0.1 localhost >> C:\Windows\System32\drivers\etc\hosts - - echo ::1 localhost >> C:\Windows\System32\drivers\etc\hosts - # Get nasm - - cinst nasm -y - - set PATH=%PROGRAMFILES%\NASM;%PATH% - # in case above does not work - # - curl -L -o nasminst.exe http://libgd.blob.core.windows.net/nasm/nasm-2.07-installer.exe - # - start /wait nasminst.exe /S - # - ps: $env:path="C:\Program Files (x86)\nasm;$($env:path)" - - - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:Platform - - SET PATH=%cd%\node_modules\.bin\;%PATH% - # Output useful info for debugging. - - node --version - - npm --version - - yarn --version - # Check if we need to publish the package - - SET PUBLISH_BINARY=false - # we are creating a empty file named publish - - ps: if ( $env:APPVEYOR_REPO_COMMIT_MESSAGE.ToLower().Contains('[publish binary]') -OR $(git describe --tags --always HEAD) -eq $env:APPVEYOR_REPO_BRANCH ) { echo $null >> publish } - - IF EXIST "publish" SET PUBLISH_BINARY=true - # Install the curl-for-windows dependencies. - - git submodule update --init --recursive - - python deps\curl-for-windows\configure.py - - ps: | - # $ErrorActionPreference = "Stop" - - $runtime = "" - $dist_url = "" - $target = "" - - if ($null -ne $env:ELECTRON_VERSION) { - $runtime = "electron" - $dist_url = "https://electronjs.org/headers" - $target = $env:ELECTRON_VERSION - - yarn global add electron@${env:ELECTRON_VERSION} - - } elseif ($null -ne $env:NWJS_VERSION) { - $runtime = "node-webkit" - $target = $env:NWJS_VERSION - - yarn global add nw-gyp@3.6.5 - yarn global add nw@$target - # We had this issue on nw-gyp 3.6.4 - # https://github.com/nwjs/nw-gyp/issues/116 - # patch tool for Windows - # https://stackoverflow.com/a/9485089/710693 - pip install patch - # apply patch to nw-gyp fixing issue - python -m patch -d "$(yarn global dir)/node_modules/nw-gyp/src" ./scripts/ci/patches/win_delay_load_hook.cc.patch - - $arch = if ($env:PLATFORM -eq "x86") { "ia32" } else { "x64" } - - $rootFolder = "$env:USERPROFILE/.nw" - mkdir -Force $rootFolder - - $nwName = "nwjs-v$target-win-$arch" - $outputFolder = "$env:USERPROFILE/.nw/$nwName" - - if (![System.IO.File]::Exists("$outputFolder/nw.exe")) { - Write-Host "nw.exe not found on $outputFolder - Downloading it" - - $url = "https://dl.nwjs.io/v$target/$nwName.zip" - $output = "$rootFolder/$nwName.zip" - - # https://blog.jourdant.me/post/3-ways-to-download-files-with-powershell - Import-Module BitsTransfer - Start-BitsTransfer -Source $url -Destination $output - - Expand-Archive $output -DestinationPath $rootFolder - - Remove-Item –path $output - } - - $env:PATH = "$outputFolder;$env:PATH" - } - - $env:npm_config_msvs_version = "2017" - $env:npm_config_build_from_source = "true" - $env:npm_config_runtime = $runtime - $env:npm_config_dist_url = $dist_url - $env:npm_config_target = $target - - Write-Host $env:npm_config_msvs_version - Write-Host $env:npm_config_build_from_source - Write-Host $env:npm_config_runtime - Write-Host $env:npm_config_dist_url - Write-Host $env:npm_config_target - -build_script: - - yarn install --frozen-lockfile - - dir . - -# Post-install test scripts. -test_script: - # run tests - - ps: | - if ($null -ne $env:ELECTRON_VERSION) { - yarn test:electron - } else { - if ($null -ne $env:NWJS_VERSION) { - Write-Host "No tests available for nw.js, skipping tests..." - } else { - yarn ts-node -e "console.log(require('./lib').Curl.getVersionInfoString())" - yarn test - } - } - - # This is needed because powershell treats - # output to stderr as errors - # See: - # https://stackoverflow.com/q/2095088/710693 - # https://stackoverflow.com/a/12866669/710693 - # https://stackoverflow.com/a/31451481/710693 - if ($LASTEXITCODE -eq 0) { - $host.SetShouldExit(0) - } - -after_test: - - IF "%PUBLISH_BINARY%" == "true" (node-pre-gyp package testpackage --verbose) - - IF "%PUBLISH_BINARY%" == "true" (for /f "usebackq delims=" %%x in (`node-pre-gyp reveal staged_tarball --silent`) do node scripts\module-packaging.js --publish %%x) - -on_success: - - SET INSTALL_RESULT=0 - - set npm_config_fallback_to_build=false - - IF "%PUBLISH_BINARY%" == "true" (yarn install --frozen-lockfile) - - IF "%PUBLISH_BINARY%" == "true" (SET INSTALL_RESULT=%ERRORLEVEL%) - - IF NOT %INSTALL_RESULT% == 0 (for /f "usebackq delims=" %%x in (`node-pre-gyp reveal hosted_tarball --silent`) do node scripts\module-packaging.js --unpublish %%x) - - IF NOT %INSTALL_RESULT% == 0 (echo "Package unpublished since we got an error while installing it.") - - dir . - # - node-pre-gyp clean - -# Don't actually deploy. -deploy: off diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 3fff2e9ef..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,461 +0,0 @@ -## CircleCI is used to build: -## - Electron (linux) -## - Nwjs (linux) -## - Node.js (alpine) - -version: 2.1 - -# aliases: -# # add deps on ubuntu img -# - &install-deps -# # update automake -# - run: | -# wget ftp://ftp.gnu.org/gnu/automake/automake-1.16.1.tar.gz &> /dev/null -# tar -xzf automake-1.16.1.tar.gz && cd automake-1.16.1 -# ./configure && make && sudo make install -# # add missing packages -# - run: sudo apt-get install texinfo gperf ruby-ronn cmake - -executors: - debian: - docker: - - image: jonathancardoso/debian-ci - environment: - RECONFIGURE_NGHTTP2: 'true' - BASH_ENV: '/home/circleci/.bashrc' - LATEST_LIBCURL_RELEASE: '7.79.1' - alpine: - docker: - - image: jonathancardoso/alpine-ci - environment: - LATEST_LIBCURL_RELEASE: '7.79.1' - -orbs: - build-addon-unix-and-publish: - jobs: - build-addon: - # https://circleci.com/docs/2.0/reusing-config/#parameter-syntax - parameters: - node-version: - description: Version of Node.js - default: '' - type: string - electron-version: - description: Version of Node.js - default: '' - type: string - nwjs-version: - description: Version of Nw.js - default: '' - type: string - e: - type: executor - node-libcurl-cpp-std: - type: string - default: 'c++11' - cares-version: - type: string - default: '1.16.1' - brotli-version: - type: string - default: '1.0.7' - libcurl-version: - type: string - libidn2-version: - type: string - default: '2.1.1' - libssh2-version: - type: string - default: '1.9.0' - libunistring-version: - type: string - default: '0.9.10' - ncurses-version: - type: string - default: '6.1' - nghttp2-version: - type: string - openldap-version: - type: string - default: '2.4.47' - openssl-version: - type: string - zlib-version: - type: string - default: '1.2.11' - before-build: - description: 'Steps that will be executed before the build' - type: steps - default: [] - after-build: - description: 'Steps that will be executed before the build' - type: steps - default: [] - executor: << parameters.e >> - steps: - - checkout - # temporary fix to solve certificates issues - main docker image must be updated instead - - when: - condition: - equal: ['debian', << parameters.e >>] - steps: - - run: sudo apt-get update && sudo apt-get upgrade - - when: - condition: <> - steps: - - run: | - if [ -x "$(command -v nvm)" ]; then - nvm use <> - else - [ -f /usr/local/bin/node<> ] && ln -s /usr/local/bin/node<> /usr/local/bin/node || true - fi - - run: - name: Setup Environment Variables - command: | - echo 'export ELECTRON_VERSION="<>"' >> $BASH_ENV - echo 'export NWJS_VERSION="<>"' >> $BASH_ENV - echo 'export CARES_RELEASE="<>"' >> $BASH_ENV - echo 'export BROTLI_RELEASE="<>"' >> $BASH_ENV - echo 'export LIBCURL_RELEASE="<>"' >> $BASH_ENV - echo 'export LIBIDN2_RELEASE="<>"' >> $BASH_ENV - echo 'export LIBSSH2_RELEASE="<>"' >> $BASH_ENV - echo 'export LIBUNISTRING_RELEASE="<>"' >> $BASH_ENV - echo 'export NCURSES_RELEASE="<>"' >> $BASH_ENV - echo 'export NGHTTP2_RELEASE="<>"' >> $BASH_ENV - echo 'export OPENLDAP_RELEASE="<>"' >> $BASH_ENV - echo 'export OPENSSL_RELEASE="<>"' >> $BASH_ENV - echo 'export ZLIB_RELEASE="<>"' >> $BASH_ENV - echo 'export NODE_LIBCURL_CPP_STD="<>"' >> $BASH_ENV - #### - # Restore caches - ### - - run: - name: Create cache key file - command: | - echo "$CARES_RELEASE" >> _libs_versions - echo "$BROTLI_RELEASE" >> _libs_versions - echo "$LIBCURL_RELEASE" >> _libs_versions - echo "$LIBIDN2_RELEASE" >> _libs_versions - echo "$LIBSSH2_RELEASE" >> _libs_versions - echo "$LIBUNISTRING_RELEASE" >> _libs_versions - echo "$NCURSES_RELEASE" >> _libs_versions - echo "$NGHTTP2_RELEASE" >> _libs_versions - echo "$OPENLDAP_RELEASE" >> _libs_versions - echo "$OPENSSL_RELEASE" >> _libs_versions - echo "$ZLIB_RELEASE" >> _libs_versions - - restore_cache: - keys: - - v4-nodeV<>-electronV<>-nwjsV<>-deps-libs-{{ checksum "_libs_versions" }}-{{ checksum "yarn.lock" }} - - v4-nodeV<>-electronV<>-nwjsV<>-deps-libs-{{ checksum "_libs_versions" }}- - - - steps: <> - #### - # Build - #### - - run: - command: GIT_TAG=$CIRCLE_TAG GIT_COMMIT=$CIRCLE_SHA1 ./scripts/ci/build.sh - no_output_timeout: 40m - - steps: <> - #### - # Cache - #### - - save_cache: - key: v4-nodeV<>-electronV<>-nwjsV<>-deps-libs-{{ checksum "_libs_versions" }}-{{ checksum "yarn.lock" }} - paths: - - ~/.electron - - ~/.cache/electron - - ~/.cache/yarn - - ~/.node-gyp - - ~/.nw-gyp - - ~/deps/cares/build/<> - - ~/deps/brotli/build/<> - - ~/deps/libcurl/build/<> - - ~/deps/libssh2/build/<> - - ~/deps/libidn2/build/<> - - ~/deps/libunistring/build/<> - - ~/deps/ncurses/build/<> - - ~/deps/nghttp2/build/<> - - ~/deps/openldap/build/<> - - ~/deps/openssl/build/<> - - ~/deps/zlib/build/<> - - store_artifacts: - path: ./logs/ -# Great docs -# https://circleci.com/docs/2.0/reusing-config/#getting-started-with-config-reuse - -workflows: - build-test-deploy: - jobs: - #### - # Node 10 - #### - - build-addon-unix-and-publish/build-addon: - name: build-addon-node-10-libcurl-latest - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - node-version: '10' - libcurl-version: '7.79.1' - cares-version: '1.15.0' - nghttp2-version: '1.41.0' - openssl-version: '1.1.1g' - e: - name: alpine - #### - # Node 12 - #### - - build-addon-unix-and-publish/build-addon: - name: build-addon-node-12-libcurl-latest - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - node-version: '12' - libcurl-version: '7.79.1' - cares-version: '1.16.0' - nghttp2-version: '1.40.0' - openssl-version: '1.1.1g' - e: - name: alpine - #### - # Node 14 - #### - - build-addon-unix-and-publish/build-addon: - name: build-addon-node-14-libcurl-latest - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - node-version: '14' - libcurl-version: '7.79.1' - cares-version: '1.16.0' - nghttp2-version: '1.41.0' - openssl-version: '1.1.1g' - e: - name: alpine - #### - # Node 16 - #### - - build-addon-unix-and-publish/build-addon: - name: build-addon-node-16-libcurl-latest - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - node-version: '16' - libcurl-version: '7.79.1' - cares-version: '1.17.1' - nghttp2-version: '1.42.0' - openssl-version: '1.1.1k' - node-libcurl-cpp-std: 'c++17' - e: - name: alpine - - build-addon-unix-and-publish/build-addon: - name: build-addon-node-16-libcurl-old - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - node-version: '16' - libcurl-version: '7.50.0' - nghttp2-version: '1.42.0' - openssl-version: '1.1.1k' - node-libcurl-cpp-std: 'c++17' - e: - name: alpine - #### - # Node 17 - #### - - build-addon-unix-and-publish/build-addon: - name: build-addon-node-17-libcurl-latest - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - node-version: '17' - libcurl-version: '7.79.1' - cares-version: '1.17.2' - nghttp2-version: '1.45.1' - openssl-version: '3.0.0' - node-libcurl-cpp-std: 'c++17' - e: - name: alpine - #### - # Electron v15 - #### - - build-addon-unix-and-publish/build-addon: - name: build-addon-electron-v15-libcurl-latest - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - electron-version: '15.3.0' - libcurl-version: '7.79.1' - cares-version: '1.17.2' - nghttp2-version: '1.45.1' - openssl-version: '3.0.0' - node-libcurl-cpp-std: 'c++17' - e: - name: debian - #### - # Electron v14 - #### - - build-addon-unix-and-publish/build-addon: - name: build-addon-electron-v14-libcurl-latest - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - electron-version: '14.2.0' - libcurl-version: '7.79.1' - cares-version: '1.17.2' - nghttp2-version: '1.45.1' - openssl-version: '3.0.0' - node-libcurl-cpp-std: 'c++17' - e: - name: debian - #### - # Electron v13 - #### - - build-addon-unix-and-publish/build-addon: - name: build-addon-electron-v13-libcurl-latest - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - electron-version: '13.6.1' - libcurl-version: '7.79.1' - cares-version: '1.17.2' - nghttp2-version: '1.45.1' - openssl-version: '3.0.0' - node-libcurl-cpp-std: 'c++17' - e: - name: debian - #### - # Electron v12 - #### - - build-addon-unix-and-publish/build-addon: - name: build-addon-electron-v12-libcurl-latest - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - electron-version: '12.2.2' - libcurl-version: '7.79.1' - cares-version: '1.17.2' - nghttp2-version: '1.45.1' - openssl-version: '3.0.0' - node-libcurl-cpp-std: 'c++17' - e: - name: debian - #### - # Electron v11 - #### - - build-addon-unix-and-publish/build-addon: - name: build-addon-electron-v11-libcurl-latest - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - electron-version: '11.5.0' - libcurl-version: '7.79.1' - cares-version: '1.17.2' - nghttp2-version: '1.45.1' - openssl-version: '3.0.0' - node-libcurl-cpp-std: 'c++17' - e: - name: debian - #### - # Nwjs v0.58 - #### - - build-addon-unix-and-publish/build-addon: - name: build-addon-nwjs-v0.58-libcurl-latest - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - nwjs-version: '0.58.0' - libcurl-version: '7.79.1' - cares-version: '1.17.2' - nghttp2-version: '1.45.1' - openssl-version: '3.0.0' - node-libcurl-cpp-std: 'c++17' - e: - name: debian - #### - # Nwjs v0.57 - #### - - build-addon-unix-and-publish/build-addon: - name: build-addon-nwjs-v0.57-libcurl-latest - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - nwjs-version: '0.57.1' - libcurl-version: '7.79.1' - cares-version: '1.17.2' - nghttp2-version: '1.45.1' - openssl-version: '3.0.0' - node-libcurl-cpp-std: 'c++17' - e: - name: debian - #### - # Nwjs v0.56 - #### - - build-addon-unix-and-publish/build-addon: - name: build-addon-nwjs-v0.56-libcurl-latest - context: general - filters: - branches: - ignore: - - gh-pages - tags: - only: /^v.*/ - nwjs-version: '0.56.1' - libcurl-version: '7.79.1' - cares-version: '1.17.2' - nghttp2-version: '1.45.1' - openssl-version: '3.0.0' - node-libcurl-cpp-std: 'c++17' - e: - name: debian diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index ec6e68cfb..3a572c6ec 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -24,24 +24,14 @@ jobs: fail-fast: false matrix: os: - - macos-11 - - ubuntu-18.04 + - macos-latest + - ubuntu-latest libcurl-release: - 7.79.1 node-libcurl-cpp-std: - - c++11 + - c++17 node: - - 12 - - 14 - include: - - os: macos-11 - node: 16 - node-libcurl-cpp-std: c++17 - libcurl-release: 7.79.1 - - os: ubuntu-18.04 - node: 16 - node-libcurl-cpp-std: c++17 - libcurl-release: 7.79.1 + - 16.16.0 env: LIBCURL_RELEASE: ${{ matrix.libcurl-release }} @@ -74,7 +64,7 @@ jobs: run: sudo apt-get install -y cmake - name: Output yarn cache dir id: yarn-cache-dir - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Restore Yarn Cache uses: actions/cache@v2 id: yarn-cache @@ -114,14 +104,14 @@ jobs: fail-fast: false matrix: os: - - macos-11 - - ubuntu-18.04 + - macos-latest + - ubuntu-latest libcurl-release: - 7.79.1 node: - - 16 + - 16.16.0 electron-version: - - 19.0.0 + - 21.0.0 env: LIBCURL_RELEASE: ${{ matrix.libcurl-release }} LATEST_LIBCURL_RELEASE: ${{ matrix.libcurl-release }} @@ -154,7 +144,7 @@ jobs: run: sudo apt-get install -y cmake - name: Output yarn cache dir id: yarn-cache-dir - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Restore Yarn Cache uses: actions/cache@v2 id: yarn-cache @@ -197,16 +187,14 @@ jobs: retention-days: 5 build-and-release-nodejs-windows: - runs-on: windows-2019 + runs-on: windows-latest strategy: fail-fast: false matrix: node: - - 12 - - 14 - - 16 + - 16.16.0 env: - npm_config_msvs_version: 2019 + npm_config_msvs_version: 2022 npm_config_build_from_source: true steps: - name: Checkout @@ -241,17 +229,17 @@ jobs: node scripts\module-packaging.js --publish $(yarn -s node-pre-gyp reveal staged_tarball --silent) build-and-release-electron-windows: - runs-on: windows-2019 + runs-on: windows-latest strategy: fail-fast: false matrix: node: - - 16 + - 16.16.0 electron-version: - - 19.0.0 + - 21.0.0 env: ELECTRON_VERSION: ${{ matrix.electron-version }} - npm_config_msvs_version: 2019 + npm_config_msvs_version: 2022 npm_config_build_from_source: true npm_config_runtime: "electron" npm_config_dist_url: "https://electronjs.org/headers" diff --git a/.github/workflows/build-lint-test.yaml b/.github/workflows/build-lint-test.yaml index 210dcd980..e253be199 100644 --- a/.github/workflows/build-lint-test.yaml +++ b/.github/workflows/build-lint-test.yaml @@ -19,32 +19,22 @@ jobs: fail-fast: false matrix: os: - - macos-11 - - ubuntu-18.04 + - macos-latest + - ubuntu-latest libcurl-release: - 7.79.1 node-libcurl-cpp-std: - - c++11 + - c++17 node: - - 12 - - 14 - include: - - os: macos-11 - node: 16 - node-libcurl-cpp-std: c++17 - libcurl-release: 7.79.1 - - os: ubuntu-18.04 - node: 16 - node-libcurl-cpp-std: c++17 - libcurl-release: 7.79.1 - run-lint-and-tsc: true # Run lint + - 16.16.0 + env: LIBCURL_RELEASE: ${{ matrix.libcurl-release }} LATEST_LIBCURL_RELEASE: ${{ matrix.libcurl-release }} NODE_LIBCURL_CPP_STD: ${{ matrix.node-libcurl-cpp-std }} steps: - id: timestamp - run: echo "::set-output name=timestamp::$(timestamp +%s)" + run: echo "timestamp=$(timestamp +%s)" >> $GITHUB_OUTPUT - name: Restore the previous run result uses: actions/cache@v2 with: @@ -81,7 +71,7 @@ jobs: run: sudo apt-get install -y cmake - name: Output yarn cache dir id: yarn-cache-dir - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Restore Yarn Cache uses: actions/cache@v1 id: yarn-cache @@ -133,6 +123,7 @@ jobs: name: build-logs-${{ matrix.os }}-${{ matrix.libcurl-release }}-${{ matrix.node }} path: ./logs/ retention-days: 3 + # TODO(Filipe) - fix this set-output - run: echo "::set-output name=run_result::success" > run_result build-and-test-electron: @@ -141,14 +132,14 @@ jobs: fail-fast: false matrix: os: - - macos-11 - - ubuntu-18.04 + - macos-latest + - ubuntu-latest libcurl-release: - 7.79.1 node: - - 16 + - 16.16.0 electron-version: - - 19.0.0 + - 21.0.0 env: LIBCURL_RELEASE: ${{ matrix.libcurl-release }} LATEST_LIBCURL_RELEASE: ${{ matrix.libcurl-release }} @@ -156,7 +147,7 @@ jobs: NODE_LIBCURL_CPP_STD: c++17 steps: - id: timestamp - run: echo "::set-output name=timestamp::$(timestamp +%s)" + run: echo "timestamp=$(timestamp +%s)" >> $GITHUB_OUTPUT - name: Restore the previous run result uses: actions/cache@v2 with: @@ -173,6 +164,9 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node }} + - name: Set up Homebrew + id: set-up-homebrew + uses: Homebrew/actions/setup-homebrew@master - name: Install Needed packages run: brew install coreutils wget automake libtool cmake gnu-sed m4 # not using brew for that one as we need 2.69 @@ -189,7 +183,7 @@ jobs: ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize - name: Output yarn cache dir id: yarn-cache-dir - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Restore Yarn Cache uses: actions/cache@v2 id: yarn-cache @@ -234,19 +228,18 @@ jobs: name: build-logs-${{ matrix.os }}-${{ matrix.libcurl-release }}-${{ matrix.electron-version }} path: ./logs/ retention-days: 5 + # TODO(Filipe) - fix this set-output - run: echo "::set-output name=run_result::success" > run_result build-and-test-nodejs-windows: - runs-on: windows-2019 + runs-on: windows-latest strategy: fail-fast: false matrix: node: - - 12 - - 14 - - 16 + - 16.16.0 env: - npm_config_msvs_version: 2019 + npm_config_msvs_version: 2022 npm_config_build_from_source: true steps: - name: Checkout @@ -276,17 +269,17 @@ jobs: } build-and-test-electron-windows: - runs-on: windows-2019 + runs-on: windows-latest strategy: fail-fast: false matrix: node: - - 16 + - 16.16.0 electron-version: - - 19.0.0 + - 21.0.0 env: ELECTRON_VERSION: ${{ matrix.electron-version }} - npm_config_msvs_version: 2019 + npm_config_msvs_version: 2022 npm_config_build_from_source: true npm_config_runtime: "electron" npm_config_dist_url: "https://electronjs.org/headers" diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 59353c96e..e5c5b36ce 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -49,7 +49,7 @@ jobs: # node-version: '12' - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - uses: actions/cache@v2 id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) with: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f7012ef1e..000000000 --- a/.travis.yml +++ /dev/null @@ -1,90 +0,0 @@ -os: - - linux - - osx -# macos version - this is the current -osx_image: xcode9.4 -# linux dist -dist: trusty -language: node_js -node_js: - - '15' - - '14' - - '12' -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - # Those are the defaults for trusty release on TravisCI - - gcc-4.8 - - g++-4.8 -matrix: - fast_finish: true - # allow_failures: - # - node_js: "11" - include: - - os: osx - env: LIBCURL_RELEASE=7.73.0 LATEST_LIBCURL_RELEASE=7.73.0 ELECTRON_VERSION=12.0.0 - - os: osx - env: LIBCURL_RELEASE=7.73.0 LATEST_LIBCURL_RELEASE=7.73.0 ELECTRON_VERSION=11.2.3 - - os: osx - env: LIBCURL_RELEASE=7.73.0 LATEST_LIBCURL_RELEASE=7.73.0 ELECTRON_VERSION=10.1.0 - - os: osx - env: LIBCURL_RELEASE=7.73.0 LATEST_LIBCURL_RELEASE=7.73.0 ELECTRON_VERSION=9.3.3 - - os: osx - env: LIBCURL_RELEASE=7.73.0 LATEST_LIBCURL_RELEASE=7.73.0 ELECTRON_VERSION=8.5.3 - - os: osx - env: LIBCURL_RELEASE=7.73.0 LATEST_LIBCURL_RELEASE=7.73.0 NWJS_VERSION=0.52.0 - - os: osx - env: LIBCURL_RELEASE=7.73.0 LATEST_LIBCURL_RELEASE=7.73.0 NWJS_VERSION=0.51.2 - - os: osx - env: LIBCURL_RELEASE=7.73.0 LATEST_LIBCURL_RELEASE=7.73.0 NWJS_VERSION=0.49.2 -env: - global: - - GCC_VERSION=4.8 - - secure: d64E8XbVGHuQ0kls1oVUF1y6pnj3iqZB34roKBHAFTyWBXReC1FWLb+qEShCJicUDkeK2At7vQUz7ohMn2mL/hVXiRbuSaYuDKFx8iDeei9mTgE+iy258mSovnNvXfG72EP5+LB+UOhgmTGe0qyTALOQ6ceCgjdscul3IGWE8lw= - matrix: - - LIBCURL_RELEASE=7.73.0 LATEST_LIBCURL_RELEASE=7.73.0 - - LIBCURL_RELEASE=7.50.0 - -cache: - directories: - - $HOME/.node-gyp - - $HOME/.nw-gyp - - $HOME/.npm - - $HOME/.cache/electron - - $HOME/.cache/yarn - - $HOME/deps - # macOS Electron cache - - $HOME/Library/Caches/electron - -git: - depth: 10 - submodules: false - -# disable redundancy when building PRs -branches: - only: - - master - - develop - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ - -before_install: - # Use latest yarn - - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.15.2 - - export PATH=$HOME/.yarn/bin:$PATH - - if [[ $TRAVIS_OS_NAME == "linux" ]]; then - export CC="gcc-${GCC_VERSION}"; - export CXX="g++-${GCC_VERSION}"; - export LINK="gcc-${GCC_VERSION}"; - export LINKXX="g++-${GCC_VERSION}"; - fi - - if [[ $TRAVIS_PULL_REQUEST != "false" ]]; then - export PUBLISH_BINARY="false"; - fi - - export PATH=$HOME/bin:$PATH - - yarn --version - - node --version -install: - - GIT_TAG=$TRAVIS_TAG GIT_COMMIT=$TRAVIS_COMMIT ./scripts/ci/build.sh -script: true diff --git a/package.json b/package.json index d0c0d98cd..d91c455ef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@getinsomnia/node-libcurl", - "version": "2.3.5-2", + "version": "2.3.5-4", "description": "The fastest http(s) client (and much more) for Node.js - Node.js bindings for libcurl", "keywords": [ "node-curl", @@ -77,8 +77,8 @@ "dependencies": { "@mapbox/node-pre-gyp": "1.0.5", "env-paths": "2.2.0", - "nan": "2.15.0", - "node-gyp": "7.1.2", + "nan": "2.17.0", + "node-gyp": "8.4.0", "npmlog": "4.1.2", "rimraf": "^3.0.2", "tslib": "2.0.1" diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index 7f632dd7e..f7ff6aea5 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -105,7 +105,11 @@ ls -al $LIBIDN2_BUILD_FOLDER/lib # Build OpenSSL ################### # OpenSSL version must match Node.js one -OPENSSL_RELEASE=${OPENSSL_RELEASE:-$(node -e "console.log(process.versions.openssl.replace('+quic', ''))")} +## OPENSSL_RELEASE=${OPENSSL_RELEASE:-$(node -e "console.log(process.versions.openssl.replace('+quic', ''))")} + +# Forcing release to be 1.1.1r +OPENSSL_RELEASE=1.1.1r + OPENSSL_DEST_FOLDER=$PREFIX_DIR/deps/openssl # We must pass KERNEL_BITS=64 on macOS to make sure a x86_64 lib is built, the default is to build an i386 one @@ -121,6 +125,7 @@ echo "Building openssl v$OPENSSL_RELEASE" # Weird concatenation of the array with itself is needed # because on bash <= 4, using [@] to access an array with 0 elements # gives an error with set -o pipefail +echo "[DEBUG] ./scripts/ci/build-openssl.sh $OPENSSL_RELEASE $OPENSSL_DEST_FOLDER ${openssl_params+\"${openssl_params[@]}\"} >$LOGS_FOLDER/build-openssl.log 2>&1" ./scripts/ci/build-openssl.sh $OPENSSL_RELEASE $OPENSSL_DEST_FOLDER ${openssl_params+"${openssl_params[@]}"} >$LOGS_FOLDER/build-openssl.log 2>&1 export OPENSSL_BUILD_FOLDER=$OPENSSL_DEST_FOLDER/build/$OPENSSL_RELEASE ls -al $OPENSSL_BUILD_FOLDER/lib* diff --git a/src/Easy.cc b/src/Easy.cc index 5403f642b..68ac78fd6 100644 --- a/src/Easy.cc +++ b/src/Easy.cc @@ -2162,7 +2162,7 @@ NAN_METHOD(Easy::GetInfo) { curr = linkedList; while (curr) { - auto value = arr->Set(arr->CreationContext(), arr->Length(), + auto value = arr->Set(arr->GetCreationContext().ToLocalChecked(), arr->Length(), Nan::New(curr->data).ToLocalChecked()); if (value.IsJust()) { curr = curr->next; @@ -2196,7 +2196,7 @@ NAN_METHOD(Easy::GetInfo) { curr = linkedList; while (curr) { - auto value = arr->Set(arr->CreationContext(), arr->Length(), + auto value = arr->Set(arr->GetCreationContext().ToLocalChecked(), arr->Length(), Nan::New(curr->data).ToLocalChecked()); if (value.IsJust()) { curr = curr->next; diff --git a/yarn.lock b/yarn.lock index 44f4963f6..6c0203678 100644 --- a/yarn.lock +++ b/yarn.lock @@ -382,6 +382,11 @@ reflect-metadata "^0.1.12" tslib "^1.8.1" +"@gar/promisify@^1.0.1": + 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== + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -477,6 +482,22 @@ "@nodelib/fs.scandir" "2.1.3" 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/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" + "@rushstack/node-core-library@3.34.3": version "3.34.3" resolved "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.34.3.tgz#a59a1e452dcc79bd4e5f0840b4e9603551668f85" @@ -542,6 +563,11 @@ dependencies: defer-to-connect "^2.0.0" +"@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== + "@types/argparse@1.0.38": version "1.0.38" resolved "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz#a81fd8606d481f873a3800c6ebae4f1d768a56a9" @@ -824,13 +850,22 @@ acorn@^7.4.0: resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c" integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w== -agent-base@6: +agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== dependencies: debug "4" +agentkeepalive@^4.1.3: + version "4.2.1" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" + integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== + dependencies: + debug "^4.1.0" + depd "^1.1.2" + humanize-ms "^1.2.1" + aggregate-error@^3.0.0: version "3.1.0" resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" @@ -1203,6 +1238,30 @@ bytes@3.1.0: resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== +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" + cacheable-lookup@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz#87be64a18b925234875e10a9bb1ebca4adce6b38" @@ -1704,6 +1763,13 @@ debug@^4.1.0: dependencies: ms "2.1.2" +debug@^4.3.3: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + decamelize-keys@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" @@ -1793,10 +1859,10 @@ delegates@^1.0.0: resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -depd@~1.1.2: +depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== destroy@~1.0.4: version "1.0.4" @@ -1979,6 +2045,13 @@ encodeurl@~1.0.2: resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= +encoding@^0.1.12: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + end-of-stream@^1.1.0: version "1.4.4" resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -2008,6 +2081,11 @@ env-paths@2.2.0, env-paths@^2.2.0: resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.2" resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -2868,10 +2946,10 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== -graceful-fs@^4.2.3: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== +graceful-fs@^4.2.6: + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== growl@1.10.5: version "1.10.5" @@ -3009,7 +3087,7 @@ http-auth@^4.1.2: bcryptjs "^2.4.3" uuid "^3.4.0" -http-cache-semantics@^4.0.0: +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== @@ -3036,6 +3114,15 @@ http-errors@~1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.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-signature@~1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" @@ -3058,6 +3145,13 @@ human-signals@^1.1.1: resolved "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== +humanize-ms@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== + dependencies: + ms "^2.0.0" + husky@^4.3.0: version "4.3.0" resolved "https://registry.npmjs.org/husky/-/husky-4.3.0.tgz#0b2ec1d66424e9219d359e26a51c58ec5278f0de" @@ -3081,6 +3175,13 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + ignore@^4.0.6: version "4.0.6" resolved "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -3124,6 +3225,11 @@ indent-string@^4.0.0: resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== +infer-owner@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" + integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== + inflight@^1.0.4: version "1.0.6" resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -3204,6 +3310,11 @@ inversify@^5.0.0: resolved "https://registry.npmjs.org/inversify/-/inversify-5.0.1.tgz#500d709b1434896ce5a0d58915c4a4210e34fb6e" integrity sha512-Ieh06s48WnEYGcqHepdsJUIJUXpwH5o5vodAX+DK2JA/gjy4EbEcQZxw+uFfzysmKjiLXGYwNG3qDZsKVMcINQ== +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== + ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" @@ -3295,6 +3406,11 @@ is-installed-globally@^0.3.1: global-dirs "^2.0.1" is-path-inside "^3.0.1" +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== + is-npm@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" @@ -3936,6 +4052,28 @@ make-error@^1.1.1: resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== +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.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" @@ -4105,6 +4243,45 @@ minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + 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-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.2, 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== + dependencies: + minipass "^3.0.0" + +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + minipass@^3.0.0: version "3.1.3" resolved "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" @@ -4112,7 +4289,14 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" -minizlib@^2.1.1: +minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: + version "3.3.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae" + integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw== + dependencies: + yallist "^4.0.0" + +minizlib@^2.0.0, minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -4134,7 +4318,7 @@ mkdirp@^0.5.1, mkdirp@^0.5.3: dependencies: minimist "^1.2.5" -mkdirp@^1.0.3: +mkdirp@^1.0.3, mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== @@ -4184,6 +4368,11 @@ ms@2.1.2, ms@^2.1.1: resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.0.0: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + mute-stream@0.0.7: version "0.0.7" resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" @@ -4194,10 +4383,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.15.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" - integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== +nan@2.17.0: + version "2.17.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" + integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== natural-compare@^1.4.0: version "1.4.0" @@ -4209,6 +4398,11 @@ negotiator@0.6.2: resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +negotiator@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + neo-async@^2.6.0: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" @@ -4236,20 +4430,20 @@ node-fetch@^2.6.1: dependencies: whatwg-url "^5.0.0" -node-gyp@7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" - integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== +node-gyp@8.4.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.0.tgz#6e1112b10617f0f8559c64b3f737e8109e5a8338" + integrity sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q== dependencies: env-paths "^2.2.0" glob "^7.1.4" - graceful-fs "^4.2.3" + graceful-fs "^4.2.6" + make-fetch-happen "^9.1.0" nopt "^5.0.0" npmlog "^4.1.2" - request "^2.88.2" rimraf "^3.0.2" - semver "^7.3.2" - tar "^6.0.2" + semver "^7.3.5" + tar "^6.1.2" which "^2.0.2" node-preload@^0.2.1: @@ -4852,6 +5046,19 @@ progress@^2.0.0, progress@^2.0.3: resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== +promise-inflight@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" + integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== + +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + proxy-addr@~2.0.5: version "2.0.6" resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" @@ -5053,7 +5260,7 @@ release-zalgo@^1.0.0: dependencies: es6-error "^4.0.1" -request@^2.72.0, request@^2.88.2: +request@^2.72.0: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -5150,6 +5357,11 @@ restore-cursor@^3.1.0: onetime "^5.1.0" signal-exit "^3.0.2" +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== + reusify@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" @@ -5212,7 +5424,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -5266,6 +5478,13 @@ semver@^7.3.4: 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" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== + dependencies: + lru-cache "^6.0.0" + send@0.17.1: version "0.17.1" resolved "https://registry.npmjs.org/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -5412,6 +5631,28 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" +smart-buffer@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +socks-proxy-agent@^6.0.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce" + integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ== + dependencies: + agent-base "^6.0.2" + debug "^4.3.3" + socks "^2.6.2" + +socks@^2.6.2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== + dependencies: + ip "^2.0.0" + smart-buffer "^4.2.0" + sort-object-keys@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45" @@ -5519,6 +5760,13 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" +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" + "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" @@ -5746,7 +5994,7 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -tar@^6.0.2, tar@^6.1.0: +tar@^6.0.2, 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== @@ -6101,6 +6349,20 @@ uglify-js@^3.1.4: resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113" integrity sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw== +unique-filename@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" + integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== + dependencies: + unique-slug "^2.0.0" + +unique-slug@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" + integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== + dependencies: + imurmurhash "^0.1.4" + unique-string@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"