From 29cfb93f1c6d6ec56411ff63ff19e46902c08989 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Wed, 28 Sep 2022 09:00:03 -0500 Subject: [PATCH 1/6] chore: circle => gha --- .github/workflows/automerge.yml | 12 +++++ .github/workflows/failureNotifications.yml | 43 +++++++++++++++++ .github/workflows/onPushToMain.yml | 18 +++++++ .github/workflows/onRelease.yml | 55 ++++++++++++++++++++++ .github/workflows/test.yml | 21 +++++++++ .github/workflows/validate-pr.yml | 11 +++++ 6 files changed, 160 insertions(+) create mode 100644 .github/workflows/automerge.yml create mode 100644 .github/workflows/failureNotifications.yml create mode 100644 .github/workflows/onPushToMain.yml create mode 100644 .github/workflows/onRelease.yml create mode 100644 .github/workflows/test.yml create mode 100644 .github/workflows/validate-pr.yml diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml new file mode 100644 index 00000000..42fa47d6 --- /dev/null +++ b/.github/workflows/automerge.yml @@ -0,0 +1,12 @@ +name: automerge +on: + workflow_dispatch: + schedule: + - cron: '42 2,5,8,11 * * *' + +jobs: + automerge: + uses: salesforcecli/github-workflows/.github/workflows/automerge.yml@main + secrets: inherit + with: + mergeMethod: squash diff --git a/.github/workflows/failureNotifications.yml b/.github/workflows/failureNotifications.yml new file mode 100644 index 00000000..7f4ab9e3 --- /dev/null +++ b/.github/workflows/failureNotifications.yml @@ -0,0 +1,43 @@ +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": "${{ github.event.workflow_run.name }} failed: ${{ github.event.workflow_run.repository.name }}" + } + }, + { + "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/.github/workflows/onPushToMain.yml b/.github/workflows/onPushToMain.yml new file mode 100644 index 00000000..b00f1cb7 --- /dev/null +++ b/.github/workflows/onPushToMain.yml @@ -0,0 +1,18 @@ +# test +name: version, tag and github release + +on: + push: + branches: [main] + +jobs: + release: + uses: salesforcecli/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/.github/workflows/onRelease.yml b/.github/workflows/onRelease.yml new file mode 100644 index 00000000..150199ce --- /dev/null +++ b/.github/workflows/onRelease.yml @@ -0,0 +1,55 @@ +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: salesforcecli/github-workflows/.github/workflows/npmPublish.yml@main + with: + ctc: true + sign: true + tag: prerelease + githubTag: ${{ github.event.release.tag_name || inputs.tag }} + secrets: inherit + canaries: + needs: [npm] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + # switched this from a docker container. GHA could probably use a Go image, but this may be more performant + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 1.14 + - name: Run canaries + run: | + TOKEN=$(curl -f -X POST ${{ secrets.RUNTIME_ID_SERVICETOKEN_ENDPOINT }} -d "{\"username\":\"${{ secrets.RUNTIME_ID_SERVICE_USERNAME }}\", \"password\":\"${{ secrets.RUNTIME_ID_SERVICE_PASSWORD }}\"}" -s --retry 3 | jq -r ".raw_id_token") + echo "$TOKEN" | docker login ${{ secrets.RUNTIME_REGISTRY }} -u x-runtime-id --password-stdin + + echo "running canary" + docker run -e HEROKU_API_TOKEN=${{ secrets.HEROKU_API_TOKEN }} \ + -e CIRCLECI_API_TOKEN=$CIRCLECI_API_TOKEN \ + runtime-registry.herokai.com/s/heroku/evergreen-canary-keeper/cli:v1.7.0 \ + evergreen-canary-keeper -run \ + -name eg-canary-function-cli \ + sfdx-cli-plugins="@salesforce/plugin-functions@prerelease" + npm-promote: + needs: [canaries] + runs-on: + ubuntu-latest + # if you try to use yarn here, it will attempt to use the wrong registry and throw 401s + steps: + - uses: actions/setup-node@v3 + with: + node-version: latest + - run: | + echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc + npm run promote-dist-tags diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 00000000..e572ff23 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,21 @@ +name: tests +on: + push: + branches-ignore: [main] + workflow_dispatch: + +jobs: + unit-tests: + uses: salesforcecli/github-workflows/.github/workflows/unitTest.yml@main + inclusion: + uses: salesforcecli/github-workflows/.github/workflows/inclusionTest.yml@main + nuts: + needs: unit-tests + uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main + secrets: inherit + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + fail-fast: false + with: + os: ${{ matrix.os }} diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml new file mode 100644 index 00000000..a312052e --- /dev/null +++ b/.github/workflows/validate-pr.yml @@ -0,0 +1,11 @@ +name: pr-validation + +on: + pull_request: + types: [opened, reopened, edited] + # only applies to PRs that want to merge to main + branches: [main] + +jobs: + pr-validation: + uses: salesforcecli/github-workflows/.github/workflows/validatePR.yml@main From 182c334cf7a1ad61b9621d10c9b0c10fba234adb Mon Sep 17 00:00:00 2001 From: mshanemc Date: Wed, 28 Sep 2022 09:28:03 -0500 Subject: [PATCH 2/6] ci: no nuts/secrets for tests --- .github/workflows/test.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e572ff23..ba4ae49a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,13 +9,3 @@ jobs: uses: salesforcecli/github-workflows/.github/workflows/unitTest.yml@main inclusion: uses: salesforcecli/github-workflows/.github/workflows/inclusionTest.yml@main - nuts: - needs: unit-tests - uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main - secrets: inherit - strategy: - matrix: - os: [ubuntu-latest, windows-latest] - fail-fast: false - with: - os: ${{ matrix.os }} From 5ed9520548b0bd5e8daa60230146ebb12fe35c86 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Wed, 28 Sep 2022 09:28:16 -0500 Subject: [PATCH 3/6] chore: standard files --- .github/dependabot.yml | 12 +++++++--- .github/workflows/manualRelease.yml | 36 +++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/manualRelease.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b9f81350..174b940e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,13 +3,19 @@ updates: - package-ecosystem: 'npm' directory: '/' schedule: - interval: 'monthly' + interval: 'weekly' + day: 'saturday' + versioning-strategy: 'increase' labels: - 'dependencies' - open-pull-requests-limit: 100 + 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: 'typescript' - dependency-name: '*' update-types: ['version-update:semver-major'] diff --git a/.github/workflows/manualRelease.yml b/.github/workflows/manualRelease.yml new file mode 100644 index 00000000..8d249ef6 --- /dev/null +++ b/.github/workflows/manualRelease.yml @@ -0,0 +1,36 @@ +name: manual release + +on: + workflow_dispatch: + +jobs: + release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + token: ${{ secrets.SF_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: SF-CLI-BOT + git-user-email: alm-cli@salesforce.com + github-token: ${{ secrets.SF_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.SF_CLI_BOT_GITHUB_TOKEN }} + with: + tag_name: ${{ steps.packageVersion.outputs.prop }} + release_name: ${{ steps.packageVersion.outputs.prop }} From ca479bba8e9cd94766530cc4905a31746b25aa6f Mon Sep 17 00:00:00 2001 From: mshanemc Date: Wed, 28 Sep 2022 09:53:39 -0500 Subject: [PATCH 4/6] chore: dependency cleanup --- README.md | 2 +- package.json | 10 +- src/commands/deploy/functions.ts | 9 +- src/commands/env/compute/collaborator/add.ts | 7 +- src/commands/env/create/compute.ts | 13 +- src/commands/env/delete.ts | 7 +- src/commands/env/log.ts | 5 +- src/commands/env/log/tail.ts | 5 +- src/commands/env/logdrain/add.ts | 7 +- src/commands/env/logdrain/list.ts | 5 +- src/commands/env/logdrain/remove.ts | 7 +- src/commands/env/var/list.ts | 5 +- src/commands/env/var/set.ts | 9 +- src/commands/env/var/unset.ts | 7 +- src/commands/login/functions.ts | 12 +- src/commands/login/functions/jwt.ts | 9 +- src/commands/logout/functions.ts | 7 +- src/commands/run/function.ts | 7 +- src/commands/run/function/start/container.ts | 9 +- src/lib/base.ts | 9 +- src/lib/flags.ts | 5 +- src/lib/log-stream-utils.ts | 4 +- src/lib/poll-for-result.ts | 5 +- test/commands/login/functions.test.ts | 6 +- test/commands/run/function.test.ts | 5 +- yarn.lock | 416 ++----------------- 26 files changed, 98 insertions(+), 494 deletions(-) diff --git a/README.md b/README.md index add3fe07..6382af8d 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Functions plugin for the SF CLI # Usage -1. Install the SF CLI: [Install instructions](https://developer.salesforce.com/docs/atlas.en-us.sfdx_setup.meta/sfdx_setup/sfdx_setup_install_cli.htm) +1. Install the SF CLI: [Install instructions](https://developer.salesforce.com/docs/atlas.en-us.sfdx_setup.meta/sfdx_setup/sfdx_setup_install_CliUx.uxhtm) 2. Then run `sf plugins:install @salesforce/plugin-functions`: ```sh-session diff --git a/package.json b/package.json index 0fd5ec86..858bad3c 100644 --- a/package.json +++ b/package.json @@ -16,26 +16,18 @@ "@hk/functions-core": "npm:@heroku/functions-core@0.4.0", "@oclif/core": "^1.6.0", "@salesforce/core": "^3.19.4", - "@salesforce/plugin-org": "^1.11.2", "@salesforce/sf-plugins-core": "^1.7.2", - "@salesforce/ts-sinon": "^1.3.21", "@salesforce/ts-types": "^1.5.20", "axios": "^0.27.2", "axios-debug-log": "^0.8.4", "chalk": "^4.1.2", - "cli-ux": "^5.6.7", "cloudevents": "^4.0.3", - "date-fns": "^2.28.0", "execa": "^5.1.1", "fs-extra": "^10.0.1", - "global-agent": "^3.0.0", "handlebars": "^4.7.7", "jsforce": "^1.11.0", - "kbpgp": "^2.1.15", "lodash": "^4.17.21", "netrc-parser": "^3.1.6", - "node-fetch": "^3.2.3", - "sha256-file": "^1.0.0", "uuid": "^8.3.2" }, "devDependencies": { @@ -47,8 +39,8 @@ "@salesforce/dev-scripts": "^2.0.3", "@salesforce/plugin-command-reference": "^1.3.18", "@salesforce/prettier-config": "^0.0.2", + "@salesforce/ts-sinon": "^1.3.21", "@types/fs-extra": "^9.0.13", - "@types/node-fetch": "^3.0.3", "@types/nodegit": "^0.27.10", "@types/semver": "^7.3.9", "@types/sha256-file": "^1.0.1", diff --git a/src/commands/deploy/functions.ts b/src/commands/deploy/functions.ts index 68732182..c7d63509 100644 --- a/src/commands/deploy/functions.ts +++ b/src/commands/deploy/functions.ts @@ -6,8 +6,7 @@ */ import herokuColor from '@heroku-cli/color'; import { Messages } from '@salesforce/core'; -import { Flags } from '@oclif/core'; -import { cli } from 'cli-ux'; +import { Flags, CliUx } from '@oclif/core'; import debugFactory from 'debug'; import { UpsertResult } from 'jsforce'; import Command from '../../lib/base'; @@ -73,7 +72,7 @@ export default class DeployFunctions extends Command { } // Heroku side: Fetch git remote URL and push working branch to Heroku git server - cli.action.start('Pushing changes to functions'); + CliUx.ux.action.start('Pushing changes to functions'); const org = await fetchOrg(flags['connected-org']); const project = await fetchSfdxProject(); @@ -144,7 +143,7 @@ export default class DeployFunctions extends Command { results.forEach((result) => { if (!result.success) { shouldExitNonZero = true; - cli.error(`Unable to deploy FunctionReference for ${result.fullName}.`, { exit: false }); + CliUx.ux.error(`Unable to deploy FunctionReference for ${result.fullName}.`, { exit: false }); } if (!flags.quiet && !flags.json) { @@ -183,7 +182,7 @@ export default class DeployFunctions extends Command { await batchCall(referencesToRemove, (chunk) => connection.metadata.delete('FunctionReference', chunk)); } - cli.action.stop(); + CliUx.ux.action.stop(); if (shouldExitNonZero) { this.exit(1); diff --git a/src/commands/env/compute/collaborator/add.ts b/src/commands/env/compute/collaborator/add.ts index 1f90267c..ecc1d4b4 100644 --- a/src/commands/env/compute/collaborator/add.ts +++ b/src/commands/env/compute/collaborator/add.ts @@ -6,8 +6,7 @@ */ import herokuColor from '@heroku-cli/color'; import * as Heroku from '@heroku-cli/schema'; -import { Errors } from '@oclif/core'; -import { cli } from 'cli-ux'; +import { Errors, CliUx } from '@oclif/core'; import { Messages } from '@salesforce/core'; import { FunctionsFlagBuilder } from '../../../../lib/flags'; import Command from '../../../../lib/base'; @@ -42,7 +41,7 @@ export default class ComputeCollaboratorAdd extends Command { ); } - cli.action.start( + CliUx.ux.action.start( `Adding Heroku user ${herokuColor.heroku(herokuUser)} as a collaborator on this Functions account` ); @@ -70,7 +69,7 @@ export default class ComputeCollaboratorAdd extends Command { this.error(error.message); } - cli.action.stop(); + CliUx.ux.action.stop(); this.log( 'For more information about attaching Heroku add-ons to your compute environments, run $ heroku addons:attach --help.' ); diff --git a/src/commands/env/create/compute.ts b/src/commands/env/create/compute.ts index b0e4af74..611ac5ad 100644 --- a/src/commands/env/create/compute.ts +++ b/src/commands/env/create/compute.ts @@ -6,10 +6,9 @@ */ import herokuColor from '@heroku-cli/color'; import * as Heroku from '@heroku-cli/schema'; -import { Flags } from '@oclif/core'; +import { Flags, CliUx } from '@oclif/core'; import { Messages } from '@salesforce/core'; import { QueryResult } from 'jsforce'; -import { cli } from 'cli-ux'; import Command from '../../../lib/base'; import { FunctionsFlagBuilder } from '../../../lib/flags'; import pollForResult from '../../../lib/poll-for-result'; @@ -63,7 +62,7 @@ export default class EnvCreateCompute extends Command { )} to the "features" list in your scratch org definition JSON file, e.g. "features": ["Functions"]` ); } - cli.action.start(`Creating compute environment for org ID ${orgId}`); + CliUx.ux.action.start(`Creating compute environment for org ID ${orgId}`); const project = await fetchSfdxProject(); const projectName = project.name; @@ -135,18 +134,18 @@ export default class EnvCreateCompute extends Command { }, }); - cli.action.stop(); + CliUx.ux.action.stop(); this.log(`New compute environment created with ID ${app.name}`); - cli.action.start('Connecting environments'); + CliUx.ux.action.start('Connecting environments'); if (alias) { this.stateAggregator.aliases.set(alias, app.id!); await this.stateAggregator.aliases.write(); } - cli.action.stop(); + CliUx.ux.action.stop(); this.log( alias ? `Your compute environment with local alias ${herokuColor.cyan(alias)} is ready.` @@ -158,7 +157,7 @@ export default class EnvCreateCompute extends Command { const INVALID_PROJECT_NAME = "Sfdx project name may only contain numbers (0-9), letters (a-z A-Z) and non-consecutive underscores ('_'). It must begin with a letter and end with either a number or letter."; const error = err as { data: { message?: string } }; - cli.action.stop('error!'); + CliUx.ux.action.stop('error!'); if (error.data?.message?.includes(INVALID_PROJECT_NAME)) { this.error( diff --git a/src/commands/env/delete.ts b/src/commands/env/delete.ts index 5dc838a5..9fd3deac 100644 --- a/src/commands/env/delete.ts +++ b/src/commands/env/delete.ts @@ -7,8 +7,7 @@ import herokuColor from '@heroku-cli/color'; import * as Heroku from '@heroku-cli/schema'; import { Org, Messages } from '@salesforce/core'; -import { cli } from 'cli-ux'; -import { Errors } from '@oclif/core'; +import { Errors, CliUx } from '@oclif/core'; import { filterProjectReferencesToRemove, splitFullName, @@ -63,7 +62,7 @@ export default class EnvDelete extends Command { await this.confirmRemovePrompt('environment', targetCompute, flags.confirm); - cli.action.start(`Deleting environment ${targetCompute}`); + CliUx.ux.action.start(`Deleting environment ${targetCompute}`); if (targetCompute) { try { @@ -155,7 +154,7 @@ export default class EnvDelete extends Command { }, }); - cli.action.stop(); + CliUx.ux.action.stop(); return 'Environment deleted.'; } diff --git a/src/commands/env/log.ts b/src/commands/env/log.ts index 47c0db6c..5ef06768 100644 --- a/src/commands/env/log.ts +++ b/src/commands/env/log.ts @@ -5,10 +5,9 @@ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ import herokuColor from '@heroku-cli/color'; -import { cli } from 'cli-ux'; import * as Heroku from '@heroku-cli/schema'; import { Messages } from '@salesforce/core'; -import { Errors, Flags } from '@oclif/core'; +import { Errors, Flags, CliUx } from '@oclif/core'; import { FunctionsFlagBuilder } from '../../lib/flags'; import Command from '../../lib/base'; import { resolveAppNameForEnvironment } from '../../lib/utils'; @@ -75,6 +74,6 @@ export default class Log extends Command { } else { this.error("Couldn't retreive logs"); } - cli.action.stop(); + CliUx.ux.action.stop(); } } diff --git a/src/commands/env/log/tail.ts b/src/commands/env/log/tail.ts index 1ec11ab2..15f3694d 100644 --- a/src/commands/env/log/tail.ts +++ b/src/commands/env/log/tail.ts @@ -5,10 +5,9 @@ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ import herokuColor from '@heroku-cli/color'; -import { cli } from 'cli-ux'; import * as Heroku from '@heroku-cli/schema'; import { Messages } from '@salesforce/core'; -import { Errors } from '@oclif/core'; +import { Errors, CliUx } from '@oclif/core'; import { FunctionsFlagBuilder } from '../../../lib/flags'; import Command from '../../../lib/base'; import { resolveAppNameForEnvironment } from '../../../lib/utils'; @@ -68,6 +67,6 @@ export default class LogTail extends Command { } else { this.error("Couldn't retreive logs"); } - cli.action.stop(); + CliUx.ux.action.stop(); } } diff --git a/src/commands/env/logdrain/add.ts b/src/commands/env/logdrain/add.ts index 7b63ef86..d2492b45 100644 --- a/src/commands/env/logdrain/add.ts +++ b/src/commands/env/logdrain/add.ts @@ -6,8 +6,7 @@ */ import herokuColor from '@heroku-cli/color'; import * as Heroku from '@heroku-cli/schema'; -import { Errors, Flags } from '@oclif/core'; -import { cli } from 'cli-ux'; +import { Errors, Flags, CliUx } from '@oclif/core'; import { Messages } from '@salesforce/core'; import { FunctionsFlagBuilder } from '../../../lib/flags'; import Command from '../../../lib/base'; @@ -79,7 +78,7 @@ export default class LogDrainAdd extends Command { const appName = await resolveAppNameForEnvironment(targetCompute); try { - cli.action.start(`Creating drain for environment ${herokuColor.app(targetCompute)}`); + CliUx.ux.action.start(`Creating drain for environment ${herokuColor.app(targetCompute)}`); const result = await this.client.post(`/apps/${appName}/log-drains`, { data: { @@ -87,7 +86,7 @@ export default class LogDrainAdd extends Command { }, }); - cli.action.stop(); + CliUx.ux.action.stop(); return [ { diff --git a/src/commands/env/logdrain/list.ts b/src/commands/env/logdrain/list.ts index 8df07001..715bf981 100644 --- a/src/commands/env/logdrain/list.ts +++ b/src/commands/env/logdrain/list.ts @@ -6,9 +6,8 @@ */ import * as Heroku from '@heroku-cli/schema'; import herokuColor from '@heroku-cli/color'; -import { cli } from 'cli-ux'; import { Messages } from '@salesforce/core'; -import { Errors } from '@oclif/core'; +import { Errors, CliUx } from '@oclif/core'; import { FunctionsFlagBuilder } from '../../../lib/flags'; import Command from '../../../lib/base'; import { resolveAppNameForEnvironment } from '../../../lib/utils'; @@ -58,7 +57,7 @@ export default class LogDrainList extends Command { if (drains.length === 0) { this.warn(`No log-drains found for environment ${targetCompute}`); } else { - cli.table( + CliUx.ux.table( drains, { id: { diff --git a/src/commands/env/logdrain/remove.ts b/src/commands/env/logdrain/remove.ts index e2d51dd5..12c23b47 100644 --- a/src/commands/env/logdrain/remove.ts +++ b/src/commands/env/logdrain/remove.ts @@ -6,8 +6,7 @@ */ import herokuColor from '@heroku-cli/color'; import * as Heroku from '@heroku-cli/schema'; -import { Errors, Flags } from '@oclif/core'; -import { cli } from 'cli-ux'; +import { Errors, Flags, CliUx } from '@oclif/core'; import { Messages } from '@salesforce/core'; import { FunctionsFlagBuilder } from '../../../lib/flags'; import Command from '../../../lib/base'; @@ -75,11 +74,11 @@ export default class LogDrainRemove extends Command { const appName = await resolveAppNameForEnvironment(targetCompute); try { - cli.action.start(`Deleting drain for environment ${herokuColor.app(targetCompute)}`); + CliUx.ux.action.start(`Deleting drain for environment ${herokuColor.app(targetCompute)}`); await this.client.delete(`/apps/${appName}/log-drains/${encodeURIComponent(url)}`); - cli.action.stop(); + CliUx.ux.action.stop(); return 'Removed drain-url'; } catch (e) { diff --git a/src/commands/env/var/list.ts b/src/commands/env/var/list.ts index 78c4e546..bc62b503 100644 --- a/src/commands/env/var/list.ts +++ b/src/commands/env/var/list.ts @@ -6,10 +6,9 @@ */ import * as Heroku from '@heroku-cli/schema'; import herokuColor from '@heroku-cli/color'; -import { cli } from 'cli-ux'; import { flatMap } from 'lodash'; import { Messages } from '@salesforce/core'; -import { Errors } from '@oclif/core'; +import { Errors, CliUx } from '@oclif/core'; import { FunctionsFlagBuilder } from '../../../lib/flags'; import Command from '../../../lib/base'; import { resolveAppNameForEnvironment } from '../../../lib/utils'; @@ -68,7 +67,7 @@ export default class ConfigList extends Command { if (configArray.length === 0) { this.warn(`No config vars found for environment ${targetCompute}`); } else { - cli.table( + CliUx.ux.table( configArray, { key: { diff --git a/src/commands/env/var/set.ts b/src/commands/env/var/set.ts index 944eed9f..4a22a9d9 100644 --- a/src/commands/env/var/set.ts +++ b/src/commands/env/var/set.ts @@ -5,8 +5,7 @@ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ import herokuColor from '@heroku-cli/color'; -import { Errors } from '@oclif/core'; -import { cli } from 'cli-ux'; +import { Errors, CliUx } from '@oclif/core'; import { Messages } from '@salesforce/core'; import { FunctionsFlagBuilder } from '../../../lib/flags'; @@ -75,7 +74,7 @@ export default class ConfigSet extends Command { const configPairs = this.parseKeyValuePairs(argv); - cli.action.start( + CliUx.ux.action.start( `Setting ${Object.keys(configPairs) .map((key) => herokuColor.configVar(key)) .join(', ')} and restarting ${herokuColor.app(targetCompute)}` @@ -86,11 +85,11 @@ export default class ConfigSet extends Command { data: configPairs, }); - cli.action.stop(); + CliUx.ux.action.stop(); return 'Set env var'; } catch (error: any) { - cli.action.stop('failed'); + CliUx.ux.action.stop('failed'); if (error.data?.message?.includes("Couldn't find that app")) { this.error(new Error(`Could not find environment ${appName}`)); } diff --git a/src/commands/env/var/unset.ts b/src/commands/env/var/unset.ts index fe7e6716..625b505e 100644 --- a/src/commands/env/var/unset.ts +++ b/src/commands/env/var/unset.ts @@ -7,8 +7,7 @@ import herokuColor from '@heroku-cli/color'; import * as Heroku from '@heroku-cli/schema'; import { Messages } from '@salesforce/core'; -import { Errors } from '@oclif/core'; -import { cli } from 'cli-ux'; +import { Errors, CliUx } from '@oclif/core'; import { FunctionsFlagBuilder } from '../../../lib/flags'; import Command from '../../../lib/base'; @@ -94,13 +93,13 @@ export default class ConfigUnset extends Command { const message = `Unsetting ${Object.keys(configPairs) .map((key) => herokuColor.configVar(key)) .join(', ')} and restarting ${herokuColor.app(targetCompute)}`; - cli.action.start(message); + CliUx.ux.action.start(message); await this.client.patch(`/apps/${appName}/config-vars`, { data: configPairs, }); - cli.action.stop(); + CliUx.ux.action.stop(); return 'Unset env var'; } diff --git a/src/commands/login/functions.ts b/src/commands/login/functions.ts index b58e2035..e0e39846 100644 --- a/src/commands/login/functions.ts +++ b/src/commands/login/functions.ts @@ -4,7 +4,7 @@ * Licensed under the BSD 3-Clause license. * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ -import { cli } from 'cli-ux'; +import { CliUx } from '@oclif/core'; import { Messages } from '@salesforce/core'; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore @@ -38,9 +38,9 @@ export default class Login extends Command { this.log(`Opening browser to ${browserUrl}\n`); - await cli.open(browserUrl); + await CliUx.ux.open(browserUrl); - cli.action.start('Waiting for login'); + CliUx.ux.action.start('Waiting for login'); const headers = { Authorization: 'Bearer ' + token }; const response = await new Transport().httpRequest({ url: cliUrl, @@ -54,9 +54,9 @@ export default class Login extends Command { return this.error(`${data.error}`); } - cli.action.stop(); + CliUx.ux.action.stop(); - cli.action.start('Saving credentials'); + CliUx.ux.action.start('Saving credentials'); const bearerToken = data.access_token; @@ -80,6 +80,6 @@ export default class Login extends Command { await this.stateAggregator.tokens.write(); - cli.action.stop(); + CliUx.ux.action.stop(); } } diff --git a/src/commands/login/functions/jwt.ts b/src/commands/login/functions/jwt.ts index 39374af1..d8c0921a 100644 --- a/src/commands/login/functions/jwt.ts +++ b/src/commands/login/functions/jwt.ts @@ -4,18 +4,17 @@ * Licensed under the BSD 3-Clause license. * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ -import { Flags } from '@oclif/core'; +import { Flags, CliUx } from '@oclif/core'; import { AuthInfo, AuthRemover, Messages } from '@salesforce/core'; import { getString } from '@salesforce/ts-types'; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import * as Transport from 'jsforce/lib/transport'; -import { cli } from 'cli-ux'; import Command from '../../../lib/base'; import { herokuVariant } from '../../../lib/heroku-variant'; import { fetchSfdxProject } from '../../../lib/utils'; -// This is a public Oauth client created expressly for the purpose of headless auth in the functions CLI. +// This is a public Oauth client created expressly for the purpose of headless auth in the functions CliUx.ux // It does not require a client secret, is marked as public in the database and scoped accordingly const PUBLIC_CLIENT_ID = '1e9cdca9-cec7-4dbf-ae84-408694b22bac'; @@ -128,7 +127,7 @@ export default class JwtLogin extends Command { this.warn(messages.getMessage('flags.instanceurl.deprecation')); } - cli.action.start('Logging in via JWT'); + CliUx.ux.action.start('Logging in via JWT'); // Use keyfile, clientid, and username to auth with salesforce via the same workflow // as sfdx auth:jwt:grant --json @@ -209,7 +208,7 @@ export default class JwtLogin extends Command { await this.stateAggregator.tokens.write(); - cli.action.stop(); + CliUx.ux.action.stop(); return { username: authFields.username, diff --git a/src/commands/logout/functions.ts b/src/commands/logout/functions.ts index 956ae2c3..c9c6bbc8 100644 --- a/src/commands/logout/functions.ts +++ b/src/commands/logout/functions.ts @@ -4,9 +4,8 @@ * Licensed under the BSD 3-Clause license. * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ -import { cli } from 'cli-ux'; import { Messages } from '@salesforce/core'; - +import { CliUx } from '@oclif/core'; import Command from '../../lib/base'; Messages.importMessagesDirectory(__dirname); @@ -23,12 +22,12 @@ export default class Login extends Command { const { flags } = await this.parse(Login); this.postParseHook(flags); - cli.action.start(messages.getMessage('action.start')); + CliUx.ux.action.start(messages.getMessage('action.start')); this.stateAggregator.tokens.unset(Command.TOKEN_BEARER_KEY); await this.stateAggregator.tokens.write(); - cli.action.stop(); + CliUx.ux.action.stop(); return 'Logged out'; } diff --git a/src/commands/run/function.ts b/src/commands/run/function.ts index fa812c19..9633188f 100644 --- a/src/commands/run/function.ts +++ b/src/commands/run/function.ts @@ -5,9 +5,8 @@ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ import * as fs from 'fs'; -import { Errors, Flags } from '@oclif/core'; +import { Errors, Flags, CliUx } from '@oclif/core'; import { runFunction, RunFunctionOptions } from '@hk/functions-core'; -import { cli } from 'cli-ux'; import herokuColor from '@heroku-cli/color'; import { AxiosResponse, AxiosError } from 'axios'; import { ConfigAggregator, Messages } from '@salesforce/core'; @@ -80,7 +79,7 @@ export default class Invoke extends Command { const aliasOrUser = flags['connected-org'] || `target-org ${targetOrg}`; this.log(`Using ${aliasOrUser} login credential to initialize context`); - cli.action.start(`${herokuColor.cyanBright('POST')} ${url}`); + CliUx.ux.action.start(`${herokuColor.cyanBright('POST')} ${url}`); const runFunctionOptions = { ...flags, @@ -92,7 +91,7 @@ export default class Invoke extends Command { try { response = await runFunction(runFunctionOptions as RunFunctionOptions); - cli.action.stop(herokuColor.greenBright(response.status.toString())); + CliUx.ux.action.stop(herokuColor.greenBright(response.status.toString())); if (!flags.json) { this.writeResponse(response); diff --git a/src/commands/run/function/start/container.ts b/src/commands/run/function/start/container.ts index a8d1eb1e..69bb8106 100644 --- a/src/commands/run/function/start/container.ts +++ b/src/commands/run/function/start/container.ts @@ -7,9 +7,8 @@ import * as path from 'path'; import herokuColor from '@heroku-cli/color'; import { Messages } from '@salesforce/core'; -import { Command, Flags } from '@oclif/core'; +import { Command, Flags, CliUx } from '@oclif/core'; import { getFunctionsBinary, getProjectDescriptor } from '@hk/functions-core'; -import { cli } from 'cli-ux'; import { JsonMap } from '@salesforce/ts-types'; Messages.importMessagesDirectory(__dirname); @@ -103,14 +102,14 @@ export default class Container extends Command { const outputMsg = msg.text; if (outputMsg) { - cli.info(outputMsg); + CliUx.ux.info(outputMsg); } }; benny.on('pack', writeMsg); benny.on('container', writeMsg); benny.on('error', (msg: { text: string }) => { - cli.error(msg.text, { exit: false }); + CliUx.ux.error(msg.text, { exit: false }); }); benny.on('log', (msg: { text: string; level: string; fields: JsonMap }) => { @@ -120,7 +119,7 @@ export default class Container extends Command { } if (msg.text) { - cli.info(msg.text); + CliUx.ux.info(msg.text); } // evergreen:benny:message {"type":"log","timestamp":"2021-05-10T10:00:27.953248-05:00","level":"info","fields":{"debugPort":"9229","localImageName":"jvm-fn-init","network":"","port":"8080"}} +21ms diff --git a/src/lib/base.ts b/src/lib/base.ts index 6494adb9..d9378abe 100644 --- a/src/lib/base.ts +++ b/src/lib/base.ts @@ -5,10 +5,9 @@ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ import { URL } from 'url'; -import { Interfaces } from '@oclif/core'; +import { Interfaces, CliUx } from '@oclif/core'; import { SfCommand } from '@salesforce/sf-plugins-core'; import { StateAggregator, Org } from '@salesforce/core'; -import { cli } from 'cli-ux'; import APIClient, { herokuClientApiUrl } from './api-client'; import herokuVariant from './heroku-variant'; import { SfdcAccount } from './sfdc-types'; @@ -79,7 +78,7 @@ export default abstract class Command extends SfCommand { } protected catch(err: any): any { - cli.action.stop('failed'); + CliUx.ux.action.stop('failed'); if (err.http?.response?.status === 401) { this.error('Your token has expired, please login with sf login functions'); @@ -146,7 +145,7 @@ export default abstract class Command extends SfCommand { // and causes tests to fail (false negatives) // Move this import up to the top of the file // when that issue has been resolved - const prompt = await cli.prompt(''); + const prompt = await CliUx.ux.prompt(''); if (prompt !== name) { this.error('Confirmation name does not match'); } @@ -163,7 +162,7 @@ export default abstract class Command extends SfCommand { if (this.outputJSON) { if (typeof input === 'string') input = new Error(input); const { message, name } = input; - cli.styledJSON({ + CliUx.ux.styledJSON({ status: 1, message, name, diff --git a/src/lib/flags.ts b/src/lib/flags.ts index 4c12d596..3240e8b5 100644 --- a/src/lib/flags.ts +++ b/src/lib/flags.ts @@ -4,8 +4,7 @@ * Licensed under the BSD 3-Clause license. * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ -import { Flags, Errors, Interfaces } from '@oclif/core'; -import { cli } from 'cli-ux'; +import { Flags, Errors, Interfaces, CliUx } from '@oclif/core'; import { Messages } from '@salesforce/core'; Messages.importMessagesDirectory(__dirname); @@ -62,7 +61,7 @@ export const FunctionsTableFlags: Interfaces.FlagInput = { // only let supertable alternatively // output in json & csv for now // Cast until cli-us uses oclif/core - ...(cli.table.flags({ except: ['csv', 'output'] }) as unknown as Interfaces.FlagInput), + ...(CliUx.ux.table.flags({ except: ['csv', 'output'] }) as unknown as Interfaces.FlagInput), output: Flags.string({ exclusive: ['no-truncate', 'csv'], description: messages.getMessage('flags.FunctionsTableFlags.summary'), diff --git a/src/lib/log-stream-utils.ts b/src/lib/log-stream-utils.ts index 2e200232..774fea23 100644 --- a/src/lib/log-stream-utils.ts +++ b/src/lib/log-stream-utils.ts @@ -8,7 +8,7 @@ import * as Stream from 'stream'; import * as util from 'util'; import EventSource = require('@heroku/eventsource'); import axios from 'axios'; -import { cli } from 'cli-ux'; +import { CliUx } from '@oclif/core'; function lineTransform() { const transform = new Stream.Transform({ objectMode: true, decodeStrings: false }); @@ -105,7 +105,7 @@ export async function readLogs(logSessionURL: string, tail: boolean) { stream.setEncoding('utf8'); stream.on('data', (data: string) => { - cli.log(data); + CliUx.ux.log(data); }); const finished = util.promisify(Stream.finished); diff --git a/src/lib/poll-for-result.ts b/src/lib/poll-for-result.ts index be7affbe..9fea4476 100644 --- a/src/lib/poll-for-result.ts +++ b/src/lib/poll-for-result.ts @@ -4,12 +4,11 @@ * Licensed under the BSD 3-Clause license. * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ -import cli from 'cli-ux'; - +import { CliUx } from '@oclif/core'; /* eslint-disable no-await-in-loop */ export default async function pollForResult(fn: () => Promise, timeout = 1000) { while (!(await fn())) { - await cli.wait(timeout); + await CliUx.ux.wait(timeout); } return true; diff --git a/test/commands/login/functions.test.ts b/test/commands/login/functions.test.ts index e57890bb..ff086f92 100644 --- a/test/commands/login/functions.test.ts +++ b/test/commands/login/functions.test.ts @@ -7,7 +7,7 @@ import { expect, test } from '@oclif/test'; import type { SfTokens } from '@salesforce/core'; import { TokenAccessor } from '@salesforce/core/lib/stateAggregator'; -import { cli } from 'cli-ux'; +import { CliUx } from '@oclif/core'; import * as sinon from 'sinon'; import { AuthStubs } from '../../helpers/auth'; @@ -26,7 +26,7 @@ describe('sf login functions', () => { test .stdout() .stderr() - .stub(cli, 'open', () => windowOpenStub) + .stub(CliUx.ux, 'open', () => windowOpenStub) .nock('https://cli-auth.heroku.com', (api) => { api .post('/sfdx/auth', { description: 'Login from Sfdx CLI' }) @@ -67,7 +67,7 @@ describe('sf login functions', () => { test .stdout() .stderr() - .stub(cli, 'open', () => windowOpenStub) + .stub(CliUx.ux, 'open', () => windowOpenStub) .nock(SALESFORCE_FUNCTIONS_IDENTITY_URL, (api) => { api.post('/sfdx/auth').reply(200, { browser_url: '/browser_url', diff --git a/test/commands/run/function.test.ts b/test/commands/run/function.test.ts index b38b7f0c..3d579cf1 100644 --- a/test/commands/run/function.test.ts +++ b/test/commands/run/function.test.ts @@ -6,8 +6,7 @@ */ import { expect, test } from '@oclif/test'; import { Config, OrgConfigProperties } from '@salesforce/core'; -import { cli } from 'cli-ux'; - +import { CliUx } from '@oclif/core'; import { MockTestOrgData, testSetup } from '@salesforce/core/lib/testSetup'; import * as sinon from 'sinon'; @@ -31,7 +30,7 @@ describe('sf run function', () => { data: 'Something happened!', status: 200, }); - stopActionSub = sandbox.stub(cli.action, 'stop'); + stopActionSub = sandbox.stub(CliUx.ux.action, 'stop'); }); afterEach(() => { diff --git a/yarn.lock b/yarn.lock index 12524314..57500f4b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -699,7 +699,7 @@ debug "^4.1.1" semver "^7.3.2" -"@oclif/command@^1.5.13", "@oclif/command@^1.8.0", "@oclif/command@^1.8.1", "@oclif/command@^1.8.15", "@oclif/command@^1.8.9": +"@oclif/command@^1.8.0", "@oclif/command@^1.8.15", "@oclif/command@^1.8.9": version "1.8.16" resolved "https://registry.yarnpkg.com/@oclif/command/-/command-1.8.16.tgz#bea46f81b2061b47e1cda318a0b923e62ca4cc0c" integrity sha512-rmVKYEsKzurfRU0xJz+iHelbi1LGlihIWZ7Qvmb/CBz1EkhL7nOkW4SVXmG2dA5Ce0si2gr88i6q4eBOMRNJ1w== @@ -723,7 +723,7 @@ is-wsl "^2.1.1" tslib "^2.0.0" -"@oclif/config@^1.17.0", "@oclif/config@^1.18.1", "@oclif/config@^1.18.2": +"@oclif/config@^1.17.0", "@oclif/config@^1.18.2": version "1.18.3" resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.18.3.tgz#ddfc144fdab66b1658c2f1b3478fa7fbfd317e79" integrity sha512-sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA== @@ -819,16 +819,6 @@ resolved "https://registry.yarnpkg.com/@oclif/linewrap/-/linewrap-1.0.0.tgz#aedcb64b479d4db7be24196384897b5000901d91" integrity sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw== -"@oclif/parser@3.8.6", "@oclif/parser@^3.8.6": - version "3.8.6" - resolved "https://registry.yarnpkg.com/@oclif/parser/-/parser-3.8.6.tgz#d5a108af9c708a051cc6b1d27d47359d75f41236" - integrity sha512-tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw== - dependencies: - "@oclif/errors" "^1.2.2" - "@oclif/linewrap" "^1.0.0" - chalk "^4.1.0" - tslib "^2.0.0" - "@oclif/parser@^3.8.0": version "3.8.5" resolved "https://registry.yarnpkg.com/@oclif/parser/-/parser-3.8.5.tgz#c5161766a1efca7343e1f25d769efbefe09f639b" @@ -839,6 +829,16 @@ chalk "^2.4.2" tslib "^1.9.3" +"@oclif/parser@^3.8.6": + version "3.8.6" + resolved "https://registry.yarnpkg.com/@oclif/parser/-/parser-3.8.6.tgz#d5a108af9c708a051cc6b1d27d47359d75f41236" + integrity sha512-tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw== + dependencies: + "@oclif/errors" "^1.2.2" + "@oclif/linewrap" "^1.0.0" + chalk "^4.1.0" + tslib "^2.0.0" + "@oclif/plugin-command-snapshot@^3.1.3": version "3.1.3" resolved "https://registry.yarnpkg.com/@oclif/plugin-command-snapshot/-/plugin-command-snapshot-3.1.3.tgz#9adf78dfd2415fc70a5341118f6decc4ebe0aa10" @@ -868,20 +868,6 @@ widest-line "^3.1.0" wrap-ansi "^6.2.0" -"@oclif/plugin-help@^2.2.0": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-2.2.3.tgz#b993041e92047f0e1762668aab04d6738ac06767" - integrity sha512-bGHUdo5e7DjPJ0vTeRBMIrfqTRDBfyR5w0MP41u0n3r7YG5p14lvMmiCXxi6WDaP2Hw5nqx3PnkAIntCKZZN7g== - dependencies: - "@oclif/command" "^1.5.13" - chalk "^2.4.1" - indent-string "^4.0.0" - lodash.template "^4.4.0" - string-width "^3.0.0" - strip-ansi "^5.0.0" - widest-line "^2.0.1" - wrap-ansi "^4.0.0" - "@oclif/plugin-help@^5", "@oclif/plugin-help@^5.1.11": version "5.1.12" resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-5.1.12.tgz#24a18631eb9b22cb55e1a3b8e4f6039fd42727e6" @@ -922,7 +908,7 @@ cli-ux "5.6.6" tslib "^2.0.0" -"@oclif/screen@^1.0.3", "@oclif/screen@^1.0.4": +"@oclif/screen@^1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@oclif/screen/-/screen-1.0.4.tgz#b740f68609dfae8aa71c3a6cab15d816407ba493" integrity sha512-60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw== @@ -932,7 +918,7 @@ resolved "https://registry.yarnpkg.com/@oclif/screen/-/screen-3.0.2.tgz#969054308fe98d130c02844a45cc792199b75670" integrity sha512-S/SF/XYJeevwIgHFmVDAFRUvM3m+OjhvCAYMk78ZJQCYCQ5wS7j+LTt1ZEv2jpEEGg2tx/F6TYYWxddNAYHrFQ== -"@oclif/test@^1", "@oclif/test@^1.2.4": +"@oclif/test@^1": version "1.2.9" resolved "https://registry.yarnpkg.com/@oclif/test/-/test-1.2.9.tgz#bfd0bd3de6d2309f779b8f445a163db2fd48e72b" integrity sha512-op+ak0NTyeBKqjLVH1jfPCRGWK5befIoQpCL/xwekjucUEmMfCbUpV1Sa60f9rU8X58HEqrclwWbAH+DtQR6FQ== @@ -1052,22 +1038,6 @@ mv "~2" safe-json-stringify "~1" -"@salesforce/command@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@salesforce/command/-/command-4.2.2.tgz#2d1c301d771a6a6aac3cf25f14f18e829bf37b1d" - integrity sha512-2QEtPIMaeRyUEnLmPHJ1PhfKDJBupfQS5T4nG8rXpK2yOznBu48aPWaWCYErrxyC0bPa5eoFACeyPWz1k9QMog== - dependencies: - "@oclif/command" "^1.8.1" - "@oclif/errors" "^1.2.2" - "@oclif/parser" "3.8.6" - "@oclif/plugin-help" "^2.2.0" - "@oclif/test" "^1.2.4" - "@salesforce/core" "^2.35.0" - "@salesforce/kit" "^1.5.17" - "@salesforce/ts-types" "^1.5.20" - chalk "^2.4.2" - cli-ux "^4.9.3" - "@salesforce/command@^5.1.3": version "5.2.1" resolved "https://registry.yarnpkg.com/@salesforce/command/-/command-5.2.1.tgz#b102003252ba89c9894ab93b5d23946dbea88784" @@ -1080,7 +1050,7 @@ "@salesforce/ts-types" "^1.5.20" chalk "^2.4.2" -"@salesforce/core@^2.35.0", "@salesforce/core@^2.36.3", "@salesforce/core@^2.37.1": +"@salesforce/core@^2.37.1": version "2.37.1" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-2.37.1.tgz#bfb6634e068278c7761d694a15e09a680b407137" integrity sha512-Jyppt6fc8uEBQgfD2uIvZlUVSTSkhgU4i+N0B4mQJ+0yeAu5foiGJnn7u6/GPkpLSgof8IZKC6f4crsi/9xyLA== @@ -1216,18 +1186,6 @@ shelljs "^0.8.5" tslib "^1" -"@salesforce/plugin-org@^1.11.2": - version "1.13.2" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-org/-/plugin-org-1.13.2.tgz#6b8ac5f88f6ec20f2c047eaf084bbd15e81f53e1" - integrity sha512-MacuU8Ihj5wuLRwjVXbZ/N89hPg5em0CuuwbZdWpOPVGCWbkib7xUpaL77jjsFStdcNUDx3q7ppKNGx0SonHxA== - dependencies: - "@oclif/config" "^1.18.1" - "@salesforce/command" "^4.2.2" - "@salesforce/core" "^2.36.3" - "@salesforce/kit" "^1.5.17" - open "8.4.0" - tslib "^2" - "@salesforce/prettier-config@^0.0.2": version "0.0.2" resolved "https://registry.yarnpkg.com/@salesforce/prettier-config/-/prettier-config-0.0.2.tgz#ded39bf7cb75238edc9db6dd093649111350f8bc" @@ -1504,13 +1462,6 @@ resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4" integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw== -"@types/node-fetch@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-3.0.3.tgz#9d969c9a748e841554a40ee435d26e53fa3ee899" - integrity sha512-HhggYPH5N+AQe/OmN6fmhKmRRt2XuNJow+R3pQwJxOOF9GuwM7O2mheyGeIrs5MOIeNjDEdgdoyHBOrFeJBR3g== - dependencies: - node-fetch "*" - "@types/node@*", "@types/node@^15.6.1": version "15.12.5" resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.5.tgz#9a78318a45d75c9523d2396131bd3cca54b2d185" @@ -1816,7 +1767,7 @@ ansi-styles@^2.2.1: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= -ansi-styles@^3.0.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.0.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== @@ -2152,11 +2103,6 @@ bn.js@^4.0.0: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -bn@^1.0.4, bn@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/bn/-/bn-1.0.5.tgz#fdf5fdeede044884ea7ee62adff763ee99144fa5" - integrity sha512-7TvGbqbZb6lDzsBtNz1VkdXXV0BVmZKPPViPmo2IpvwaryF7P+QKYKACyVkwo2mZPr2CpFiz7EtgPEcc3o/JFQ== - boolean@^3.0.1: version "3.1.2" resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz#e30f210a26b02458482a8cc353ab06f262a780c2" @@ -2242,11 +2188,6 @@ bytes@3.1.2: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== -bzip-deflate@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/bzip-deflate/-/bzip-deflate-1.0.0.tgz#b02db007ef37bebcc29384a4b2c6f4f0f4c796c9" - integrity sha1-sC2wB+83vrzCk4Skssb08PTHlsk= - cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0: version "15.2.0" resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389" @@ -2558,34 +2499,7 @@ cli-ux@5.6.6: supports-hyperlinks "^2.1.0" tslib "^2.0.0" -cli-ux@^4.9.3: - version "4.9.3" - resolved "https://registry.yarnpkg.com/cli-ux/-/cli-ux-4.9.3.tgz#4c3e070c1ea23eef010bbdb041192e0661be84ce" - integrity sha512-/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA== - dependencies: - "@oclif/errors" "^1.2.2" - "@oclif/linewrap" "^1.0.0" - "@oclif/screen" "^1.0.3" - ansi-escapes "^3.1.0" - ansi-styles "^3.2.1" - cardinal "^2.1.1" - chalk "^2.4.1" - clean-stack "^2.0.0" - extract-stack "^1.0.0" - fs-extra "^7.0.0" - hyperlinker "^1.0.0" - indent-string "^3.2.0" - is-wsl "^1.1.0" - lodash "^4.17.11" - password-prompt "^1.0.7" - semver "^5.6.0" - strip-ansi "^5.0.0" - supports-color "^5.5.0" - supports-hyperlinks "^1.0.1" - treeify "^1.1.0" - tslib "^1.9.3" - -cli-ux@^5.2.1, cli-ux@^5.6.7: +cli-ux@^5.2.1: version "5.6.7" resolved "https://registry.yarnpkg.com/cli-ux/-/cli-ux-5.6.7.tgz#32ef9e6cb2b457be834280cc799028a11c8235a8" integrity sha512-dsKAurMNyFDnO6X1TiiRNiVbL90XReLKcvIq4H777NMqXGBxBws23ag8ubCJE97vVZEgWG2eSUhsyLf63Jv8+g== @@ -3017,12 +2931,7 @@ data-uri-to-buffer@3: resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636" integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og== -data-uri-to-buffer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b" - integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA== - -date-fns@^2.16.1, date-fns@^2.28.0: +date-fns@^2.16.1: version "2.29.2" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.2.tgz#0d4b3d0f3dff0f920820a070920f0d9662c51931" integrity sha512-0VNbwmWJDS/G3ySwFSJA3ayhbURMTJLtwM2DTxf9CWondCnh6DTNlO9JgRSq6ibf4eD0lfMJNBxUdEAHHix+bA== @@ -3107,18 +3016,6 @@ deep-eql@^3.0.1: dependencies: type-detect "^4.0.0" -deep-equal@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" - integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== - dependencies: - is-arguments "^1.0.4" - is-date-object "^1.0.1" - is-regex "^1.0.4" - object-is "^1.0.1" - object-keys "^1.1.1" - regexp.prototype.flags "^1.2.0" - deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" @@ -3153,11 +3050,6 @@ defer-to-connect@^2.0.0: resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== - define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -3310,11 +3202,6 @@ electron-to-chromium@^1.3.723: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.761.tgz#6a1748bab8ed94984391ec8be8a7e7ec1fe3d843" integrity sha512-7a/wV/plM/b95XjTdA2Q4zAxxExTDKkNQpTiaU/nVT8tGCQVtX9NsnTjhALBFICpOB58hU6xg5fFC3CT2Bybpg== -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -3747,11 +3634,6 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" -extract-stack@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/extract-stack/-/extract-stack-1.0.0.tgz#b97acaf9441eea2332529624b732fc5a1c8165fa" - integrity sha1-uXrK+UQe6iMyUpYktzL8WhyBZfo= - extract-stack@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/extract-stack/-/extract-stack-2.0.0.tgz#11367bc865bfcd9bc0db3123e5edb57786f11f9b" @@ -3850,14 +3732,6 @@ faye@^1.4.0: tough-cookie "*" tunnel-agent "*" -fetch-blob@^3.1.2, fetch-blob@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.1.4.tgz#e8c6567f80ad7fc22fd302e7dcb72bafde9c1717" - integrity sha512-Eq5Xv5+VlSrYWEqKrusxY1C3Hm/hjeAsCGVG3ft7pZahlUAChpGZT/Ms1WmSLnEAisEXszjzu/s+ce6HZB2VHA== - dependencies: - node-domexception "^1.0.0" - web-streams-polyfill "^3.0.3" - figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -3999,13 +3873,6 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -formdata-polyfill@^4.0.10: - version "4.0.10" - resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423" - integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g== - dependencies: - fetch-blob "^3.1.2" - fromentries@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/fromentries/-/fromentries-1.3.2.tgz#e4bca6808816bf8f93b52750f1127f5a6fd86e3a" @@ -4034,15 +3901,6 @@ fs-extra@^6.0.1: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" - integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-extra@^8.1, fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -4412,11 +4270,6 @@ has-bigints@^1.0.1: resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== -has-flag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" - integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -4600,23 +4453,6 @@ hyperlinker@^1.0.0: resolved "https://registry.yarnpkg.com/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e" integrity sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ== -iced-error@0.0.13, iced-error@>=0.0.8, iced-error@>=0.0.9: - version "0.0.13" - resolved "https://registry.yarnpkg.com/iced-error/-/iced-error-0.0.13.tgz#a4a8a4f1461a59c7a2a380b4f745ffd80718f08b" - integrity sha512-yEEaG8QfyyRL0SsbNNDw3rVgTyqwHFMCuV6jDvD43f/2shmdaFXkqvFLGhDlsYNSolzYHwVLM/CrXt9GygYopA== - -iced-lock@^1.0.1, iced-lock@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/iced-lock/-/iced-lock-1.1.0.tgz#6116ef1cab3acd6e6b10893bb27ba622fd3fde72" - integrity sha1-YRbvHKs6zW5rEIk7snumIv0/3nI= - dependencies: - iced-runtime "^1.0.0" - -iced-runtime@>=0.0.1, iced-runtime@^1.0.0, iced-runtime@^1.0.2, iced-runtime@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/iced-runtime/-/iced-runtime-1.0.4.tgz#e9de26dfe98cd8621201f7f3dfb9f7f09c550990" - integrity sha512-rgiJXNF6ZgF2Clh/TKUlBDW3q51YPDJUXmxGQXx1b8tbZpVpTn+1RX9q1sjNkujXIIaVxZByQzPHHORg7KV51g== - iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -4671,11 +4507,6 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= -indent-string@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" - integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= - indent-string@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" @@ -4762,13 +4593,6 @@ ip@^1.1.5: resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= -is-arguments@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9" - integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg== - dependencies: - call-bind "^1.0.0" - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -4815,7 +4639,7 @@ is-date-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== -is-docker@^2.0.0, is-docker@^2.1.1: +is-docker@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== @@ -4899,14 +4723,6 @@ is-plain-object@^5.0.0: resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== -is-regex@^1.0.4: - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" - integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== - dependencies: - call-bind "^1.0.2" - has-symbols "^1.0.2" - is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -5412,41 +5228,6 @@ jws@^3.2.1, jws@^3.2.2: jwa "^1.4.1" safe-buffer "^5.0.1" -kbpgp@^2.1.15: - version "2.1.15" - resolved "https://registry.yarnpkg.com/kbpgp/-/kbpgp-2.1.15.tgz#f7b66ed6bad4eb51f355c3e164aea36a4ed124a5" - integrity sha512-iFdQT+m2Mi2DB14kEFydF2joNe9x3E2VZCGZUt7UXsiZnQx5TtSl4KofP7EPtjHvf7weCxNKlEPSYiiCNMZ2jA== - dependencies: - bn "^1.0.5" - bzip-deflate "^1.0.0" - deep-equal "^1.1.0" - iced-error "0.0.13" - iced-lock "^1.0.2" - iced-runtime "^1.0.4" - keybase-ecurve "^1.0.1" - keybase-nacl "^1.1.2" - minimist "^1.2.0" - pgp-utils "0.0.35" - purepack "^1.0.5" - triplesec "^4.0.3" - tweetnacl "^0.13.1" - -keybase-ecurve@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/keybase-ecurve/-/keybase-ecurve-1.0.1.tgz#a47f2e0bf1c6d6dae624759d237ef6c3931f8ac2" - integrity sha512-2GlVxDsNF+52LtYjgFsjoKuN7MQQgiVeR4HRdJxLuN8fm4mf4stGKPUjDJjky15c/98UsZseLjp7Ih5X0Sy1jQ== - dependencies: - bn "^1.0.4" - -keybase-nacl@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/keybase-nacl/-/keybase-nacl-1.1.4.tgz#729011435296e21bd7b06a335a413cbde1827096" - integrity sha512-7TFyWLq42CQs7JES9arR+Vnv/eMk5D6JT1Y8samrEA5ff3FOmaiRcXIVrwJQd3KJduxmSjgAjdkXlQK7Q437xQ== - dependencies: - iced-runtime "^1.0.2" - tweetnacl "^0.13.1" - uint64be "^1.0.1" - keypress@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/keypress/-/keypress-0.2.1.tgz#1e80454250018dbad4c3fe94497d6e67b6269c77" @@ -5574,11 +5355,6 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= - lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" @@ -5654,21 +5430,6 @@ lodash.set@^4.3.2: resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM= -lodash.template@^4.4.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" - integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.templatesettings "^4.0.0" - -lodash.templatesettings@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" - integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" @@ -6106,13 +5867,6 @@ mock-stdin@^1.0.0: resolved "https://registry.yarnpkg.com/mock-stdin/-/mock-stdin-1.0.0.tgz#efcfaf4b18077e14541742fd758b9cae4e5365ea" integrity sha512-tukRdb9Beu27t6dN+XztSRHq9J0B/CoAOySGzHfn8UTfmqipA5yNT/sDUEyYdAV3Hpka6Wx6kOMxuObdOex60Q== -more-entropy@>=0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/more-entropy/-/more-entropy-0.0.7.tgz#67bfc6f7a86f26fbc37aac83fd46d88c61d109b5" - integrity sha1-Z7/G96hvJvvDeqyD/UbYjGHRCbU= - dependencies: - iced-runtime ">=0.0.1" - mri@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.6.tgz#49952e1044db21dbf90f6cd92bc9c9a777d415a6" @@ -6294,20 +6048,6 @@ nock@^13.0.0: lodash.set "^4.3.2" propagate "^2.0.0" -node-domexception@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" - integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== - -node-fetch@*, node-fetch@^3.2.3: - version "3.2.10" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.10.tgz#e8347f94b54ae18b57c9c049ef641cef398a85c8" - integrity sha512-MhuzNwdURnZ1Cp4XTazr69K0BTizsBroX7Zx3UgDSVcZYKF/6p0CBe4EUb/hLqmzVhl0UpYfgRljQ4yxE+iCxA== - dependencies: - data-uri-to-buffer "^4.0.0" - fetch-blob "^3.1.4" - formdata-polyfill "^4.0.10" - node-fetch@^2.6.1, node-fetch@^2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" @@ -6527,14 +6267,6 @@ object-inspect@^1.11.0, object-inspect@^1.12.2, object-inspect@^1.9.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== -object-is@^1.0.1: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -6602,15 +6334,6 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -open@8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - open@^7.0.0: version "7.4.2" resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" @@ -6897,7 +6620,7 @@ pascal-case@^3.1.2: no-case "^3.0.4" tslib "^2.0.3" -password-prompt@^1.0.7, password-prompt@^1.1.2: +password-prompt@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/password-prompt/-/password-prompt-1.1.2.tgz#85b2f93896c5bd9e9f2d6ff0627fa5af3dc00923" integrity sha512-bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA== @@ -6965,14 +6688,6 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -pgp-utils@0.0.35: - version "0.0.35" - resolved "https://registry.yarnpkg.com/pgp-utils/-/pgp-utils-0.0.35.tgz#3cb3ccf355bea08073d99c9d8ec27984a14f43f6" - integrity sha512-gCT6EbSTgljgycVa5qGpfRITaLOLbIKsEVRTdsNRgmLMAJpuJNNdrTn/95r8IWo9rFLlccfmGMJXkG9nVDwmrA== - dependencies: - iced-error ">=0.0.8" - iced-runtime ">=0.0.1" - picomatch@^2.0.4, picomatch@^2.2.1: version "2.3.0" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" @@ -7081,11 +6796,6 @@ progress@^2.0.0: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -progress@~1.1.2: - version "1.1.8" - resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" - integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74= - 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" @@ -7163,11 +6873,6 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -purepack@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/purepack/-/purepack-1.0.6.tgz#d8336e739ee8644fc6697ad38d3aa50a03aa7d37" - integrity sha512-L/e3qq/3m/TrYtINo2aBB98oz6w8VHGyFy+arSKwPMZDUNNw2OaQxYnZO6UIZZw2OnRl2qkxGmuSOEfsuHXJdA== - q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -7354,14 +7059,6 @@ regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== -regexp.prototype.flags@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" - integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - regexpp@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" @@ -7998,7 +7695,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string-width@^2.0.0, string-width@^2.1.1: +string-width@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -8006,15 +7703,6 @@ string-width@^2.0.0, string-width@^2.1.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - string-width@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.0.1.tgz#0d8158335a6cfd8eb95da9b6b262ce314a036ffd" @@ -8073,7 +7761,7 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.0.0, strip-ansi@^5.1.0: +strip-ansi@^5.0.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== @@ -8160,7 +7848,7 @@ supports-color@^2.0.0: resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= -supports-color@^5.0.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0: +supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -8179,14 +7867,6 @@ supports-color@^9.2.2: resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-9.2.2.tgz#502acaf82f2b7ee78eb7c83dcac0f89694e5a7bb" integrity sha512-XC6g/Kgux+rJXmwokjm9ECpD6k/smUoS5LKlUCcsYr4IY3rW0XyAympon2RmxGrlnZURMpg5T18gWDP9CsHXFA== -supports-hyperlinks@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz#71daedf36cc1060ac5100c351bb3da48c29c0ef7" - integrity sha512-HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw== - dependencies: - has-flag "^2.0.0" - supports-color "^5.0.0" - supports-hyperlinks@^2.1.0, supports-hyperlinks@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" @@ -8369,11 +8049,6 @@ tree-kill@^1.2.2: resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== -treeify@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8" - integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A== - treeverse@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f" @@ -8384,18 +8059,6 @@ trim-newlines@^3.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== -triplesec@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/triplesec/-/triplesec-4.0.3.tgz#fce5b89821b24d3a03bd09a15a4baecbd6a9b7a4" - integrity sha512-fug70e1nJoCMxsXQJlETisAALohm84vl++IiTTHEqM7Lgqwz62jrlwqOC/gJEAJjO/ByN127sEcioB56HW3wIw== - dependencies: - iced-error ">=0.0.9" - iced-lock "^1.0.1" - iced-runtime "^1.0.2" - more-entropy ">=0.0.7" - progress "~1.1.2" - uglify-js "^3.1.9" - ts-json-schema-generator@^0.97.0: version "0.97.0" resolved "https://registry.yarnpkg.com/ts-json-schema-generator/-/ts-json-schema-generator-0.97.0.tgz#ea4f2ddbcba1fb6c0a2f97d242783b7fdc8e203b" @@ -8488,11 +8151,6 @@ tunnel-agent@*, tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tweetnacl@^0.13.1: - version "0.13.3" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.13.3.tgz#d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56" - integrity sha1-1ii1bzvMPVrnS6nUwacE3vWrS1Y= - tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" @@ -8585,16 +8243,11 @@ typescript@~4.4.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c" integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA== -uglify-js@^3.1.4, uglify-js@^3.1.9: +uglify-js@^3.1.4: version "3.13.10" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.10.tgz#a6bd0d28d38f592c3adb6b180ea6e07e1e540a8d" integrity sha512-57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg== -uint64be@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uint64be/-/uint64be-1.0.1.tgz#1f7154202f2a1b8af353871dda651bf34ce93e95" - integrity sha1-H3FUIC8qG4rzU4cd2mUb80zpPpU= - unbox-primitive@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" @@ -8788,11 +8441,6 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" -web-streams-polyfill@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.1.1.tgz#1516f2d4ea8f1bdbfed15eb65cb2df87098c8364" - integrity sha512-Czi3fG883e96T4DLEPRvufrF2ydhOOW1+1a6c3gNjH2aIh50DNFBdfwh2AKoOf1rXvpvavAoA11Qdq9+BKjE0Q== - webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" @@ -8865,13 +8513,6 @@ wide-align@^1.1.2: dependencies: string-width "^1.0.2 || 2 || 3 || 4" -widest-line@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc" - integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA== - dependencies: - string-width "^2.1.1" - widest-line@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" @@ -8902,15 +8543,6 @@ wrap-ansi@^2.0.0: string-width "^1.0.1" strip-ansi "^3.0.1" -wrap-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-4.0.0.tgz#b3570d7c70156159a2d42be5cc942e957f7b1131" - integrity sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg== - dependencies: - ansi-styles "^3.2.0" - string-width "^2.1.1" - strip-ansi "^4.0.0" - wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" From 4f933b5356928f5f3f0d8a7620de434801beb27f Mon Sep 17 00:00:00 2001 From: mshanemc Date: Wed, 28 Sep 2022 10:27:04 -0500 Subject: [PATCH 5/6] docs: readme link broken --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6382af8d..add3fe07 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Functions plugin for the SF CLI # Usage -1. Install the SF CLI: [Install instructions](https://developer.salesforce.com/docs/atlas.en-us.sfdx_setup.meta/sfdx_setup/sfdx_setup_install_CliUx.uxhtm) +1. Install the SF CLI: [Install instructions](https://developer.salesforce.com/docs/atlas.en-us.sfdx_setup.meta/sfdx_setup/sfdx_setup_install_cli.htm) 2. Then run `sf plugins:install @salesforce/plugin-functions`: ```sh-session From 2a09f7ce4b8a13bb08ef5b4a6446958d5bcf52cc Mon Sep 17 00:00:00 2001 From: mshanemc Date: Wed, 28 Sep 2022 11:00:19 -0500 Subject: [PATCH 6/6] style: typo --- src/commands/env/delete.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/env/delete.ts b/src/commands/env/delete.ts index 9fd3deac..15c81ecb 100644 --- a/src/commands/env/delete.ts +++ b/src/commands/env/delete.ts @@ -115,7 +115,7 @@ export default class EnvDelete extends Command { const error = err as Error; // It's possible that they are deleting the compute environment after deleting the org it was // connected to, in which case `resolveOrg` will error and we simply want to skip the process - // of cleaning up functon refs since they're all already gone. Otherwise, something else has + // of cleaning up function refs since they're all already gone. Otherwise, something else has // gone wrong and we go ahead and bail out. if (error.message !== 'Attempted to resolve an org without a valid org ID') { this.error(error);