chore: fix bug

Author: WillieRuemmele

CHANGELOG.md

@@ -1,3 +1,21 @@
+## [3.22.22](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.22.21...3.22.22) (2025-06-07)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/plugin-info from 3.4.63 to 3.4.65 ([941ee6f](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/941ee6f500649fd463f409c93ab1cbefffcc2947))
+
+## [3.22.21](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.22.20...3.22.21) (2025-06-07)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/source-tracking from 7.3.25 to 7.4.0 ([20e60bf](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/20e60bf2ae71a141397c6d6be0517328dd1cef7a))
+
+## [3.22.20](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.22.19...3.22.20) (2025-06-07)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/apex-node from 8.1.29 to 8.1.30 ([4abdbd0](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/4abdbd0f355b36a4b4ed8181d9dd9c3bf8c7606e))
+
 ## [3.22.19](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.22.18...3.22.19) (2025-05-31)
 
 ### Bug Fixes

README.md

@@ -141,7 +141,7 @@ FLAG DESCRIPTIONS
     If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
-_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/convert/mdapi.ts)_
+_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/convert/mdapi.ts)_
 
 ## `sf project convert source`
 
@@ -214,7 +214,7 @@ FLAG DESCRIPTIONS
     Override the api version used for api requests made by this command
 ```
 
-_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/convert/source.ts)_
+_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/convert/source.ts)_
 
 ## `sf project convert source-behavior`
 
@@ -273,7 +273,7 @@ EXAMPLES
     $ sf project convert source-behavior --behavior decomposePermissionSetBeta --dry-run --preserve-temp-dir
 ```
 
-_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/convert/source-behavior.ts)_
+_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/convert/source-behavior.ts)_
 
 ## `sf project delete source`
 
@@ -413,7 +413,7 @@ FLAG DESCRIPTIONS
     - Separate the test names with spaces: --tests Test1 Test2 "Test With Space"
 ```
 
-_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/delete/source.ts)_
+_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/delete/source.ts)_
 
 ## `sf project delete tracking`
 
@@ -450,7 +450,7 @@ EXAMPLES
     $ sf project delete tracking --target-org my-scratch
 ```
 
-_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/delete/tracking.ts)_
+_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/delete/tracking.ts)_
 
 ## `sf project deploy cancel`
 
@@ -522,7 +522,7 @@ FLAG DESCRIPTIONS
     project deploy report".
 ```
 
-_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/deploy/cancel.ts)_
+_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/deploy/cancel.ts)_
 
 ## `sf project deploy preview`
 
@@ -605,7 +605,7 @@ FLAG DESCRIPTIONS
     All child components are included. If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
-_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/deploy/preview.ts)_
+_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/deploy/preview.ts)_
 
 ## `sf project deploy quick`
 
@@ -689,7 +689,7 @@ FLAG DESCRIPTIONS
     deploy report".
 ```
 
-_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/deploy/quick.ts)_
+_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/deploy/quick.ts)_
 
 ## `sf project deploy report`
 
@@ -781,7 +781,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/deploy/report.ts)_
+_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/deploy/report.ts)_
 
 ## `sf project deploy resume`
 
@@ -866,7 +866,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/deploy/resume.ts)_
+_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/deploy/resume.ts)_
 
 ## `sf project deploy start`
 
@@ -1102,7 +1102,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/deploy/start.ts)_
+_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/deploy/start.ts)_
 
 ## `sf project deploy validate`
 
@@ -1275,7 +1275,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/deploy/validate.ts)_
+_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/deploy/validate.ts)_
 
 ## `sf project generate manifest`
 
@@ -1371,7 +1371,7 @@ EXAMPLES
     $ sf project generate manifest --from-org [email protected] --excluded-metadata StandardValueSet
 ```
 
-_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/generate/manifest.ts)_
+_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/generate/manifest.ts)_
 
 ## `sf project list ignored`
 
@@ -1413,7 +1413,7 @@ EXAMPLES
     $ sf project list ignored --source-dir package.xml
 ```
 
-_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/list/ignored.ts)_
+_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/list/ignored.ts)_
 
 ## `sf project reset tracking`
 
@@ -1462,7 +1462,7 @@ EXAMPLES
     $ sf project reset tracking --revision 30
 ```
 
-_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/reset/tracking.ts)_
+_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/reset/tracking.ts)_
 
 ## `sf project retrieve preview`
 
@@ -1516,7 +1516,7 @@ FLAG DESCRIPTIONS
     production orgs.
 ```
 
-_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/retrieve/preview.ts)_
+_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/retrieve/preview.ts)_
 
 ## `sf project retrieve start`
 
@@ -1689,6 +1689,6 @@ FLAG DESCRIPTIONS
     If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
