Skip to content

Commit

Permalink
chore: merge main, resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@WillieRuemmele
WillieRuemmele committed Oct 30, 2023
2 parents 7fe8ff2 + 6f09e77 commit 2c22da3
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 25 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## [1.4.37](https://github.com/salesforcecli/plugin-settings/compare/1.4.36...1.4.37) (2023-10-28)

### Bug Fixes

- **deps:** bump @salesforce/core from 5.3.10 to 5.3.14 ([11c6b2f](https://github.com/salesforcecli/plugin-settings/commit/11c6b2fa4746cc5e68251f03610cee1743ebf466))

## [1.4.36](https://github.com/salesforcecli/plugin-settings/compare/1.4.35...1.4.36) (2023-10-22)

### Bug Fixes
Expand Down
14 changes: 7 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ EXAMPLES
$ sf alias list
```

_See code: [src/commands/alias/list.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.36/src/commands/alias/list.ts)_
_See code: [src/commands/alias/list.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.37/src/commands/alias/list.ts)_

## `sf alias set`

Expand Down Expand Up @@ -155,7 +155,7 @@ EXAMPLES
$ sf alias set my-scratch-org [email protected]
```

_See code: [src/commands/alias/set.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.36/src/commands/alias/set.ts)_
_See code: [src/commands/alias/set.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.37/src/commands/alias/set.ts)_

## `sf alias unset`

Expand Down Expand Up @@ -194,7 +194,7 @@ EXAMPLES
$ sf alias unset --all [--no-prompt]
```

_See code: [src/commands/alias/unset.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.36/src/commands/alias/unset.ts)_
_See code: [src/commands/alias/unset.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.37/src/commands/alias/unset.ts)_

## `sf config get`

Expand Down Expand Up @@ -231,7 +231,7 @@ EXAMPLES
$ sf config get target-org api-version --verbose
```

_See code: [src/commands/config/get.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.36/src/commands/config/get.ts)_
_See code: [src/commands/config/get.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.37/src/commands/config/get.ts)_

## `sf config list`

Expand Down Expand Up @@ -270,7 +270,7 @@ EXAMPLES
$ sf config list
```

_See code: [src/commands/config/list.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.36/src/commands/config/list.ts)_
_See code: [src/commands/config/list.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.37/src/commands/config/list.ts)_

## `sf config set`

Expand Down Expand Up @@ -327,7 +327,7 @@ EXAMPLES
$ sf config set --global target-org=my-scratch-org target-dev-hub=my-dev-hub
```

_See code: [src/commands/config/set.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.36/src/commands/config/set.ts)_
_See code: [src/commands/config/set.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.37/src/commands/config/set.ts)_

## `sf config unset`

Expand Down Expand Up @@ -365,6 +365,6 @@ EXAMPLES
$ sf config unset target-org api-version --global
```

_See code: [src/commands/config/unset.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.36/src/commands/config/unset.ts)_
_See code: [src/commands/config/unset.ts](https://github.com/salesforcecli/plugin-settings/blob/1.4.37/src/commands/config/unset.ts)_

<!-- commandsstop -->
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
{
"name": "@salesforce/plugin-settings",
"description": "configure the Salesforce CLI",
"version": "1.4.36",
"version": "1.4.37",
"author": "Salesforce",
"bugs": "https://github.com/forcedotcom/cli/issues",
"dependencies": {
"@oclif/core": "^3.9.0",
"@salesforce/core": "^5.3.10",
"@salesforce/core": "^5.3.14",
"@salesforce/sf-plugins-core": "^4.0.0",
"fast-levenshtein": "^3.0.0"
},
"devDependencies": {
"@oclif/plugin-command-snapshot": "^5.0.1",
"@oclif/test": "^3.0.3",
"@salesforce/cli-plugins-testkit": "^4.4.7",
"@salesforce/cli-plugins-testkit": "^4.4.11",
"@salesforce/dev-config": "^4.1.0",
"@salesforce/dev-scripts": "^5.12.2",
"@salesforce/kit": "^3.0.11",
"@salesforce/plugin-command-reference": "^3.0.40",
"@salesforce/plugin-command-reference": "^3.0.44",
"@salesforce/plugin-deploy-retrieve": "^1.18.7",
"@salesforce/prettier-config": "^0.0.3",
"@salesforce/ts-sinon": "^1.4.17",
"@salesforce/ts-types": "^2.0.9",
"@swc/core": "^1.3.27",
"@types/fast-levenshtein": "^0.0.3",
"@types/fs-extra": "^9.0.13",
"@types/shelljs": "^0.8.13",
"@types/shelljs": "^0.8.14",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"chai": "^4.3.10",
Expand Down
50 changes: 37 additions & 13 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -978,13 +978,13 @@
istanbul-lib-report "^3.0.1"
istanbul-reports "^3.1.6"

"@salesforce/cli-plugins-testkit@^4.4.7":
version "4.4.10"
resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-4.4.10.tgz#d71f1688c8455acb5eb6b9553beb4d52b08ba7b6"
integrity sha512-qFC/U49CNostlj9AGwEODCGmmXo+lF5Uqrp0y0l1yRmgDriti8oz01/CBtgww6Fx/HTRKmo4EO6bGsSBXqZpuw==
"@salesforce/cli-plugins-testkit@^4.4.11":
version "4.4.11"
resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-4.4.11.tgz#eca52e8dc348222fe3c306a21d80d6f12899da74"
integrity sha512-OANYcjzsBK10BTst9ap+GLeJxsb31vB2aK2hFrF+naAzW3QmPXmQ0trK5ReipalKruGN35c5t/YXZdgKtLElmA==
dependencies:
"@salesforce/core" "^5.3.10"
"@salesforce/kit" "^3.0.13"
"@salesforce/kit" "^3.0.15"
"@salesforce/ts-types" "^2.0.6"
"@types/shelljs" "^0.8.14"
debug "^4.3.1"
Expand All @@ -993,7 +993,31 @@
strip-ansi "6.0.1"
ts-retry-promise "^0.7.1"

"@salesforce/core@^5.2.0", "@salesforce/core@^5.3.1", "@salesforce/core@^5.3.10", "@salesforce/core@^5.3.9":
"@salesforce/core@^5.2.0", "@salesforce/core@^5.3.1", "@salesforce/core@^5.3.10", "@salesforce/core@^5.3.14":
version "5.3.14"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-5.3.14.tgz#a5a3d02be6727492469ed39b23eaf3c56675496b"
integrity sha512-IFmLZCpFBcreTFEaH+Rn4BozUpFx3vvf43yWuXWdOvALz4ad18yU3Kzk9GxwzablrQxPFmJ43ClQG10dmoh/ig==
dependencies:
"@salesforce/kit" "^3.0.14"
"@salesforce/schemas" "^1.6.1"
"@salesforce/ts-types" "^2.0.8"
"@types/semver" "^7.5.3"
ajv "^8.12.0"
change-case "^4.1.2"
faye "^1.4.0"
form-data "^4.0.0"
js2xmlparser "^4.0.1"
jsforce "^2.0.0-beta.28"
jsonwebtoken "9.0.2"
jszip "3.10.1"
pino "^8.16.0"
pino-abstract-transport "^1.0.0"
pino-pretty "^10.2.3"
proper-lockfile "^4.1.2"
semver "^7.5.4"
ts-retry-promise "^0.7.1"

"@salesforce/core@^5.3.9":
version "5.3.12"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-5.3.12.tgz#0ff38307b39d9abb8aedaa575ecd6d037bc8eee1"
integrity sha512-A2oOBiGvZRxcdUcz8oA1B0l2nQZApmBQnbUUrsH18isgb9seQLTGuV6YelY4rLZbGsfcp3rzbERMGrHas+OuXQ==
Expand Down Expand Up @@ -1061,15 +1085,15 @@
typescript "^4.9.5"
wireit "^0.14.1"

"@salesforce/kit@^3.0.11", "@salesforce/kit@^3.0.13", "@salesforce/kit@^3.0.14":
"@salesforce/kit@^3.0.11", "@salesforce/kit@^3.0.13", "@salesforce/kit@^3.0.14", "@salesforce/kit@^3.0.15":
version "3.0.15"
resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.0.15.tgz#713df3f5767f874c70a2e731c7cb5ba677989559"
integrity sha512-XkA8jsuLvVnyP460dAbU3pBFP2IkmmmsVxMQVifcKKbNWaIBbZBzAfj+vdaQfnvZyflLhsrFT3q2xkb0vHouPg==
dependencies:
"@salesforce/ts-types" "^2.0.9"
tslib "^2.6.2"

"@salesforce/plugin-command-reference@^3.0.40":
"@salesforce/plugin-command-reference@^3.0.44":
version "3.0.44"
resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-3.0.44.tgz#ee6b79ca8d7d3d59787f0247049dc451e5bd374d"
integrity sha512-x+5l0BpAbGL3UCpNlMrIsLd5+M55Vn+cCxuL2VqDO1cG6gVi5NO/3vnJ4O/8kfM4fA7vgA6J5euZMoFXc/qM/A==
Expand Down Expand Up @@ -1104,10 +1128,10 @@
resolved "https://registry.yarnpkg.com/@salesforce/prettier-config/-/prettier-config-0.0.3.tgz#ba648d4886bb38adabe073dbea0b3a91b3753bb0"
integrity sha512-hYOhoPTCSYMDYn+U1rlEk16PoBeAJPkrdg4/UtAzupM1mRRJOwEPMG1d7U8DxJFKuXW3DMEYWr2MwAIBDaHmFg==

"@salesforce/schemas@^1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.0.tgz#14505ebad2fb2d4f7b14837545d662766d293561"
integrity sha512-SwhDTLucj/GRbPpxlEoDZeqlX22o+G6fiebTXTu1cZKmd1oE0W2L7SlTTgJnWck8bhTeBIgQi9cpD8c2t5ISKA==
"@salesforce/schemas@^1.6.0", "@salesforce/schemas@^1.6.1":
version "1.6.1"
resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.1.tgz#7d1c071e1e509ca9d2d8a6e48ac7447dd67a534d"
integrity sha512-eVy947ZMxCJReKJdgfddUIsBIbPTa/i8RwQGwxq4/ss38H5sLOAeSTaun9V7HpJ1hkpDznWKfgzYvjsst9K6ig==

"@salesforce/sf-plugins-core@^3.1.22", "@salesforce/sf-plugins-core@^3.1.28":
version "3.1.28"
Expand Down Expand Up @@ -1596,7 +1620,7 @@
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.4.tgz#0a41252ad431c473158b22f9bfb9a63df7541cff"
integrity sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==

"@types/shelljs@^0.8.13", "@types/shelljs@^0.8.14":
"@types/shelljs@^0.8.14":
version "0.8.14"
resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.14.tgz#87b8817b2397ffe97b86a4d844036ee0d2a1f0ca"
integrity sha512-eqKaGPi60riuxI9pUVeCT02EGo94Y6HT119h7w5bXSELsis6+JqzdEy6H/w2xXl881wcN3VDnb/D0WlgSety5w==
Expand Down

0 comments on commit 2c22da3

Please sign in to comment.