From 63b501c2e4144032a2bc0ce3c4f0fcfd04fac3a9 Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Tue, 3 Nov 2026 22:39:30 +0000 Subject: [PATCH 1/2] chore(release): bump to 2.157.8 --- README.md | 36 +++++++++++++++++------------------ package.json | 4 ++-- yarn.lock | 53 +++++++++++++++++++++++++++++++++++----------------- 3 files changed, 56 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index e88e3a22..849394b4 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ $ npm install -g @salesforce/cli $ sf COMMAND running command... $ sf (--version|-v) -@salesforce/cli/2.157.7 linux-x64 node-v24.22.1 +@salesforce/cli/2.157.8 linux-x64 node-v26.13.0 $ sf --help [COMMAND] USAGE $ sf COMMAND @@ -9651,7 +9651,7 @@ FLAG DESCRIPTIONS If you specify this flag, don’t specify --metadata or --source-dir. ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/convert/mdapi.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/convert/mdapi.ts)_ ## `sf project convert source` @@ -9724,7 +9724,7 @@ FLAG DESCRIPTIONS Override the api version used for api requests made by this command ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/convert/source.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/convert/source.ts)_ ## `sf project convert source-behavior` @@ -9783,7 +9783,7 @@ EXAMPLES $ sf project convert source-behavior --behavior decomposePermissionSetBeta --dry-run --preserve-temp-dir ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/convert/source-behavior.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/convert/source-behavior.ts)_ ## `sf project delete source` @@ -9936,7 +9936,7 @@ FLAG DESCRIPTIONS - Separate the test names with spaces: --tests Test1 Test2 "Test With Space" ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/delete/source.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/delete/source.ts)_ ## `sf project delete tracking` @@ -9973,7 +9973,7 @@ EXAMPLES $ sf project delete tracking --target-org my-scratch ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/delete/tracking.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/delete/tracking.ts)_ ## `sf project deploy cancel` @@ -10045,7 +10045,7 @@ FLAG DESCRIPTIONS project deploy report". ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/deploy/cancel.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/deploy/cancel.ts)_ ## `sf project deploy preview` @@ -10128,7 +10128,7 @@ FLAG DESCRIPTIONS All child components are included. If you specify this flag, don’t specify --metadata or --source-dir. ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/deploy/preview.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/deploy/preview.ts)_ ## `sf project deploy quick` @@ -10221,7 +10221,7 @@ ERROR CODES Canceling (69) The deploy is being canceled. ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/deploy/quick.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/deploy/quick.ts)_ ## `sf project deploy report` @@ -10313,7 +10313,7 @@ FLAG DESCRIPTIONS --coverage-formatters lcov --coverage-formatters clover ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/deploy/report.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/deploy/report.ts)_ ## `sf project deploy resume` @@ -10410,7 +10410,7 @@ ERROR CODES Canceling (69) The deploy is being canceled. ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/deploy/resume.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/deploy/resume.ts)_ ## `sf project deploy start` @@ -10676,7 +10676,7 @@ ERROR CODES Canceling (69) The deploy is being canceled. ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/deploy/start.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/deploy/start.ts)_ ## `sf project deploy validate` @@ -10880,7 +10880,7 @@ ERROR CODES Canceling (69) The deploy is being canceled. ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/deploy/validate.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/deploy/validate.ts)_ ## `sf project generate manifest` @@ -10976,7 +10976,7 @@ EXAMPLES $ sf project generate manifest --from-org test@myorg.com --excluded-metadata StandardValueSet ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/generate/manifest.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/generate/manifest.ts)_ ## `sf project list ignored` @@ -11018,7 +11018,7 @@ EXAMPLES $ sf project list ignored --source-dir package.xml ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/list/ignored.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/list/ignored.ts)_ ## `sf project reset tracking` @@ -11067,7 +11067,7 @@ EXAMPLES $ sf project reset tracking --revision 30 ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/reset/tracking.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/reset/tracking.ts)_ ## `sf project retrieve preview` @@ -11121,7 +11121,7 @@ FLAG DESCRIPTIONS production orgs. ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/retrieve/preview.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/retrieve/preview.ts)_ ## `sf project retrieve start` @@ -11310,7 +11310,7 @@ ENVIRONMENT VARIABLES SF_USE_PROGRESS_BAR Set to false to disable the progress bar when running the metadata deploy command. ``` -_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.2.24/src/commands/project/retrieve/start.ts)_ +_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/4.3.2/src/commands/project/retrieve/start.ts)_ ## `sf schema generate field` diff --git a/package.json b/package.json index d801124b..731706cb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@salesforce/cli", "description": "The Salesforce CLI", - "version": "2.157.7", + "version": "2.157.8", "author": "Salesforce", "bin": { "sf": "./bin/run.js", @@ -162,7 +162,7 @@ "@salesforce/plugin-api": "2.0.24", "@salesforce/plugin-auth": "6.0.0", "@salesforce/plugin-data": "5.1.24", - "@salesforce/plugin-deploy-retrieve": "4.2.24", + "@salesforce/plugin-deploy-retrieve": "4.3.2", "@salesforce/plugin-info": "4.0.22", "@salesforce/plugin-limits": "4.0.6", "@salesforce/plugin-marketplace": "2.0.23", diff --git a/yarn.lock b/yarn.lock index e100e90c..dc5efe8c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2071,12 +2071,12 @@ dependencies: "@salesforce/ts-types" "^2.0.12" -"@salesforce/kit@^4.0.0", "@salesforce/kit@^4.0.1", "@salesforce/kit@^4.0.5": - version "4.0.5" - resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-4.0.5.tgz#2d941de4ca2a8cfaeb5cb176f3e9e2e1d6012c88" - integrity sha512-BIrw5ycVufW72A/R2ubapjTBg8IgXN8MY5T9a7SI3VDATYKIRZRjA73c3FjsSVhRSH89CSm/2UT7eI3G+MuQdw== +"@salesforce/kit@^4.0.0", "@salesforce/kit@^4.0.1", "@salesforce/kit@^4.0.5", "@salesforce/kit@^4.0.8": + version "4.0.9" + resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-4.0.9.tgz#2f9af0c0a21edff06e35a6e0d04eda7de658ce46" + integrity sha512-51uNidO4FDPnAydHSG4LnUV8CGixpUJ5e++XZh3TCR6VFUidxKIQVRrIWIebcD9yLc13DMhkqt74ofZC3Fu1Kg== dependencies: - "@salesforce/ts-types" "^3.2.0" + "@salesforce/ts-types" "^3.2.3" "@salesforce/o11y-reporter@1.8.5": version "1.8.5" @@ -2206,26 +2206,26 @@ undici "^8.12.3" zod "^4.6.7" -"@salesforce/plugin-deploy-retrieve@4.2.24": - version "4.2.24" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-4.2.24.tgz#08596967ebe066cc41db1cc31203b57161f03cdb" - integrity sha512-0NvQqnOnR8TVD7EaqIIj8+KG9syjsCP49BHoTlntFoajm4BQgAjIToaw0sj5N5ZKAFFECPLi4gU+w2SjR6BXXA== +"@salesforce/plugin-deploy-retrieve@4.3.2": + version "4.3.2" + resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-4.3.2.tgz#944856b46c722d1e13e14de1c4bc9e0d6cd0715b" + integrity sha512-02hnpkB898XK952de6KwqYGxxx9uLLNm2OeR+sS0ilL5Q5cCvCQphvwlkQDyn8Af0j+Kpb74yJhQK3oJQ5qaKA== dependencies: "@inquirer/prompts" "^7.8.3" "@oclif/core" "^5.1.7" "@oclif/multi-stage-output" "^1.0.6" "@salesforce/apex-node" "^9.0.7" "@salesforce/core" "^9.4.1" - "@salesforce/kit" "^4.0.1" - "@salesforce/plugin-info" "^4.0.10" + "@salesforce/kit" "^4.0.8" + "@salesforce/plugin-info" "^4.0.22" "@salesforce/sf-plugins-core" "^13.0.7" - "@salesforce/source-deploy-retrieve" "^13.8.3" + "@salesforce/source-deploy-retrieve" "^13.11.0" "@salesforce/source-tracking" "^8.1.8" "@salesforce/ts-types" "^3.2.0" ansis "^3.17.0" terminal-link "^3.0.0" -"@salesforce/plugin-info@4.0.22", "@salesforce/plugin-info@^4.0.10", "@salesforce/plugin-info@^4.0.13": +"@salesforce/plugin-info@4.0.22": version "4.0.22" resolved "https://registry.yarnpkg.com/@salesforce/plugin-info/-/plugin-info-4.0.22.tgz#75fe57159eeba5d12c245d9bffbbb22cb1836b43" integrity sha512-UNcBIxeq2jxGdeWaw88TYBT1R6BszvsrqTiDDRPa6wvEdogccTap0bSg1yLpeo8wxb/G+8N1suy02bhLag228A== @@ -2244,6 +2244,25 @@ semver "^7.8.1" which "^4" +"@salesforce/plugin-info@^4.0.10", "@salesforce/plugin-info@^4.0.13", "@salesforce/plugin-info@^4.0.22": + version "4.0.24" + resolved "https://registry.yarnpkg.com/@salesforce/plugin-info/-/plugin-info-4.0.24.tgz#b93a1b747e84b64cd06c90afeafc7406fdbaffab" + integrity sha512-4KOuScB5B4tJkNP1h50UOtE8FXnTSoc5u1hH6kPA6/u8/Aqs2lXrvHzIsftz/OdLUHFNJcBa8Ztuid6+s6FRdg== + dependencies: + "@inquirer/prompts" "^7.10.1" + "@jsforce/jsforce-node" "^3.10.25" + "@oclif/core" "^5.1.8" + "@salesforce/core" "^9.1.11" + "@salesforce/kit" "^4.0.8" + "@salesforce/sf-plugins-core" "^13.0.4" + got "^13.0.0" + marked "^4.3.0" + marked-terminal "^4.2.0" + open "^10.2.0" + proxy-agent "^6.5.0" + semver "^7.8.1" + which "^4" + "@salesforce/plugin-limits@4.0.6": version "4.0.6" resolved "https://registry.yarnpkg.com/@salesforce/plugin-limits/-/plugin-limits-4.0.6.tgz#8102a15e539ad5f2cb085166a333714bb14b7083" @@ -2449,10 +2468,10 @@ cli-progress "^3.12.0" terminal-link "^3.0.0" -"@salesforce/source-deploy-retrieve@^13.0.0", "@salesforce/source-deploy-retrieve@^13.1.1", "@salesforce/source-deploy-retrieve@^13.3.1", "@salesforce/source-deploy-retrieve@^13.7.0", "@salesforce/source-deploy-retrieve@^13.8.3": - version "13.8.3" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-13.8.3.tgz#01c3bd123ec57a5758191cf63e8e85698a38e1f3" - integrity sha512-KBjE+zapmCCBEU8BiVG//WwYsbkkq03A/jCTjuMFH+brob8RkDz6a94Nymhtje7uTMmzxlhZRdx+/2i76+DKYQ== +"@salesforce/source-deploy-retrieve@^13.0.0", "@salesforce/source-deploy-retrieve@^13.1.1", "@salesforce/source-deploy-retrieve@^13.11.0", "@salesforce/source-deploy-retrieve@^13.3.1", "@salesforce/source-deploy-retrieve@^13.7.0", "@salesforce/source-deploy-retrieve@^13.8.3": + version "13.11.0" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-13.11.0.tgz#56c85d2d38b8ead8116ffb209e7e17ca5a919070" + integrity sha512-3b66tBuAE5qq0tG5X/8JH+OPjTcqNxyLDUOltVqSM68/6lYBMlnZCxFWR1E8FfGekGNCRbr6JXeTPzFgwnbKQw== dependencies: "@salesforce/core" "^9.4.1" "@salesforce/kit" "^4.0.0" From 3949f0c940a88a1254b553dcd9a467f5c897757a Mon Sep 17 00:00:00 2001 From: Willie Ruemmele Date: Tue, 3 Nov 2026 14:30:37 -0700 Subject: [PATCH 2/2] fix: bundle dependencies so npm installs the tested tree @W-24750342@ (#3013) * fix: bundle dependencies so npm installs the tested tree @W-24750342@ npm 12 no longer reads or writes npm-shrinkwrap.json, so npm installs of the CLI float every transitive dependency and ignore our yarn resolutions. Bundle every dependency instead: the published tarball contains the exact node_modules tree that was tested in nightly/rc. Changes: - add explicit bundleDependencies (all dependencies; not `true`, which breaks yarn v1 consumers) - remove prepublishOnly npm shrinkwrap - add a unit test that keeps bundleDependencies in sync with dependencies * chore: manual changes * chore: restore ansis/inquierer * test: verify bundleDependencies covers our plugins and libraries @W-24750342@ - fix @inquirer/select typo in bundleDependencies - check every @salesforce/@oclif dependency is bundled and every bundled name is a dependency --- package.json | 37 ++++++++++++++++++++++++++++++++++++- test/package.test.ts | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 test/package.test.ts diff --git a/package.json b/package.json index 731706cb..4eae166f 100644 --- a/package.json +++ b/package.json @@ -178,6 +178,42 @@ "@salesforce/sf-plugins-core": "13.0.8", "ansis": "^3.12.0" }, + "bundleDependencies": [ + "@inquirer/select", + "ansis", + "@oclif/core", + "@oclif/plugin-autocomplete", + "@oclif/plugin-commands", + "@oclif/plugin-help", + "@oclif/plugin-not-found", + "@oclif/plugin-plugins", + "@oclif/plugin-search", + "@oclif/plugin-update", + "@oclif/plugin-version", + "@oclif/plugin-warn-if-update-available", + "@oclif/plugin-which", + "@salesforce/core", + "@salesforce/kit", + "@salesforce/plugin-agent", + "@salesforce/plugin-apex", + "@salesforce/plugin-api", + "@salesforce/plugin-auth", + "@salesforce/plugin-data", + "@salesforce/plugin-deploy-retrieve", + "@salesforce/plugin-info", + "@salesforce/plugin-limits", + "@salesforce/plugin-marketplace", + "@salesforce/plugin-org", + "@salesforce/plugin-packaging", + "@salesforce/plugin-schema", + "@salesforce/plugin-settings", + "@salesforce/plugin-sobject", + "@salesforce/plugin-telemetry", + "@salesforce/plugin-templates", + "@salesforce/plugin-trust", + "@salesforce/plugin-user", + "@salesforce/sf-plugins-core" + ], "pinnedDependencies": [ "@oclif/core", "@oclif/plugin-autocomplete", @@ -240,7 +276,6 @@ "preinstall": "node ./scripts/preinstall.js", "prepack": "sf-prepack", "prepare": "sf-install && yarn compile && yarn lint", - "prepublishOnly": "npm shrinkwrap", "pretarball": "sf-release cli:tarballs:prepare --types", "promote": "oclif promote", "promote-dist-tags": "./scripts/promote-dist-tags", diff --git a/test/package.test.ts b/test/package.test.ts new file mode 100644 index 00000000..f05cbe02 --- /dev/null +++ b/test/package.test.ts @@ -0,0 +1,42 @@ +/* + * Copyright 2026, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { readFileSync } from 'node:fs'; +import { expect } from 'chai'; + +type PackageJson = { + dependencies: Record; + bundleDependencies?: string[]; +}; + +const pjson = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')) as PackageJson; +const dependencies = Object.keys(pjson.dependencies); +const bundled = new Set(pjson.bundleDependencies ?? []); + +// the published tarball must contain the dependency tree that was tested in nightly/rc, so our plugins and libraries +// are bundled. An explicit list is used because yarn v1 fails to install packages that depend on a package with +// `bundleDependencies: true`. +describe('package.json bundleDependencies', () => { + it('bundles every @salesforce and @oclif dependency', () => { + const unbundled = dependencies.filter((dep) => /^@(salesforce|oclif)\//.test(dep) && !bundled.has(dep)); + expect(unbundled, 'add these to bundleDependencies').to.deep.equal([]); + }); + + it('only bundles dependencies', () => { + const notDependencies = [...bundled].filter((dep) => !dependencies.includes(dep)); + expect(notDependencies, 'remove these from bundleDependencies').to.deep.equal([]); + }); +});