-_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.19/src/commands/project/retrieve/start.ts)_
+_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.22/src/commands/project/retrieve/start.ts)_
 
 <!-- commandsstop -->

package.json

@@ -1,20 +1,20 @@
 {
   "name": "@salesforce/plugin-deploy-retrieve",
   "description": "deploy and retrieve commands for sf",
-  "version": "3.22.19",
+  "version": "3.22.22",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@inquirer/prompts": "^7.5.3",
     "@oclif/core": "^4.3.0",
     "@oclif/multi-stage-output": "^0.8.13",
-    "@salesforce/apex-node": "^8.1.29",
+    "@salesforce/apex-node": "^8.1.30",
     "@salesforce/core": "^8.11.1",
     "@salesforce/kit": "^3.2.3",
-    "@salesforce/plugin-info": "^3.4.63",
+    "@salesforce/plugin-info": "^3.4.65",
     "@salesforce/sf-plugins-core": "^12.2.2",
     "@salesforce/source-deploy-retrieve": "^12.19.7",
-    "@salesforce/source-tracking": "^7.3.25",
+    "@salesforce/source-tracking": "^7.4.0",
     "@salesforce/ts-types": "^2.0.12",
     "ansis": "^3.17.0",
     "terminal-link": "^3.0.0"
@@ -29,7 +29,7 @@
     "@salesforce/ts-sinon": "^1.4.30",
     "cross-env": "^7.0.3",
     "eslint-plugin-sf-plugin": "^1.20.24",
-    "oclif": "^4.17.46",
+    "oclif": "^4.18.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"
   },

src/utils/deploy.ts

