Skip to content

Commit 2b0e97e

Browse files
feat: reread remote like you can local W-20175985 (#825)
* feat: reread remote like you can local * chore: casing Co-authored-by: Cristian Dominguez <6853656+cristiand391@users.noreply.github.com> * chore: bump deps for xnuts --------- Co-authored-by: Cristian Dominguez <6853656+cristiand391@users.noreply.github.com>
1 parent 6368f0e commit 2b0e97e

4 files changed

Lines changed: 55 additions & 9 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
"node": ">=18.0.0"
5151
},
5252
"dependencies": {
53-
"@salesforce/core": "^8.23.4",
53+
"@salesforce/core": "^8.23.5",
5454
"@salesforce/kit": "^3.2.4",
55-
"@salesforce/source-deploy-retrieve": "^12.29.1",
55+
"@salesforce/source-deploy-retrieve": "^12.30.0",
5656
"@salesforce/ts-types": "^2.0.12",
5757
"fast-xml-parser": "^4.5.3",
5858
"graceful-fs": "^4.2.11",

src/shared/remote/remoteSourceTrackingService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,13 @@ export class RemoteSourceTrackingService {
241241
// to sync the retrieved SourceMembers; meaning it will update the lastRetrievedFromServer
242242
// field to the SourceMember's RevisionCounter, and update the serverMaxRevisionCounter
243243
// to the highest RevisionCounter.
244-
public async retrieveUpdates(): Promise<RemoteChangeElement[]> {
244+
public async retrieveUpdates(cache = true): Promise<RemoteChangeElement[]> {
245245
// Always track new SourceMember data, or update tracking when we sync.
246246
const queriedSourceMembers = await querySourceMembersFrom({
247247
fromRevision: this.serverMaxRevisionCounter,
248248
logger: this.logger,
249249
userQueryCache: this.userQueryCache,
250-
queryCache: this.queryCache,
250+
queryCache: cache ? this.queryCache : undefined,
251251
conn: this.org.getConnection(),
252252
});
253253
await this.trackSourceMembers(queriedSourceMembers);

src/sourceTracking.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,11 @@ export class SourceTracking extends AsyncCreatable {
510510
await this.remoteSourceTrackingService.syncSpecifiedElements(this.registry, fileResponses);
511511
}
512512

513+
public async reReadRemoteTracking(): Promise<void> {
514+
await this.ensureRemoteTracking(false);
515+
await this.remoteSourceTrackingService.retrieveUpdates(false);
516+
}
517+
513518
public async reReadLocalTrackingCache(): Promise<void> {
514519
await this.ensureLocalTracking();
515520
await this.localRepo.getStatus(true);
@@ -552,7 +557,7 @@ export class SourceTracking extends AsyncCreatable {
552557
projectPath: this.projectPath,
553558
});
554559
if (initializeWithQuery) {
555-
await this.remoteSourceTrackingService.retrieveUpdates();
560+
await this.remoteSourceTrackingService.retrieveUpdates(false);
556561
}
557562
}
558563

yarn.lock

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,22 @@
570570
"@jridgewell/resolve-uri" "^3.1.0"
571571
"@jridgewell/sourcemap-codec" "^1.4.14"
572572

573+
"@jsforce/jsforce-node@^3.10.10":
574+
version "3.10.10"
575+
resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.10.10.tgz#2d7bb77d1d739712733a30de7e9c941d2127bc4a"
576+
integrity sha512-/zUOX9kapwk8lyjmTYgXlBF+GbqcEpb0zrkDfX9i94xu5cvzERZxRHqSSaS/IImoDmvoSbatFSVfB7Y4lmANOw==
577+
dependencies:
578+
"@sindresorhus/is" "^4"
579+
base64url "^3.0.1"
580+
csv-parse "^5.5.2"
581+
csv-stringify "^6.6.0"
582+
faye "^1.4.0"
583+
form-data "^4.0.4"
584+
https-proxy-agent "^5.0.0"
585+
multistream "^3.1.0"
586+
node-fetch "^2.6.1"
587+
xml2js "^0.6.2"
588+
573589
"@jsforce/jsforce-node@^3.10.8":
574590
version "3.10.8"
575591
resolved "https://registry.npmjs.org/@jsforce/jsforce-node/-/jsforce-node-3.10.8.tgz"
@@ -726,6 +742,31 @@
726742
semver "^7.7.3"
727743
ts-retry-promise "^0.8.1"
728744

745+
"@salesforce/core@^8.23.5":
746+
version "8.23.5"
747+
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.23.5.tgz#fc4a18a814ff3c6c0c3a138a0369441595ef74a2"
748+
integrity sha512-EOA4JzvYk5KZ7YJ6mnBrHCrR0e1x7ellb6e8s4/+kIGGYU8mMnD0PYIUnc2jjYKXujY1hPgdQh39NLBQiQmt8g==
749+
dependencies:
750+
"@jsforce/jsforce-node" "^3.10.10"
751+
"@salesforce/kit" "^3.2.4"
752+
"@salesforce/schemas" "^1.10.3"
753+
"@salesforce/ts-types" "^2.0.12"
754+
ajv "^8.17.1"
755+
change-case "^4.1.2"
756+
fast-levenshtein "^3.0.0"
757+
faye "^1.4.1"
758+
form-data "^4.0.4"
759+
js2xmlparser "^4.0.1"
760+
jsonwebtoken "9.0.2"
761+
jszip "3.10.1"
762+
memfs "^4.30.1"
763+
pino "^9.7.0"
764+
pino-abstract-transport "^1.2.0"
765+
pino-pretty "^11.3.0"
766+
proper-lockfile "^4.1.2"
767+
semver "^7.7.3"
768+
ts-retry-promise "^0.8.1"
769+
729770
"@salesforce/dev-config@^4.3.1":
730771
version "4.3.1"
731772
resolved "https://registry.npmjs.org/@salesforce/dev-config/-/dev-config-4.3.1.tgz"
@@ -780,10 +821,10 @@
780821
resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.10.3.tgz#52c867fdd60679cf216110aa49542b7ad391f5d1"
781822
integrity sha512-FKfvtrYTcvTXE9advzS25/DEY9yJhEyLvStm++eQFtnAaX1pe4G3oGHgiQ0q55BM5+0AlCh0+0CVtQv1t4oJRA==
782823

783-
"@salesforce/source-deploy-retrieve@^12.29.1":
784-
version "12.29.1"
785-
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.29.1.tgz#8c195d145952b7fe247a7031affae8ebb7833772"
786-
integrity sha512-5Olq7Wj86+F009i6o+0Dv5bK6f0nn4lj4ohuuNhgllnlQzr50PLXfNZWPbdsBsSn9nFc5F3d45G7x23LE3qETw==
824+
"@salesforce/source-deploy-retrieve@^12.30.0":
825+
version "12.30.0"
826+
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.30.0.tgz#cae4e00b5f9f301f28d9224997f63bfa5a7ede1b"
827+
integrity sha512-elfNE4NRw2JNRsYoS/e9Gi2KdaFg7c2JVdRY6ZT20vpxV3z81SvvbYhauiKOYkVvsP3Y+FBEzWiG6AwdF0fSWA==
787828
dependencies:
788829
"@salesforce/core" "^8.23.4"
789830
"@salesforce/kit" "^3.2.4"

0 commit comments

Comments
 (0)