From b96681989ee77343398db42eeb169e42417dbde2 Mon Sep 17 00:00:00 2001 From: Roy Razon Date: Tue, 9 Jan 2024 16:56:48 +0200 Subject: [PATCH] switch from pkg to oclif pack --- .github/workflows/gh-release.yaml | 114 ++++--- Dockerfile.cli | 31 -- packages/cli/.github/dependabot.yml | 22 -- packages/cli/.github/workflows/automerge.yml | 10 - .../workflows/failureNotifications.yml | 43 --- .../cli/.github/workflows/manualRelease.yml | 36 --- .../workflows/notify-slack-on-pr-open.yml | 23 -- .../cli/.github/workflows/onPushToMain.yml | 18 -- packages/cli/.github/workflows/onRelease.yml | 19 -- packages/cli/.github/workflows/test.yml | 9 - packages/cli/.gitignore | 1 + packages/cli/.nvmrc | 2 +- packages/cli/bin/dev.cmd | 2 +- packages/cli/bin/dev.js | 2 +- packages/cli/bin/run.cmd | 2 +- packages/cli/bin/run.js | 2 +- packages/cli/package.json | 30 +- .../core/src/compose-tunnel-agent-client.ts | 36 +-- packages/core/src/pkg.ts | 33 -- patches/pkg+5.8.1.patch | 20 -- yarn.lock | 287 +++--------------- 21 files changed, 145 insertions(+), 597 deletions(-) delete mode 100644 Dockerfile.cli delete mode 100644 packages/cli/.github/dependabot.yml delete mode 100644 packages/cli/.github/workflows/automerge.yml delete mode 100644 packages/cli/.github/workflows/failureNotifications.yml delete mode 100644 packages/cli/.github/workflows/manualRelease.yml delete mode 100644 packages/cli/.github/workflows/notify-slack-on-pr-open.yml delete mode 100644 packages/cli/.github/workflows/onPushToMain.yml delete mode 100644 packages/cli/.github/workflows/onRelease.yml delete mode 100644 packages/cli/.github/workflows/test.yml delete mode 100644 packages/core/src/pkg.ts delete mode 100644 patches/pkg+5.8.1.patch diff --git a/.github/workflows/gh-release.yaml b/.github/workflows/gh-release.yaml index 9376a0aa..36f48499 100644 --- a/.github/workflows/gh-release.yaml +++ b/.github/workflows/gh-release.yaml @@ -9,64 +9,86 @@ on: jobs: build-binaries: - runs-on: macos-latest + runs-on: ubuntu-latest permissions: - contents: read + contents: write id-token: write - strategy: - matrix: - arch: [x64,arm64] - platform: [linux,macos,win] - exclude: - - platform: win - arch: arm64 + env: + TARBALL_TARGETS: linux-x64,linux-arm64,darwin-x64,darwin-arm64,win32-x64 steps: - name: Checkout uses: actions/checkout@v4 - - uses: depot/setup-action@v1 - with: - oidc: true - - name: Build using Docker (with depot) - run: mkdir preevy-bin && depot build --project ${{ vars.DEPOT_PROJECT_ID }} --build-arg CLI_TARGET=${{ matrix.platform }}-${{ matrix.arch }} -f Dockerfile.cli --target=cli --output=type=tar,dest=./preevy-bin/preevy-${{ matrix.platform }}-${{ matrix.arch }}.tar --progress=plain --platform=linux/${{ matrix.arch == 'x64' && 'amd64' || matrix.arch }} . + - uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.AWS_ROLE }} + aws-region: us-west-2 - - uses: apple-actions/import-codesign-certs@v2 - if: ${{ matrix.platform == 'macos' }} + - uses: actions/setup-node@v4 with: - p12-file-base64: ${{ secrets.APPLE_CERT_DATA }} - p12-password: ${{ secrets.APPLE_CERT_PASS }} + node-version: '18.x' + cache: yarn + + - run: yarn + + - run: yarn build - - name: Sign mac binaries - if: ${{ matrix.platform == 'macos' }} - env: - CERT_CN: ${{ vars.APPLE_CERT_CN }} + - name: Find packaged node version + id: find_packaged_node_version + working-directory: packages/cli run: | - tar -xf ./preevy-bin/preevy-${{ matrix.platform }}-${{ matrix.arch }}.tar - codesign --remove-signature ./preevy - security find-identity -v - codesign --verbose=4 --sign "$CERT_CN" ./preevy - tar -cf ./preevy-bin/preevy-${{ matrix.platform }}-${{ matrix.arch }}.tar ./preevy - - - name: Upload artifacts - uses: actions/upload-artifact@v4 - with: - name: preevy-bin-${{ matrix.platform }}-${{ matrix.arch }} - path: ./preevy-bin/** + echo "NODE_VERSION=$(jq -r .oclif.update.node.version package.json)" >> "${GITHUB_OUTPUT}" - release: - runs-on: ubuntu-latest - needs: build-binaries - steps: - - name: Checkout - uses: actions/checkout@v4 - - uses: depot/setup-action@v1 - - name: Download artifacts - uses: actions/download-artifact@v4 + - uses: actions/cache@v3 + id: cache-oclif-pack + name: Setup cache for oclif pack with: - pattern: preevy-bin-* - path: ./preevy-bin - merge-multiple: true + path: packages/cli/tmp/cache + key: preevy-oclif-pack-node-v${{ steps.find_packaged_node_version.outputs.NODE_VERSION }} + + - name: Pack tarballs + working-directory: packages/cli + run: yarn oclif pack tarballs --parallel --no-xz --targets $TARBALL_TARGETS + + - name: Upload tarballs + working-directory: packages/cli + run: yarn oclif upload tarballs --no-xz --targets $TARBALL_TARGETS + + - name: Create redirects to version without git sha + # if: startsWith(github.ref, 'refs/tags/') + working-directory: packages/cli + run: | + bucket="$(jq -r .oclif.update.s3.bucket package.json)" + version=$(jq -r .version package.json) + git_sha="$(git rev-parse --short HEAD)" + + temp_file="${RUNNER_TEMP}/redir_${RANDOM}" + + function create_s3_redirect() { + local from=$1 + local to=$2 + echo "Redirecting to ${to}" > "${temp_file}" + echo "Creating redirect from ${from} to ${to}" + aws s3 cp "${temp_file}" "s3://${bucket}${from}" --quiet --website-redirect "${to}" --acl public-read + } + + for target in ${TARBALL_TARGETS//,/ }; do + for suffix in .tar.gz -buildmanifest; do + create_s3_redirect /versions/${version}/preevy-v${version}-${target}${suffix} /versions/${version}/preevy-v${version}-${git_sha}-${target}${suffix} + done + done + + - name: Rename tarballs + # if: startsWith(github.ref, 'refs/tags/') + working-directory: packages/cli/dist + run: | + git_sha="$(git rev-parse --short HEAD)" + for f in $(find . -maxdepth 1 -type f -name 'preevy-v*'); do + new_name="$(echo ${f} | sed 's/-'"${git_sha}"'//')" + echo "Renaming ${f} to ${new_name}" + mv "${f}" "${new_name}" + done - name: Release uses: softprops/action-gh-release@v1 @@ -75,4 +97,4 @@ jobs: draft: ${{ !startsWith(github.ref, 'refs/tags/') }} prerelease: ${{ !startsWith(github.ref, 'refs/tags/') }} files: | - ./preevy-bin/** + packages/cli/dist/preevy-v*.tar.gz diff --git a/Dockerfile.cli b/Dockerfile.cli deleted file mode 100644 index 693260c4..00000000 --- a/Dockerfile.cli +++ /dev/null @@ -1,31 +0,0 @@ -FROM node:18-bullseye as base -FROM base as deps-files -WORKDIR /app -COPY --link yarn.lock package.json . -COPY --link packages packages -RUN find . -type f -not -iname "yarn.lock" -not -iname "package.json" -delete && find . -type l -delete && find . -type d -empty -delete -COPY --link patches patches - -FROM base as builder -WORKDIR /app -COPY --link --from=deps-files /app /app -RUN --mount=type=cache,id=livecycle/preevy-cli/yarn-cache,target=/yarn/cache \ - yarn --cache-folder=/yarn/cache -COPY --link . . -RUN yarn build - -FROM builder as pkg -ARG CLI_TARGET=macos-arm64 -WORKDIR /app/packages/cli -ENV PKG_CACHE_PATH=/pkg/cache -RUN --mount=type=cache,id=livecycle/preevy-cli/pkg-cache,target=/pkg/cache \ - yarn pkg --compress GZip --no-dict --public --public-packages tslib --options max_old_space_size=4096 -t node18-${CLI_TARGET} . --out-path /preevy/bin - -FROM scratch as cli -ARG CLI_TARGET=macos-arm64 -COPY --link --from=pkg /preevy/bin/* / -# use docker buildx build -f Dockerfile.cli --target=cli . --output=type=local,dest=./dist - -FROM docker:24-cli as release -COPY --from=pkg /preevy/bin/* /usr/bin/ -CMD [ "preevy" ] diff --git a/packages/cli/.github/dependabot.yml b/packages/cli/.github/dependabot.yml deleted file mode 100644 index 0ef035df..00000000 --- a/packages/cli/.github/dependabot.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: 2 -updates: - - package-ecosystem: 'npm' - directory: '/' - schedule: - interval: 'weekly' - day: 'saturday' - versioning-strategy: 'increase' - labels: - - 'dependencies' - open-pull-requests-limit: 5 - pull-request-branch-name: - separator: '-' - commit-message: - # cause a release for non-dev-deps - prefix: fix(deps) - # no release for dev-deps - prefix-development: chore(dev-deps) - ignore: - - dependency-name: '@salesforce/dev-scripts' - - dependency-name: '*' - update-types: ['version-update:semver-major'] diff --git a/packages/cli/.github/workflows/automerge.yml b/packages/cli/.github/workflows/automerge.yml deleted file mode 100644 index 796eafae..00000000 --- a/packages/cli/.github/workflows/automerge.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: automerge -on: - workflow_dispatch: - schedule: - - cron: '17 2,5,8,11 * * *' - -jobs: - automerge: - uses: oclif/github-workflows/.github/workflows/automerge.yml@main - secrets: inherit diff --git a/packages/cli/.github/workflows/failureNotifications.yml b/packages/cli/.github/workflows/failureNotifications.yml deleted file mode 100644 index 6b4118fc..00000000 --- a/packages/cli/.github/workflows/failureNotifications.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: failureNotifications - -on: - workflow_run: - workflows: - - version, tag and github release - - publish - types: - - completed - -jobs: - failure-notify: - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'failure' }} - steps: - - name: Announce Failure - id: slack - uses: slackapi/slack-github-action@v1.21.0 - env: - # for non-CLI-team-owned plugins, you can send this anywhere you like - SLACK_WEBHOOK_URL: ${{ secrets.CLI_ALERTS_SLACK_WEBHOOK }} - SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK - with: - payload: | - { - "text": "${{ github.event.workflow_run.name }} failed: ${{ github.event.workflow_run.repository.name }}", - "blocks": [ - { - "type": "header", - "text": { - "type": "plain_text", - "text": ":bh-alert: ${{ github.event.workflow_run.name }} failed: ${{ github.event.workflow_run.repository.name }} :bh-alert:" - } - }, - { - "type": "section", - "text": { - "type": "mrkdwn", - "text": "Repo: ${{ github.event.workflow_run.repository.html_url }}\nWorkflow name: `${{ github.event.workflow_run.name }}`\nJob url: ${{ github.event.workflow_run.html_url }}" - } - } - ] - } diff --git a/packages/cli/.github/workflows/manualRelease.yml b/packages/cli/.github/workflows/manualRelease.yml deleted file mode 100644 index 8ceb52c3..00000000 --- a/packages/cli/.github/workflows/manualRelease.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: manual release - -on: - workflow_dispatch: - -jobs: - release: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - token: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }} - - name: Conventional Changelog Action - id: changelog - uses: TriPSs/conventional-changelog-action@d360fad3a42feca6462f72c97c165d60a02d4bf2 - # overriding some of the basic behaviors to just get the changelog - with: - git-user-name: svc-cli-bot - git-user-email: svc_cli_bot@salesforce.com - github-token: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }} - output-file: false - # always do the release, even if there are no semantic commits - skip-on-empty: false - tag-prefix: '' - - uses: notiz-dev/github-action-json-property@2192e246737701f108a4571462b76c75e7376216 - id: packageVersion - with: - path: 'package.json' - prop_path: 'version' - - name: Create Github Release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }} - with: - tag_name: ${{ steps.packageVersion.outputs.prop }} - release_name: ${{ steps.packageVersion.outputs.prop }} diff --git a/packages/cli/.github/workflows/notify-slack-on-pr-open.yml b/packages/cli/.github/workflows/notify-slack-on-pr-open.yml deleted file mode 100644 index 13b5c9e5..00000000 --- a/packages/cli/.github/workflows/notify-slack-on-pr-open.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Pull Request Slack Notification - -on: - pull_request: - types: [opened, reopened] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Notify Slack on PR open - env: - WEBHOOK_URL : ${{ secrets.CLI_TEAM_SLACK_WEBHOOK_URL }} - PULL_REQUEST_AUTHOR_ICON_URL : ${{ github.event.pull_request.user.avatar_url }} - PULL_REQUEST_AUTHOR_NAME : ${{ github.event.pull_request.user.login }} - PULL_REQUEST_AUTHOR_PROFILE_URL: ${{ github.event.pull_request.user.html_url }} - PULL_REQUEST_BASE_BRANCH_NAME : ${{ github.event.pull_request.base.ref }} - PULL_REQUEST_COMPARE_BRANCH_NAME : ${{ github.event.pull_request.head.ref }} - PULL_REQUEST_NUMBER : ${{ github.event.pull_request.number }} - PULL_REQUEST_REPO: ${{ github.event.pull_request.head.repo.name }} - PULL_REQUEST_TITLE : ${{ github.event.pull_request.title }} - PULL_REQUEST_URL : ${{ github.event.pull_request.html_url }} - uses: salesforcecli/github-workflows/.github/actions/prNotification@main diff --git a/packages/cli/.github/workflows/onPushToMain.yml b/packages/cli/.github/workflows/onPushToMain.yml deleted file mode 100644 index 61eda8ad..00000000 --- a/packages/cli/.github/workflows/onPushToMain.yml +++ /dev/null @@ -1,18 +0,0 @@ -# test -name: version, tag and github release - -on: - push: - branches: [main] - -jobs: - release: - uses: oclif/github-workflows/.github/workflows/githubRelease.yml@main - secrets: inherit - - # most repos won't use this - # depends on previous job to avoid git collisions, not for any functionality reason - # docs: - # uses: salesforcecli/github-workflows/.github/workflows/publishTypedoc.yml@main - # secrets: inherit - # needs: release diff --git a/packages/cli/.github/workflows/onRelease.yml b/packages/cli/.github/workflows/onRelease.yml deleted file mode 100644 index 8876db48..00000000 --- a/packages/cli/.github/workflows/onRelease.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: publish - -on: - release: - types: [released] - # support manual release in case something goes wrong and needs to be repeated or tested - workflow_dispatch: - inputs: - tag: - description: tag that needs to publish - type: string - required: true -jobs: - npm: - uses: oclif/github-workflows/.github/workflows/npmPublish.yml@main - with: - tag: latest - githubTag: ${{ github.event.release.tag_name || inputs.tag }} - secrets: inherit diff --git a/packages/cli/.github/workflows/test.yml b/packages/cli/.github/workflows/test.yml deleted file mode 100644 index 4286a556..00000000 --- a/packages/cli/.github/workflows/test.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: tests -on: - push: - branches-ignore: [main] - workflow_dispatch: - -jobs: - unit-tests: - uses: oclif/github-workflows/.github/workflows/unitTest.yml@main diff --git a/packages/cli/.gitignore b/packages/cli/.gitignore index 0e2ac517..9dc5c738 100644 --- a/packages/cli/.gitignore +++ b/packages/cli/.gitignore @@ -28,3 +28,4 @@ oclif.manifest.json *-debug.log *-error.log /.nyc_output +/tmp diff --git a/packages/cli/.nvmrc b/packages/cli/.nvmrc index e44a38e0..eb800ed4 100644 --- a/packages/cli/.nvmrc +++ b/packages/cli/.nvmrc @@ -1 +1 @@ -v18.12.1 +v18.19.0 diff --git a/packages/cli/bin/dev.cmd b/packages/cli/bin/dev.cmd index 8d003826..8fb50945 100644 --- a/packages/cli/bin/dev.cmd +++ b/packages/cli/bin/dev.cmd @@ -1,3 +1,3 @@ @echo off -node "%~dp0\dev.js" %* \ No newline at end of file +node --enable-source-maps --no-warnings=ExperimentalWarning "%~dp0\dev.js" %* \ No newline at end of file diff --git a/packages/cli/bin/dev.js b/packages/cli/bin/dev.js index 5d7d9285..56417ec0 100755 --- a/packages/cli/bin/dev.js +++ b/packages/cli/bin/dev.js @@ -1,4 +1,4 @@ -#!/usr/bin/env -S NODE_OPTIONS=--no-warnings=ExperimentalWarning\_--experimental-specifier-resolution=node ts-node --esm --swc +#!/usr/bin/env -S NODE_OPTIONS=--no-warnings=ExperimentalWarning\_--enable-source-maps=\_--experimental-specifier-resolution=node ts-node --esm --swc // eslint-disable-next-line node/shebang async function main() { await import('disposablestack/auto') diff --git a/packages/cli/bin/run.cmd b/packages/cli/bin/run.cmd index fdc38821..4e2b722f 100644 --- a/packages/cli/bin/run.cmd +++ b/packages/cli/bin/run.cmd @@ -1,3 +1,3 @@ @echo off -node "%~dp0\run.js" %* +node --enable-source-maps --no-warnings=ExperimentalWarning "%~dp0\run.js" %* diff --git a/packages/cli/bin/run.js b/packages/cli/bin/run.js index 9865c157..b700c37d 100755 --- a/packages/cli/bin/run.js +++ b/packages/cli/bin/run.js @@ -1,4 +1,4 @@ -#!/usr/bin/env -S node --no-warnings=ExperimentalWarning +#!/usr/bin/env -S node --no-warnings=ExperimentalWarning --enable-source-maps async function main() { await import('disposablestack/auto') const {execute} = await import('@oclif/core') diff --git a/packages/cli/package.json b/packages/cli/package.json index d3100227..8ba4c185 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -63,8 +63,7 @@ "eslint-plugin-react": "^7.32.2", "jest": "29.7.0", "lint-staged": "^15.2.0", - "oclif": "^4.1.0", - "pkg": "^5.8.1", + "oclif": "^4.2.0", "shx": "^0.3.3", "ts-node": "^10.9.1", "tsconfig-paths": "^4.2.0", @@ -92,20 +91,19 @@ "./dist/hooks/postrun/telemetry.js" ] }, - "topicSeparator": " " - }, - "pkg": { - "assets": [ - "../*/static/**/*", - "../compose-tunnel-agent/out/**/*", - "../compose-tunnel-agent/package.json", - "../compose-tunnel-agent/Dockerfile", - "../compose-tunnel-agent/.dockerignore" - ], - "scripts": [ - "dist/commands/**/*.js", - "dist/hooks/**/*.js" - ] + "topicSeparator": " ", + "update": { + "node": { + "version": "18.19.0", + "options": [ + "--no-warnings=ExperimentalWarning", + "--enable-source-maps" + ] + }, + "s3": { + "bucket": "releases.preevy.dev" + } + } }, "scripts": { "build": "yarn clean && tsc -b", diff --git a/packages/core/src/compose-tunnel-agent-client.ts b/packages/core/src/compose-tunnel-agent-client.ts index 4ca62817..a5cf9e86 100644 --- a/packages/core/src/compose-tunnel-agent-client.ts +++ b/packages/core/src/compose-tunnel-agent-client.ts @@ -10,33 +10,29 @@ import { Tunnel } from './tunneling/index.js' import { withBasicAuthCredentials } from './credentials/index.js' import { EnvMetadata, driverMetadataFilename } from './env-metadata.js' import { REMOTE_DIR_BASE } from './remote-files.js' -import { isPacked, pkgSnapshotDir } from './pkg.js' import { EnvId } from './env-id.js' import { addScriptInjectionsToServices } from './compose/script-injection.js' const require = createRequire(import.meta.url) const COMPOSE_TUNNEL_AGENT_DIR = path.join(path.dirname(require.resolve('@preevy/compose-tunnel-agent')), '..') -const baseDockerProxyService = () => { - const contextDir = isPacked() ? pkgSnapshotDir(path.join(import.meta.url, '../../compose-tunnel-agent')) : COMPOSE_TUNNEL_AGENT_DIR - return { - build: { - context: contextDir, - dockerfile: path.join(contextDir, 'Dockerfile'), - }, - ports: [ - { - mode: 'ingress', - target: COMPOSE_TUNNEL_AGENT_PORT, - published: '0', - protocol: 'tcp', - }, - ], - labels: { - [COMPOSE_TUNNEL_AGENT_SERVICE_LABELS.ACCESS]: 'private', +const baseDockerProxyService = () => ({ + build: { + context: COMPOSE_TUNNEL_AGENT_DIR, + dockerfile: path.join(COMPOSE_TUNNEL_AGENT_DIR, 'Dockerfile'), + }, + ports: [ + { + mode: 'ingress', + target: COMPOSE_TUNNEL_AGENT_PORT, + published: '0', + protocol: 'tcp', }, - } as ComposeService -} + ], + labels: { + [COMPOSE_TUNNEL_AGENT_SERVICE_LABELS.ACCESS]: 'private', + }, +} as ComposeService) export const addBaseComposeTunnelAgentService = ( model: ComposeModel, diff --git a/packages/core/src/pkg.ts b/packages/core/src/pkg.ts deleted file mode 100644 index 35d8f20e..00000000 --- a/packages/core/src/pkg.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { copyFileSync, existsSync, mkdirSync, mkdtempSync, readdirSync, statSync } from 'fs' -import { memoize } from 'lodash-es' -import { tmpdir } from 'os' -import path from 'path' - -declare let process : NodeJS.Process & { - pkg?: {} -} - -export const isPacked = () => process.pkg !== undefined - -export const pkgSnapshotDir = memoize((dir:string) => { - // can't use fs.cpSync because it's not patched by pkg (https://github.com/vercel/pkg/blob/bb042694e4289a1cbc530d2938babe35ccc84a93/prelude/bootstrap.js#L600) - const copyDirRecursiveSync = (sourceDir: string, targetDir:string) => { - if (!existsSync(targetDir)) { - mkdirSync(targetDir) - } - const files = readdirSync(sourceDir) - for (const file of files) { - const sourcePath = path.join(sourceDir, file) - const targetPath = path.join(targetDir, file) - const stat = statSync(sourcePath) - if (stat.isDirectory()) { - copyDirRecursiveSync(sourcePath, targetPath) - } else { - copyFileSync(sourcePath, targetPath) - } - } - } - const dest = mkdtempSync(path.join(tmpdir(), path.basename(dir))) - copyDirRecursiveSync(dir, dest) - return dest -}) diff --git a/patches/pkg+5.8.1.patch b/patches/pkg+5.8.1.patch deleted file mode 100644 index a54412e5..00000000 --- a/patches/pkg+5.8.1.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/node_modules/pkg/prelude/bootstrap.js b/node_modules/pkg/prelude/bootstrap.js -index 034bd15..5913878 100644 ---- a/node_modules/pkg/prelude/bootstrap.js -+++ b/node_modules/pkg/prelude/bootstrap.js -@@ -700,7 +700,14 @@ function payloadFileSync(pointer) { - fs.rmdirSync(folder, { recursive: true }); - } - } else { -- fs.rmSync(folder, { recursive: true }); -+ try { -+ fs.rmSync(folder, { recursive: true, }); -+ } catch (e){ -+ if (e.code !== "ENOENT"){ -+ throw e -+ } -+ } -+ - } - } - const temporaryFiles = {}; diff --git a/yarn.lock b/yarn.lock index 6e36ef59..b7d3c478 100644 --- a/yarn.lock +++ b/yarn.lock @@ -898,15 +898,6 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/generator@7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d" - integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw== - dependencies: - "@babel/types" "^7.18.2" - "@jridgewell/gen-mapping" "^0.3.0" - jsesc "^2.5.1" - "@babel/generator@^7.21.0", "@babel/generator@^7.7.2": version "7.21.1" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz#951cc626057bc0af2c35cd23e9c64d384dea83dd" @@ -1010,16 +1001,16 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-string-parser@^7.18.10", "@babel/helper-string-parser@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" - integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== - "@babel/helper-string-parser@^7.19.4": version "7.19.4" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== +"@babel/helper-string-parser@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" + integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== + "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": version "7.19.1" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" @@ -1030,11 +1021,6 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== -"@babel/helper-validator-identifier@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" - integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== - "@babel/helper-validator-option@^7.18.6": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" @@ -1067,11 +1053,6 @@ chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/parser@7.18.4": - version "7.18.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef" - integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow== - "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.0": version "7.21.2" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz#dacafadfc6d7654c3051a66d6fe55b6cb2f2a0b3" @@ -1221,15 +1202,6 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.0.tgz#75f21d73d73dc0351f3368d28db73465f4814600" - integrity sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA== - dependencies: - "@babel/helper-string-parser" "^7.18.10" - "@babel/helper-validator-identifier" "^7.18.6" - to-fast-properties "^2.0.0" - "@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3": version "7.21.2" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.2.tgz#92246f6e00f91755893c2876ad653db70c8310d1" @@ -1239,15 +1211,6 @@ "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" -"@babel/types@^7.18.2": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe" - integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA== - dependencies: - "@babel/helper-string-parser" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.5" - to-fast-properties "^2.0.0" - "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb" @@ -2069,15 +2032,6 @@ "@jridgewell/set-array" "^1.0.0" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/gen-mapping@^0.3.0": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" - integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== - dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - "@jridgewell/gen-mapping@^0.3.2": version "0.3.2" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" @@ -2577,7 +2531,7 @@ resolved "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-17.2.6.tgz#07fde42a0fe1f8f103aa7afd1db83cb76a72951f" integrity sha512-LrJySMWrO5oWMrP4VOWM1hr3c4rtxHGCcRy19VwqvaAPDrnsg0qfPjv4q1C9YyIU8sj+T3oJs1yZdnNntlN8ew== -"@oclif/core@^2.15.0", "@oclif/core@^3.0.4", "@oclif/core@^3.11.0", "@oclif/core@^3.15.1": +"@oclif/core@^2.15.0", "@oclif/core@^3.15.1", "@oclif/core@^3.16.0": version "3.15.1" resolved "https://registry.npmjs.org/@oclif/core/-/core-3.15.1.tgz#e03fa775d658e76056150ac0c7b8097b6f51ab9c" integrity sha512-d4457zVo2agLoJG97CmdY6M3BeP5sogBP3BtP65hUvJH6wA6Us1hdY3UiPPtD/ZzZImq7cATVMABuCF9tM+rWA== @@ -2610,28 +2564,35 @@ wordwrap "^1.0.0" wrap-ansi "^7.0.0" -"@oclif/plugin-help@^5", "@oclif/plugin-help@^5.2.14": +"@oclif/plugin-help@^5": version "5.2.20" resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-5.2.20.tgz#4035a0ac231f95fb8e334da342175e3ca00f6abc" integrity sha512-u+GXX/KAGL9S10LxAwNUaWdzbEBARJ92ogmM7g3gDVud2HioCmvWQCDohNRVZ9GYV9oKwZ/M8xwd6a1d95rEKQ== dependencies: "@oclif/core" "^2.15.0" -"@oclif/plugin-not-found@^2.3.32": - version "2.4.3" - resolved "https://registry.yarnpkg.com/@oclif/plugin-not-found/-/plugin-not-found-2.4.3.tgz#3d24095adb0f3876cb4bcfdfdcb775086cf6d4b5" - integrity sha512-nIyaR4y692frwh7wIHZ3fb+2L6XEecQwRDIb4zbEam0TvaVmBQWZoColQyWA84ljFBPZ8XWiQyTz+ixSwdRkqg== +"@oclif/plugin-help@^6.0.9": + version "6.0.10" + resolved "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-6.0.10.tgz#3a38e94a3f431a2b398679a433ace76a2d0c320d" + integrity sha512-vgAcEVtwsI49H/TllBL/7YlQvUSjR3+nVxb0ipSmbHbEUw5p5q6fcNc3R+N9JHvaa4tc8tjyg35APZAKSaM6xw== dependencies: - "@oclif/core" "^2.15.0" - chalk "^4" + "@oclif/core" "^3.16.0" + +"@oclif/plugin-not-found@^3.0.7": + version "3.0.8" + resolved "https://registry.npmjs.org/@oclif/plugin-not-found/-/plugin-not-found-3.0.8.tgz#d694a9308993703a1cbacbab7f5625315f0169ea" + integrity sha512-sfh7jFc+1vFsF/+9ghF3pVul9xFJ4Hu1JI+KzkDjgWkfVSyPSEE+s6Hfn2z6lCXkwSKQ5lJATuZmafnGes7NGg== + dependencies: + "@oclif/core" "^3.16.0" + chalk "^5.3.0" fast-levenshtein "^3.0.0" -"@oclif/plugin-warn-if-update-available@^3.0.0": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-3.0.3.tgz#0609096a5272ffc97124111453825a33e899ae6f" - integrity sha512-p9Ai5olqj52NTndtntFbVreRCtJg9dgnfAl5Zi6hmIpgzVtPYDxLwa3PnMufKFc3fUkno5xnJ0TsKfxt0QruDw== +"@oclif/plugin-warn-if-update-available@^3.0.8": + version "3.0.9" + resolved "https://registry.npmjs.org/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-3.0.9.tgz#f4346f4040adf71d0a120381de2fe4c8411896fd" + integrity sha512-6XjYNJWWu6B4LyW73hzuM9Ihb23WamrABZhwYVJTVMBHdU30pRa1i3rvHCPfmn5c4iv8ZXudS/0zCNuhR121ng== dependencies: - "@oclif/core" "^3.11.0" + "@oclif/core" "^3.16.0" chalk "^5.3.0" debug "^4.1.0" http-call "^5.2.2" @@ -5448,7 +5409,7 @@ chalk@4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@4.1.2, chalk@^4, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: +chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -6173,11 +6134,6 @@ detect-indent@^5.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g== -detect-libc@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d" - integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw== - detect-newline@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" @@ -7055,11 +7011,6 @@ exit@^0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== -expand-template@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" - integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== - expect@^29.7.0: version "29.7.0" resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc" @@ -7431,14 +7382,6 @@ forwarded@0.2.0: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== -from2@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" - integrity sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g== - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.0" - fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" @@ -7471,7 +7414,7 @@ fs-extra@^8.1: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0.0, fs-extra@^9.1.0: +fs-extra@^9.0.0: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -7760,11 +7703,6 @@ gitconfiglocal@^1.0.0: dependencies: ini "^1.3.2" -github-from-package@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" - integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== - github-slugger@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.5.0.tgz#17891bbc73232051474d68bd867a34625c955f7d" @@ -8343,7 +8281,7 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@^1.3.2, ini@^1.3.8, ini@~1.3.0: +ini@^1.3.2, ini@^1.3.8: version "1.3.8" resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== @@ -8406,14 +8344,6 @@ interpret@^1.0.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== -into-stream@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-6.0.0.tgz#4bfc1244c0128224e18b8870e85b2de8e66c6702" - integrity sha512-XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA== - dependencies: - from2 "^2.3.0" - p-is-promise "^3.0.0" - ip@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" @@ -8492,13 +8422,6 @@ is-ci@3.0.1: dependencies: ci-info "^3.2.0" -is-core-module@2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" - integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== - dependencies: - has "^1.0.3" - is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0: version "2.13.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" @@ -10330,7 +10253,7 @@ minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2: minipass "^3.0.0" yallist "^4.0.0" -mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: +mkdirp-classic@^0.5.2: version "0.5.3" resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== @@ -10387,14 +10310,6 @@ multimatch@5.0.0, multimatch@^5.0.0: arrify "^2.0.1" minimatch "^3.0.4" -multistream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz#7bf00dfd119556fbc153cff3de4c6d477909f5a8" - integrity sha512-J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw== - dependencies: - once "^1.4.0" - readable-stream "^3.6.0" - mute-stream@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" @@ -10415,11 +10330,6 @@ nan@^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== -napi-build-utils@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" - integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== - natural-compare-lite@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" @@ -10453,13 +10363,6 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" -node-abi@^3.3.0: - version "3.45.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.45.0.tgz#f568f163a3bfca5aacfce1fbeee1fa2cc98441f5" - integrity sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ== - dependencies: - semver "^7.3.5" - node-fetch@2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" @@ -10467,7 +10370,7 @@ node-fetch@2.6.7: dependencies: whatwg-url "^5.0.0" -node-fetch@^2.6.1, node-fetch@^2.6.6, node-fetch@^2.6.7, node-fetch@^2.6.9: +node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.6.9: 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== @@ -10985,15 +10888,15 @@ obliterator@^2.0.1: resolved "https://registry.yarnpkg.com/obliterator/-/obliterator-2.0.4.tgz#fa650e019b2d075d745e44f1effeb13a2adbe816" integrity sha512-lgHwxlxV1qIg1Eap7LgIeoBWIMFibOjbrYPIPJZcI1mmGAI2m3lNYpK12Y+GBdPQ0U1hRwSord7GIaawz962qQ== -oclif@^4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/oclif/-/oclif-4.1.0.tgz#486004caf6da8af9f5bdda681a616b5b2c180b45" - integrity sha512-4E6z1HOdUYXHu/cbbSv0gnbFJfR9BGc9Oa+e9l8SkRoicGnrEPMpuZyY2vxWPGwMndN6ijxxuFlVmw1/j+MJpg== +oclif@^4.2.0: + version "4.2.0" + resolved "https://registry.npmjs.org/oclif/-/oclif-4.2.0.tgz#713b098704fbbf6ec59ffaae9af2167038434869" + integrity sha512-pqfc1R+tDNxlViQ6xYf79lGwMr7Erq2Bo4A5p5jMwJrbpHpIunsZXGifZV6V2f4wUTo1dcqjxP6Be8LmeI3Czw== dependencies: - "@oclif/core" "^3.0.4" - "@oclif/plugin-help" "^5.2.14" - "@oclif/plugin-not-found" "^2.3.32" - "@oclif/plugin-warn-if-update-available" "^3.0.0" + "@oclif/core" "^3.16.0" + "@oclif/plugin-help" "^6.0.9" + "@oclif/plugin-not-found" "^3.0.7" + "@oclif/plugin-warn-if-update-available" "^3.0.8" async-retry "^1.3.3" aws-sdk "^2.1231.0" change-case "^4" @@ -11130,11 +11033,6 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== -p-is-promise@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971" - integrity sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ== - p-limit@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" @@ -11603,40 +11501,6 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -pkg-fetch@3.4.2: - version "3.4.2" - resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.4.2.tgz#6f68ebc54842b73f8c0808959a9df3739dcb28b7" - integrity sha512-0+uijmzYcnhC0hStDjm/cl2VYdrmVVBpe7Q8k9YBojxmR5tG8mvR9/nooQq3QSXiQqORDVOTY3XqMEqJVIzkHA== - dependencies: - chalk "^4.1.2" - fs-extra "^9.1.0" - https-proxy-agent "^5.0.0" - node-fetch "^2.6.6" - progress "^2.0.3" - semver "^7.3.5" - tar-fs "^2.1.1" - yargs "^16.2.0" - -pkg@^5.8.1: - version "5.8.1" - resolved "https://registry.yarnpkg.com/pkg/-/pkg-5.8.1.tgz#862020f3c0575638ef7d1146f951a54d65ddc984" - integrity sha512-CjBWtFStCfIiT4Bde9QpJy0KeH19jCfwZRJqHFDFXfhUklCx8JoFmMj3wgnEYIwGmZVNkhsStPHEOnrtrQhEXA== - dependencies: - "@babel/generator" "7.18.2" - "@babel/parser" "7.18.4" - "@babel/types" "7.19.0" - chalk "^4.1.2" - fs-extra "^9.1.0" - globby "^11.1.0" - into-stream "^6.0.0" - is-core-module "2.9.0" - minimist "^1.2.6" - multistream "^4.1.0" - pkg-fetch "3.4.2" - prebuild-install "7.1.1" - resolve "^1.22.0" - stream-meter "^1.0.4" - pluralize@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" @@ -11647,24 +11511,6 @@ postinstall-postinstall@^2.1.0: resolved "https://registry.yarnpkg.com/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz#4f7f77441ef539d1512c40bd04c71b06a4704ca3" integrity sha512-7hQX6ZlZXIoRiWNrbMQaLzUUfH+sSx39u8EJ9HYuDc1kLo9IXKWjM5RSquZN1ad5GnH8CGFM78fsAAQi3OKEEQ== -prebuild-install@7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45" - integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw== - dependencies: - detect-libc "^2.0.0" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^3.3.0" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^4.0.0" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - preferred-pm@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/preferred-pm/-/preferred-pm-3.0.3.tgz#1b6338000371e3edbce52ef2e4f65eb2e73586d6" @@ -11724,11 +11570,6 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== -progress@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - promise-all-reject-late@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz#f8ebf13483e5ca91ad809ccc2fcf25f26f8643c2" @@ -11887,16 +11728,6 @@ ramda@^0.27.1: resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.2.tgz#84463226f7f36dc33592f6f4ed6374c48306c3f1" integrity sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA== -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - react-is@^16.13.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" @@ -12014,7 +11845,7 @@ read@^2.0.0: dependencies: mute-stream "~1.0.0" -readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.1.4, readable-stream@^2.3.5, readable-stream@~2.3.6: +readable-stream@^2.0.2, readable-stream@^2.3.5, readable-stream@~2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== @@ -12212,7 +12043,7 @@ resolve.exports@^2.0.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.0.tgz#c1a0028c2d166ec2fbf7d0644584927e76e7400e" integrity sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg== -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.4: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.20.0, resolve@^1.22.4: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -12567,20 +12398,6 @@ sigstore@^2.0.0: "@sigstore/sign" "^2.1.0" "@sigstore/tuf" "^2.1.0" -simple-concat@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" - integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== - -simple-get@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" - integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== - dependencies: - decompress-response "^6.0.0" - once "^1.3.1" - simple-concat "^1.0.0" - simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" @@ -12844,13 +12661,6 @@ stream-events@^1.0.5: dependencies: stubs "^3.0.0" -stream-meter@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/stream-meter/-/stream-meter-1.0.4.tgz#52af95aa5ea760a2491716704dbff90f73afdd1d" - integrity sha512-4sOEtrbgFotXwnEuzzsQBYEV1elAeFSO8rSGeTwabuX1RRn/kEq9JVH7I0MRBhKVRR0sJkr0M0QCH7yOLf9fhQ== - dependencies: - readable-stream "^2.1.4" - stream-shift@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" @@ -13052,11 +12862,6 @@ strip-json-comments@^3.1.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== - strnum@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db" @@ -13147,16 +12952,6 @@ syncpack@11.2.1: tightrope "0.1.0" ts-toolbelt "9.6.0" -tar-fs@^2.0.0, tar-fs@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.1.4" - tar-fs@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.1.tgz#e44086c1c60d31a4f0cf893b1c4e155dabfae9e2" @@ -13176,7 +12971,7 @@ tar-stream@3.0.0: bl "^6.0.0" streamx "^2.12.5" -tar-stream@^2.0.0, tar-stream@^2.1.4, tar-stream@~2.2.0: +tar-stream@^2.0.0, tar-stream@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==