Skip to content

Commit 1a1a48c

Browse files
authored
Merge pull request #731 from forcedotcom/sm/shorter-term-query-cache
fix: reused instances don't keep cache
2 parents eb48258 + 64f69cb commit 1a1a48c

File tree

3 files changed

+20
-43
lines changed

3 files changed

+20
-43
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
"node": ">=18.0.0"
5050
},
5151
"dependencies": {
52-
"@oclif/core": "^4.2.0",
52+
"@oclif/core": "^4.2.3",
5353
"@salesforce/core": "^8.8.0",
5454
"@salesforce/kit": "^3.2.3",
55-
"@salesforce/source-deploy-retrieve": "^12.11.2",
55+
"@salesforce/source-deploy-retrieve": "^12.12.3",
5656
"@salesforce/ts-types": "^2.0.12",
5757
"fast-xml-parser": "^4.5.1",
5858
"graceful-fs": "^4.2.11",

src/shared/remote/remoteSourceTrackingService.ts

+2
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ export class RemoteSourceTrackingService {
117117
service = await new RemoteSourceTrackingService(options).init();
118118
this.instanceMap.set(orgId, service);
119119
}
120+
// even if there was already an instance around, its queries might no longer be accurate (ex: missing new changes but queryFrom would return stale results)
121+
service.queryCache.clear();
120122
return service;
121123
}
122124

yarn.lock

+16-41
Original file line numberDiff line numberDiff line change
@@ -625,13 +625,13 @@
625625
"@nodelib/fs.scandir" "2.1.5"
626626
fastq "^1.6.0"
627627

628-
"@oclif/core@^4.2.0":
629-
version "4.2.0"
630-
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-4.2.0.tgz#ab78b247dfd66322d9c9376ebaf3764e3c82fefe"
631-
integrity sha512-ETM2N/GL7W37Kv1Afv1j1Gh77CynS2ubEPP+p+MnjUXEjghNe7+bKAWhPkHnBuFAVFAqdv0qMpUAjxKLbsmbJw==
628+
"@oclif/core@^4.2.3":
629+
version "4.2.3"
630+
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-4.2.3.tgz#b81399b7cf4758b5fe59777e060fb84c7c7e6153"
631+
integrity sha512-JVEONwSZAfTNZCS81ah2u42Ya1mSeutCtHpoqMq/U+vP9Ka3Ni15/AqtcVtpH1afdUUn5RgtJYj+zlsrvMwksA==
632632
dependencies:
633633
ansi-escapes "^4.3.2"
634-
ansis "^3.3.2"
634+
ansis "^3.8.1"
635635
clean-stack "^3.0.1"
636636
cli-spinners "^2.9.2"
637637
debug "^4.4.0"
@@ -748,10 +748,10 @@
748748
resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.9.0.tgz#ba477a112653a20b4edcf989c61c57bdff9aa3ca"
749749
integrity sha512-LiN37zG5ODT6z70sL1fxF7BQwtCX9JOWofSU8iliSNIM+WDEeinnoFtVqPInRSNt8I0RiJxIKCrqstsmQRBNvA==
750750

751-
"@salesforce/source-deploy-retrieve@^12.11.2":
752-
version "12.11.2"
753-
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.11.2.tgz#8e789d88ce92ae024ea9cb57da88345b2d06b564"
754-
integrity sha512-bfx0FnAJ9hfMB2ex9Jv1kfaKYuCe7Xe921ctVEOzIgwM9bisKYfL1NUKCiGwWYgS+dePcwmDcpJFJMr0CUu0ZA==
751+
"@salesforce/source-deploy-retrieve@^12.12.3":
752+
version "12.12.3"
753+
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.12.3.tgz#b03df07a60c55004c3b4c7ce8df3ecfd20b7742a"
754+
integrity sha512-kQ78RekRvTLh5yp8eB67szRoQr64R/0PETgszxf65RRPzLTmBGs0JpkZBMx0GN95Mb6BWvOEjTYLgyezVPUXsw==
755755
dependencies:
756756
"@salesforce/core" "^8.8.0"
757757
"@salesforce/kit" "^3.2.2"
@@ -1255,10 +1255,10 @@ ansi-styles@^6.1.0:
12551255
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
12561256
integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
12571257

1258-
ansis@^3.3.2:
1259-
version "3.3.2"
1260-
resolved "https://registry.yarnpkg.com/ansis/-/ansis-3.3.2.tgz#15adc36fea112da95c74d309706e593618accac3"
1261-
integrity sha512-cFthbBlt+Oi0i9Pv/j6YdVWJh54CtjGACaMPCIrEV4Ha7HWsIjXDwseYV79TIL0B4+KfSwD5S70PeQDkPUd1rA==
1258+
ansis@^3.8.1:
1259+
version "3.9.0"
1260+
resolved "https://registry.yarnpkg.com/ansis/-/ansis-3.9.0.tgz#d195c93c31a333916142ff8f0be4d7e3872f262e"
1261+
integrity sha512-PcDrVe15ldexeZMsVLBAzBwF2KhZgaU0R+CHxH+x5kqn/pO+UWVBZJ+NEXMPpEOLUFeNsnNdoWYc2gwO+MVkDg==
12621262

12631263
anymatch@~3.1.2:
12641264
version "3.1.3"
@@ -5328,16 +5328,7 @@ srcset@^5.0.0:
53285328
resolved "https://registry.yarnpkg.com/srcset/-/srcset-5.0.0.tgz#9df6c3961b5b44a02532ce6ae4544832609e2e3f"
53295329
integrity sha512-SqEZaAEhe0A6ETEa9O1IhSPC7MdvehZtCnTR0AftXk3QhY2UNgb+NApFOUPZILXk/YTDfFxMTNJOBpzrJsEdIA==
53305330

5331-
"string-width-cjs@npm:string-width@^4.2.0":
5332-
version "4.2.3"
5333-
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
5334-
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
5335-
dependencies:
5336-
emoji-regex "^8.0.0"
5337-
is-fullwidth-code-point "^3.0.0"
5338-
strip-ansi "^6.0.1"
5339-
5340-
string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
5331+
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
53415332
version "4.2.3"
53425333
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
53435334
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -5396,14 +5387,7 @@ string_decoder@~1.1.1:
53965387
dependencies:
53975388
safe-buffer "~5.1.0"
53985389

5399-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
5400-
version "6.0.1"
5401-
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
5402-
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
5403-
dependencies:
5404-
ansi-regex "^5.0.1"
5405-
5406-
strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
5390+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
54075391
version "6.0.1"
54085392
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
54095393
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -5919,7 +5903,7 @@ workerpool@^6.5.1:
59195903
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544"
59205904
integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==
59215905

5922-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
5906+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
59235907
version "7.0.0"
59245908
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
59255909
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -5937,15 +5921,6 @@ wrap-ansi@^6.2.0:
59375921
string-width "^4.1.0"
59385922
strip-ansi "^6.0.0"
59395923

5940-
wrap-ansi@^7.0.0:
5941-
version "7.0.0"
5942-
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
5943-
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
5944-
dependencies:
5945-
ansi-styles "^4.0.0"
5946-
string-width "^4.1.0"
5947-
strip-ansi "^6.0.0"
5948-
59495924
wrap-ansi@^8.1.0:
59505925
version "8.1.0"
59515926
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)