Skip to content

Commit 40e90c9

Browse files
authored
Merge pull request #1068 from salesforcecli/hc/check-recommended-version-id-ancestry
W-19900152 - check recommended version ancestry
2 parents 0c50e30 + 0ec8041 commit 40e90c9

File tree

6 files changed

+45
-27
lines changed

6 files changed

+45
-27
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -808,6 +808,8 @@ FLAGS
808808
--api-version=<value> Override the api version used for api requests made by this command
809809
--[no-]enable-app-analytics Enable AppExchange App Analytics usage data collection on this managed
810810
package and its components.
811+
--skip-ancestor-check Bypass checking that the new recommended version is an ancestor of the
812+
previous recommended version.
811813
812814
GLOBAL FLAGS
813815
--flags-dir=<value> Import flag values from a directory.

command-snapshot.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,8 @@
375375
"name",
376376
"package",
377377
"target-dev-hub",
378-
"recommended-version-id"
378+
"recommended-version-id",
379+
"skip-ancestor-check"
379380
],
380381
"plugin": "@salesforce/plugin-packaging"
381382
},

messages/package_update.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,7 @@ Package version ID that subscribers are notified to install or upgrade to.
4545
# flags.recommended-version-id.description
4646

4747
Specify the recommended package version for subscribers to install. Subscribers are notified to install the package version ID that you specify. If the subscribers have a different version of the same package installed, they're notified to upgrade to the recommended version.
48+
49+
# flags.skip-ancestor-check.summary
50+
51+
Bypass the ancestry check for setting a recommended version.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@oclif/core": "^4",
99
"@salesforce/core": "^8.23.2",
1010
"@salesforce/kit": "^3.2.4",
11-
"@salesforce/packaging": "^4.16.0",
11+
"@salesforce/packaging": "^4.17.0",
1212
"@salesforce/sf-plugins-core": "^12.2.4",
1313
"chalk": "^5.6.2"
1414
},

src/commands/package/update.ts

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ export class PackageUpdateCommand extends SfCommand<PackageSaveResult> {
6464
summary: messages.getMessage('flags.recommended-version-id.summary'),
6565
description: messages.getMessage('flags.recommended-version-id.description'),
6666
}),
67+
'skip-ancestor-check': Flags.boolean({
68+
summary: messages.getMessage('flags.skip-ancestor-check.summary'),
69+
}),
6770
};
6871

6972
public async run(): Promise<PackageSaveResult> {
@@ -75,14 +78,17 @@ export class PackageUpdateCommand extends SfCommand<PackageSaveResult> {
7578
project: await maybeGetProject(),
7679
});
7780

78-
const result = await pkg.update({
79-
Id: pkg.getId(),
80-
Name: flags.name,
81-
Description: flags.description,
82-
PackageErrorUsername: flags['error-notification-username'],
83-
AppAnalyticsEnabled: flags['enable-app-analytics'],
84-
RecommendedVersionId: flags['recommended-version-id'],
85-
});
81+
const result = await pkg.update(
82+
{
83+
Id: pkg.getId(),
84+
Name: flags.name,
85+
Description: flags.description,
86+
PackageErrorUsername: flags['error-notification-username'],
87+
AppAnalyticsEnabled: flags['enable-app-analytics'],
88+
RecommendedVersionId: flags['recommended-version-id'],
89+
},
90+
flags['skip-ancestor-check']
91+
);
8692

8793
this.logSuccess(messages.getMessage('success', [pkg.getId()]));
8894

yarn.lock

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1616,7 +1616,7 @@
16161616
"@jridgewell/resolve-uri" "^3.1.0"
16171617
"@jridgewell/sourcemap-codec" "^1.4.14"
16181618

1619-
"@jsforce/jsforce-node@^3.10.4", "@jsforce/jsforce-node@^3.10.8":
1619+
"@jsforce/jsforce-node@^3.10.8":
16201620
version "3.10.8"
16211621
resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.10.8.tgz#f13903a0885fa3501a513512984cf9a717aebb9a"
16221622
integrity sha512-XGD/ivZz+htN5SgctFyEZ+JNG6C8FXzaEwvPbRSdsIy/hpWlexY38XtTpdT5xX3KnYSnOE4zA1M/oIbTm7RD/Q==
@@ -1827,7 +1827,7 @@
18271827
strip-ansi "6.0.1"
18281828
ts-retry-promise "^0.8.1"
18291829

1830-
"@salesforce/core@^8.18.7", "@salesforce/core@^8.23.0", "@salesforce/core@^8.23.1", "@salesforce/core@^8.23.2", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0":
1830+
"@salesforce/core@^8.18.7", "@salesforce/core@^8.23.1", "@salesforce/core@^8.23.2", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0":
18311831
version "8.23.2"
18321832
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.23.2.tgz#218152b97e05745cd0499ad2594df4443fa8aa18"
18331833
integrity sha512-9XUlaI0orvdjDJZsgjt0lVLa5wrFWNaorRbshT/EJ6fIiqcAehOV2bR62NJtRhrOrgu1h34bTmUqMo+yUEES9w==
@@ -1896,16 +1896,16 @@
18961896
dependencies:
18971897
"@salesforce/ts-types" "^2.0.12"
18981898

