From 03dee858c3db4875181f78a17dbd0a37c733d4e3 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Wed, 18 Oct 2023 08:50:07 -0500 Subject: [PATCH 1/5] fix: undefined handling in remote tracking --- src/shared/remoteSourceTrackingService.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/remoteSourceTrackingService.ts b/src/shared/remoteSourceTrackingService.ts index 4f7fa540..889159a6 100644 --- a/src/shared/remoteSourceTrackingService.ts +++ b/src/shared/remoteSourceTrackingService.ts @@ -154,7 +154,7 @@ export class RemoteSourceTrackingService extends ConfigFile { - const rev = fromRevision != null ? fromRevision : this.getServerMaxRevision(); + const rev = fromRevision ?? this.getServerMaxRevision(); if (useCache) { // Check cache first and return if found. From f74edc7d25cd6f1df06a08c998bba255f302e7a3 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Wed, 18 Oct 2023 08:51:20 -0500 Subject: [PATCH 2/5] style: remove unnecessary default --- src/shared/remoteSourceTrackingService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/remoteSourceTrackingService.ts b/src/shared/remoteSourceTrackingService.ts index 889159a6..26d31b54 100644 --- a/src/shared/remoteSourceTrackingService.ts +++ b/src/shared/remoteSourceTrackingService.ts @@ -513,7 +513,7 @@ export class RemoteSourceTrackingService extends ConfigFile 0) { this.logger.debug(`Overriding SourceMember polling timeout to ${overriddenTimeout}`); return Duration.seconds(overriddenTimeout); From fe9bbc4ff4bf11466b7e1b09cc3edb168e34fcff Mon Sep 17 00:00:00 2001 From: mshanemc Date: Wed, 18 Oct 2023 08:57:04 -0500 Subject: [PATCH 3/5] chore: bump sdr --- package.json | 6 +++--- yarn.lock | 32 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 333718cf..10043a77 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,8 @@ "dependencies": { "@salesforce/core": "^5.3.9", "@salesforce/kit": "^3.0.13", - "@salesforce/source-deploy-retrieve": "^9.7.25", - "@salesforce/ts-types": "^2.0.8", + "@salesforce/source-deploy-retrieve": "^9.7.27", + "@salesforce/ts-types": "^2.0.9", "fast-xml-parser": "^4.2.5", "graceful-fs": "^4.2.11", "isomorphic-git": "1.23.0", @@ -74,7 +74,7 @@ "eslint-plugin-header": "^3.1.1", "eslint-plugin-import": "^2.28.1", "eslint-plugin-jsdoc": "^46.5.1", - "eslint-plugin-sf-plugin": "^1.16.5", + "eslint-plugin-sf-plugin": "^1.16.11", "husky": "^7.0.4", "mocha": "^9.2.2", "nyc": "^15.1.0", diff --git a/yarn.lock b/yarn.lock index 328b1eb5..3f603614 100644 --- a/yarn.lock +++ b/yarn.lock @@ -550,7 +550,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.7.1" -"@salesforce/core@^5.2.7", "@salesforce/core@^5.3.1", "@salesforce/core@^5.3.5", "@salesforce/core@^5.3.9": +"@salesforce/core@^5.3.1", "@salesforce/core@^5.3.5", "@salesforce/core@^5.3.9": version "5.3.9" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-5.3.9.tgz#1c8f793ce1a0798c5c7767a5a370a5926d3298de" integrity sha512-/HX0PiXq3Sjc5eVJ0EaYetcDGsKU9O9Nj8jFGw5qYlITx8zogfxc0j07liH67tQXS1KbTysYoj/MQ2zbHSNkPA== @@ -618,7 +618,7 @@ typescript "^4.9.5" wireit "^0.9.5" -"@salesforce/kit@^3.0.11", "@salesforce/kit@^3.0.13": +"@salesforce/kit@^3.0.13": version "3.0.13" resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.0.13.tgz#10b47ad6e0e27c3a9f97eb6a5cdcfffa9ba1f163" integrity sha512-HLQ5L5bBi0tsMeH5ZHJAhHUpvNUNPQoNJt2O82Jf6C60GGsrlzwzQ5ONAHGNBgKSZ7HLr0UGL5xaA+hE9uOcgw== @@ -636,13 +636,13 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.0.tgz#14505ebad2fb2d4f7b14837545d662766d293561" integrity sha512-SwhDTLucj/GRbPpxlEoDZeqlX22o+G6fiebTXTu1cZKmd1oE0W2L7SlTTgJnWck8bhTeBIgQi9cpD8c2t5ISKA== -"@salesforce/source-deploy-retrieve@^9.7.25": - version "9.7.25" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.7.25.tgz#30f1eda5bf450deab57e6840b3a8a4543de08dba" - integrity sha512-X2J6hYEyMALtAkIA8pTfLUfZ7n9NdCzGitSakuD771RmOk92GRcdht143TMhvpgZ5J5rRNXsbvGRX2c+E8IANg== +"@salesforce/source-deploy-retrieve@^9.7.27": + version "9.7.27" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.7.27.tgz#1d88eb237361bab62c3a4c683be178ca3cc77e4c" + integrity sha512-ot0TpibH8OZVOJpMo10TuZ6acqpV7T04qNCpEcjrcpGVolCahMzFtpiJ4TjBxL+MPY/efuWWBj3YELjy9hgFxw== dependencies: "@salesforce/core" "^5.3.1" - "@salesforce/kit" "^3.0.11" + "@salesforce/kit" "^3.0.13" "@salesforce/ts-types" "^2.0.7" fast-levenshtein "^3.0.0" fast-xml-parser "^4.3.2" @@ -664,10 +664,10 @@ sinon "^5.1.1" tslib "^2.6.1" -"@salesforce/ts-types@^2.0.6", "@salesforce/ts-types@^2.0.7", "@salesforce/ts-types@^2.0.8": - version "2.0.8" - resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.8.tgz#e732b5a42cbec6bda79c089a0633fc643daf8bca" - integrity sha512-vuzLcxtThBhpuhmnoh8GFrVU8XjdoNyQm9gPtmcjUyUD/9nQIBTAX8oGoUvCiiq93c4LFEmSua+xm3yu0bbNfg== +"@salesforce/ts-types@^2.0.6", "@salesforce/ts-types@^2.0.7", "@salesforce/ts-types@^2.0.8", "@salesforce/ts-types@^2.0.9": + version "2.0.9" + resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.9.tgz#66bff7b41720065d6b01631b6f6a3ccca02857c5" + integrity sha512-boUD9jw5vQpTCPCCmK/NFTWjSuuW+lsaxOynkyNXLW+zxOc4GDjhtKc4j0vWZJQvolpafbyS8ZLFHZJvs12gYA== dependencies: tslib "^2.6.2" @@ -2266,12 +2266,12 @@ eslint-plugin-prefer-arrow@^1.2.1: resolved "https://registry.yarnpkg.com/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz#e7fbb3fa4cd84ff1015b9c51ad86550e55041041" integrity sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ== -eslint-plugin-sf-plugin@^1.16.5: - version "1.16.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.16.5.tgz#41a9153e270625776e2a05ef6add3f27090b091f" - integrity sha512-W3E9KtClPHTZajCInxryxWS0tnNwg1ER4/W7ZRJj6heX4XLJ9LHu8x519g576urSuQx03i9APGGOh1mFeAgfgw== +eslint-plugin-sf-plugin@^1.16.11: + version "1.16.11" + resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.16.11.tgz#cc30f8b3ac42d1ca3b33bec9b9d0d0eba1913e37" + integrity sha512-BjqiSahGVuYTVpbk4snbniIDQZeZIZzbnDpiwkfliTQKK/FOqzoDPPOEMHNGT9cVXQBC1xKkCedWYHNpTPAbaQ== dependencies: - "@salesforce/core" "^5.2.7" + "@salesforce/core" "^5.3.9" "@typescript-eslint/utils" "^5.59.11" eslint-scope@^5.1.1: From 480821ec3c03f4a7197b255b39d8b9e0ca1397b6 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Wed, 18 Oct 2023 09:05:30 -0500 Subject: [PATCH 4/5] refactor: handle null AND undefined in reset? --- src/shared/remoteSourceTrackingService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/remoteSourceTrackingService.ts b/src/shared/remoteSourceTrackingService.ts index 26d31b54..b4460893 100644 --- a/src/shared/remoteSourceTrackingService.ts +++ b/src/shared/remoteSourceTrackingService.ts @@ -247,7 +247,7 @@ export class RemoteSourceTrackingService extends ConfigFile Date: Wed, 18 Oct 2023 09:13:39 -0500 Subject: [PATCH 5/5] refactor: use wrapper methods --- src/shared/remoteSourceTrackingService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/remoteSourceTrackingService.ts b/src/shared/remoteSourceTrackingService.ts index b4460893..b8d3ef82 100644 --- a/src/shared/remoteSourceTrackingService.ts +++ b/src/shared/remoteSourceTrackingService.ts @@ -153,7 +153,7 @@ export class RemoteSourceTrackingService extends ConfigFile