@@ -141,16 +141,20 @@ export async function executeDeploy(
       await deploy.start();
     }
   } else {
-    // instantiate source tracking
-    // stl will decide, based on the org's properties, what needs to be done
-    const stl = await SourceTracking.create({
-      org,
-      // mdapi format deploys don't require a project, but at this point we need one
-      project: project ?? (await SfProject.resolve()),
-      subscribeSDREvents: true,
-      ignoreConflicts: opts['ignore-conflicts'],
-    });
-    registry = stl.registry;
+    let stl: SourceTracking | undefined;
+    if (!opts['source-dir'] && !opts.manifest && !opts.metadata && !opts['dry-run']) {
+      // instantiate source tracking
+      // stl will decide, based on the org's properties, what needs to be done
+      stl = await SourceTracking.create({
+        org,
+        // mdapi format deploys don't require a project, but at this point we need one
+        project: project ?? (await SfProject.resolve()),
+        subscribeSDREvents: true,
+        ignoreConflicts: opts['ignore-conflicts'],
+      });
+      registry = stl.registry;
+    }
+
     componentSet = await buildComponentSet(opts, stl);
     if (componentSet.size === 0) {
       if (opts['source-dir'] ?? opts.manifest ?? opts.metadata ?? throwOnEmpty) {

test/commands/deploy/metadata.nut.ts

@@ -7,6 +7,9 @@
 
 import { fileURLToPath } from 'node:url';
 import { SourceTestkit } from '@salesforce/source-testkit';
+import { execCmd } from '@salesforce/cli-plugins-testkit';
+import { expect } from 'chai';
+import { type DeployResultJson } from '../../../src/utils/types.js';
 
 describe('deploy metadata NUTs', () => {
   let testkit: SourceTestkit;
@@ -27,6 +30,12 @@ describe('deploy metadata NUTs', () => {
       await testkit.deploy({ args: '--source-dir force-app' });
       await testkit.expect.filesToBeDeployed(['force-app/**/*'], ['force-app/test/**/*']);
     });
+
+    it('--source-dir --dry-run should NOT affect source-tracking', async () => {
+      execCmd('project:deploy:start --dry-run --source-dir force-app', { ensureExitCode: 0 });
+      const actual = execCmd<DeployResultJson>('project:deploy:start --json', { ensureExitCode: 0 }).jsonOutput; // should deploy everything since previous attempt was --dry-run
+      expect(actual?.result?.numberComponentsDeployed).to.be.greaterThan(1);
+    });
   });
 
   describe('--metadata flag', () => {

yarn.lock

@@ -1422,7 +1422,7 @@
   resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
-"@salesforce/apex-node@^8.1.29":
+"@salesforce/apex-node@^8.1.30":
   version "8.1.30"
   resolved "https://registry.yarnpkg.com/@salesforce/apex-node/-/apex-node-8.1.30.tgz#6a746561394f39f8e2b4935e2449f0ea1d08bf5c"
   integrity sha512-9djBW0ZvLWHLAfFjc8zagdCXkjFesTcgDTPsvQQfZX8TJYsq/WjgeoIooC8QxRLlxH1neUK7pgNAbKKrP7t5XQ==
@@ -1453,7 +1453,7 @@
     strip-ansi "6.0.1"
     ts-retry-promise "^0.8.1"
 
-"@salesforce/core@^8.10.0", "@salesforce/core@^8.11.0", "@salesforce/core@^8.11.1", "@salesforce/core@^8.11.2", "@salesforce/core@^8.11.4", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0", "@salesforce/core@^8.9.1":
+"@salesforce/core@^8.10.0", "@salesforce/core@^8.11.0", "@salesforce/core@^8.11.1", "@salesforce/core@^8.11.2", "@salesforce/core@^8.11.4", "@salesforce/core@^8.12.0", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0":
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.12.0.tgz#a458cc3e39f4e7df57d94f0deaaa0fd0660b18c9"
   integrity sha512-LJIjoQ3UQJ1r/xxdQcaG5bU8MfxeO/LJhrfK/7LZeHVtp1iOIgedbwPuVNzTzYciDWh8elborarrPM4uWjtu5g==
@@ -1535,7 +1535,7 @@
     debug "^4.4.1"
     handlebars "^4.7.8"
 
-"@salesforce/plugin-info@^3.4.63":
+"@salesforce/plugin-info@^3.4.65":
   version "3.4.65"
   resolved "https://registry.yarnpkg.com/@salesforce/plugin-info/-/plugin-info-3.4.65.tgz#b2f21f16a40d1ebee874a32685b9ea3b51e8d2a1"
   integrity sha512-77SzHkJrQh8IXpcJ97th6yXsAgeXPJbGJtjbHgKmf5zZKqOCuWNtMnIi2plgmoh+S9m+zS4nqlJ81o5VBu8ACg==
@@ -1597,10 +1597,10 @@
     cli-progress "^3.12.0"
     terminal-link "^3.0.0"
 
-"@salesforce/source-deploy-retrieve@^12.19.6", "@salesforce/source-deploy-retrieve@^12.19.7":
-  version "12.19.8"
-  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.19.8.tgz#68432867e35beb97a1572713ecbdd5e4a93bd4ce"
-  integrity sha512-CcjBReC3riYFYWXUaUn0Y0iis8PwEDl1dJclBv7kpTzMmxh7AP4PL0PFpL2lfD9ASdV21KhCriQo0/xO1ZhznA==
+"@salesforce/source-deploy-retrieve@^12.19.7", "@salesforce/source-deploy-retrieve@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.19.9.tgz#4754aaf466ce34cb02546ec6eab9541c1dab86f9"
+  integrity sha512-LDM/vqedj6T/Ybs2dKShqdTUizp2psKboBo03Ak9ha006gA+5/yde7nq5zY9hRdn/aw4hs74+X0TCRcxMh4dOw==
   dependencies:
     "@salesforce/core" "^8.11.4"
     "@salesforce/kit" "^3.2.3"
@@ -1634,15 +1634,15 @@
     shelljs "^0.10.0"
     sinon "^10.0.0"
 
-"@salesforce/source-tracking@^7.3.25":
-  version "7.3.25"
-  resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.3.25.tgz#057b70c240b450e9319dc6cd2e732d5f0aae959e"
-  integrity sha512-vph1inQMkwFhAqxquHy/Woq0uQqFiFyVm59DmXJLZQxj25fxqFhQsbY22jCSidEug8ctj4IyaCJB1Ot/eShozw==
+"@salesforce/source-tracking@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.4.0.tgz#4f4ea0769acd0fed921f25af851d668e6678da5e"
+  integrity sha512-anyWxkic7lIpyLq606kfjyF0CaryBJaLCQZ/YSufWEvQEJ5/DhNQotHP4+VAUxuLFCpLsK7sR0xKwwpzUAC40A==
   dependencies:
     "@oclif/core" "^4.2.10"
-    "@salesforce/core" "^8.9.1"
+    "@salesforce/core" "^8.12.0"
     "@salesforce/kit" "^3.2.3"
-    "@salesforce/source-deploy-retrieve" "^12.19.6"
+    "@salesforce/source-deploy-retrieve" "^12.19.9"
     "@salesforce/ts-types" "^2.0.12"
     fast-xml-parser "^4.5.3"
     graceful-fs "^4.2.11"
@@ -6766,7 +6766,7 @@ object.values@^1.2.0:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-oclif@^4.17.46:
+oclif@^4.18.0:
   version "4.18.0"
   resolved "https://registry.yarnpkg.com/oclif/-/oclif-4.18.0.tgz#4216a87ae947ae233a92f94448e970fce621b11a"
   integrity sha512-w5b35fT1tIZhJUv+GZLdEo4ZwF/wDeuNVL1cbOcgrQebcg0RMJE0ykFymVlfIPtOZqJzwfO6xeNEwqMy5fVtOw==