1899-
"@salesforce/packaging@^4.16.0":
1900-
version "4.16.0"
1901-
resolved "https://registry.yarnpkg.com/@salesforce/packaging/-/packaging-4.16.0.tgz#e7ba298a7e00c5dc72a21b6764ff2c9a8a5e82fc"
1902-
integrity sha512-B9pNih9LpISVqKJWQ/dN9SKsppqrOXMECiGxEq+x4NZPV9Rgf9HJEpJL17LkI2KGynKwL+Hpflo9zMeiZ6JzJQ==
1899+
"@salesforce/packaging@^4.17.0":
1900+
version "4.17.0"
1901+
resolved "https://registry.yarnpkg.com/@salesforce/packaging/-/packaging-4.17.0.tgz#809491060b26a71c4a736879154d20215c216796"
1902+
integrity sha512-3RA14IxY3RsCHLdEgLAdUTdwEzllcowRuVGWOSFw6XrpEJ779vZl+JfEVAklPwQWZGrEsNzhUf34FFrewtbchw==
19031903
dependencies:
1904-
"@jsforce/jsforce-node" "^3.10.4"
1905-
"@salesforce/core" "^8.23.0"
1904+
"@jsforce/jsforce-node" "^3.10.8"
1905+
"@salesforce/core" "^8.23.2"
19061906
"@salesforce/kit" "^3.2.3"
19071907
"@salesforce/schemas" "^1.10.3"
1908-
"@salesforce/source-deploy-retrieve" "^12.16.9"
1908+
"@salesforce/source-deploy-retrieve" "^12.24.0"
19091909
"@salesforce/ts-types" "^2.0.11"
19101910
"@salesforce/types" "^1.2.0"
19111911
fast-xml-parser "^4.5.0"
@@ -1974,15 +1974,15 @@
19741974
cli-progress "^3.12.0"
19751975
terminal-link "^3.0.0"
19761976

1977-
"@salesforce/source-deploy-retrieve@^12.16.9":
1978-
version "12.24.0"
1979-
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.24.0.tgz#cc4e38175436aeb6c9c22ee795924c96d7ef87c8"
1980-
integrity sha512-gjS6whT1575UGxwR2foDILlsbDQPwng0rNyXsk39hwg+bRsbHABZGzxU5EeUIzpKqv4bf6C9z/BLYiHMcZocoQ==
1977+
"@salesforce/source-deploy-retrieve@^12.24.0":
1978+
version "12.24.3"
1979+
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.24.3.tgz#125be3a3e6d0d0f21068648ce4a2e4bb49ea57b6"
1980+
integrity sha512-MTpilWa+1mOqZUEmbE7K/vgHAT0FjGDv9L6vn7Cof3kRhk3RZprIjR6Sd9/x1WteI+hR5JAMCDbKT/WiWJcKYw==
19811981
dependencies:
1982-
"@salesforce/core" "^8.23.1"
1983-
"@salesforce/kit" "^3.2.3"
1982+
"@salesforce/core" "^8.23.2"
1983+
"@salesforce/kit" "^3.2.4"
19841984
"@salesforce/ts-types" "^2.0.12"
1985-
"@salesforce/types" "^1.4.0"
1985+
"@salesforce/types" "^1.5.0"
19861986
fast-levenshtein "^3.0.0"
19871987
fast-xml-parser "^4.5.3"
19881988
got "^11.8.6"
@@ -1999,11 +1999,16 @@
19991999
resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.12.tgz#60420622812a7ec7e46d220667bc29b42dc247ff"
20002000
integrity sha512-BIJyduJC18Kc8z+arUm5AZ9VkPRyw1KKAm+Tk+9LT99eOzhNilyfKzhZ4t+tG2lIGgnJpmytZfVDZ0e2kFul8g==
20012001

2002-
"@salesforce/types@^1.2.0", "@salesforce/types@^1.4.0":
2002+
"@salesforce/types@^1.2.0":
20032003
version "1.4.0"
20042004
resolved "https://registry.yarnpkg.com/@salesforce/types/-/types-1.4.0.tgz#a8b8baa0b7cc9cb6718379464d9bc9e4ab834e9e"
20052005
integrity sha512-WpXzQd+JglQrwUs05ePGa1/vFFn1s7rymw2ltBbFj2Z0p/ez1ft6J39ILVlteS/mGca47Ce8JN+u3USVxfxkKA==
20062006

2007+
"@salesforce/types@^1.5.0":
2008+
version "1.5.0"
2009+
resolved "https://registry.yarnpkg.com/@salesforce/types/-/types-1.5.0.tgz#dd1db8651ae9729c133ee5224ec7fbf50b1087ad"
2010+
integrity sha512-zBihdJ6WwE0JP6BVCXhm7guMQlj4/7nCYqtrkozgxgeKLJq+zKrTRwILeRQbbeqVP4nKjUz/AJr0zCDjrA2IVg==
2011+
20072012
"@shikijs/core@1.29.2":
20082013
version "1.29.2"
20092014
resolved "https://registry.yarnpkg.com/@shikijs/core/-/core-1.29.2.tgz#9c051d3ac99dd06ae46bd96536380c916e552bf3"

0 commit comments

Comments
 (0)