diff --git a/.vscode/settings.json b/.vscode/settings.json index 809b18be..baf9d1ba 100755 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,5 +13,6 @@ "editor.tabSize": 2, "editor.formatOnSave": true, "rewrap.wrappingColumn": 80, - "cSpell.words": ["repros"] + "cSpell.words": ["repros"], + "typescript.tsdk": "node_modules/typescript/lib" } diff --git a/package.json b/package.json index 6b82332e..3ed84ae7 100644 --- a/package.json +++ b/package.json @@ -50,9 +50,9 @@ }, "dependencies": { "@oclif/core": "^4.0.6", - "@salesforce/core": "^8.0.5", + "@salesforce/core": "^8.1.0", "@salesforce/kit": "^3.1.6", - "@salesforce/source-deploy-retrieve": "^12.0.2", + "@salesforce/source-deploy-retrieve": "^12.1.0", "@salesforce/ts-types": "^2.0.10", "fast-xml-parser": "^4.4.0", "graceful-fs": "^4.2.11", @@ -66,8 +66,8 @@ "@types/graceful-fs": "^4.1.9", "eslint-plugin-sf-plugin": "^1.18.9", "ts-node": "^10.9.2", - "ts-patch": "^3.2.0", - "typescript": "^5.4.5" + "ts-patch": "^3.2.1", + "typescript": "^5.5.2" }, "config": {}, "publishConfig": { diff --git a/src/shared/populateFilePaths.ts b/src/shared/populateFilePaths.ts index fbd02783..6ce52871 100644 --- a/src/shared/populateFilePaths.ts +++ b/src/shared/populateFilePaths.ts @@ -57,7 +57,7 @@ export const populateFilePaths = ({ // Throw if anything was actually missing if (missingComponents.length > 0) { throw new Error( - `unable to generate complete component set for ${elements + `unable to generate complete component set for ${missingComponents .map((element) => `${element.name} (${element.type})`) .join(EOL)}` ); @@ -84,7 +84,7 @@ export const populateFilePaths = ({ .map((matchingComponent) => { logger.debug( `${matchingComponent.fullName}|${matchingComponent.type.name} matches ${ - matchingComponent.xml + matchingComponent.xml ?? '' } and maybe ${matchingComponent.walkContent().toString()}` ); // Decode the key since local components can have encoded fullNames, but results from querying diff --git a/src/shared/remoteSourceTrackingService.ts b/src/shared/remoteSourceTrackingService.ts index eb8375dc..4334d8d3 100644 --- a/src/shared/remoteSourceTrackingService.ts +++ b/src/shared/remoteSourceTrackingService.ts @@ -160,7 +160,9 @@ export class RemoteSourceTrackingService { this.logger.warn(`found no matching revision for ${metadataKey}`); } else if (doesNotMatchServer(revision)) { quietLogger( - `Syncing ${metadataKey} revision from ${revision.lastRetrievedFromServer} to ${revision.serverRevisionCounter}` + `Syncing ${metadataKey} revision from ${revision.lastRetrievedFromServer ?? 'null'} to ${ + revision.serverRevisionCounter + }` ); this.setMemberRevision(metadataKey, { ...revision, lastRetrievedFromServer: revision.serverRevisionCounter }); } diff --git a/yarn.lock b/yarn.lock index d875ee5f..f21c14e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -502,26 +502,6 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" -"@jsforce/jsforce-node@^3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.2.0.tgz#4b104613fc9bb74e0e38d2c00936ea2b228ba73a" - integrity sha512-3GjWNgWs0HFajVhIhwvBPb0B45o500wTBNEBYxy8XjeeRra+qw8A9xUrfVU7TAGev8kXuKhjJwaTiSzThpEnew== - dependencies: - "@sindresorhus/is" "^4" - "@types/node" "^18.15.3" - abort-controller "^3.0.0" - base64url "^3.0.1" - csv-parse "^5.5.2" - csv-stringify "^6.4.4" - faye "^1.4.0" - form-data "^4.0.0" - fs-extra "^8.1.0" - https-proxy-agent "^5.0.0" - multistream "^3.1.0" - node-fetch "^2.6.1" - strip-ansi "^6.0.0" - xml2js "^0.6.2" - "@jsforce/jsforce-node@^3.2.1": version "3.2.1" resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.2.1.tgz#00fab05919e0cbe91ae4d873377e56cfbc087b98" @@ -607,34 +587,10 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^8.0.1", "@salesforce/core@^8.0.3": - version "8.0.3" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.0.3.tgz#8b25ce46100baef0a8e731b42d373edf508ab144" - integrity sha512-HirswUFGQIF5Ipaa+5l3kulBOf3L25Z3fzf5QqEI4vOxgBKN2bEdKHCA/PROufi3/ejFstiXcn9/jfgyjDdBqA== - dependencies: - "@jsforce/jsforce-node" "^3.2.0" - "@salesforce/kit" "^3.1.6" - "@salesforce/schemas" "^1.9.0" - "@salesforce/ts-types" "^2.0.10" - ajv "^8.16.0" - change-case "^4.1.2" - fast-levenshtein "^3.0.0" - faye "^1.4.0" - form-data "^4.0.0" - js2xmlparser "^4.0.1" - jsonwebtoken "9.0.2" - jszip "3.10.1" - pino "^9.2.0" - pino-abstract-transport "^1.2.0" - pino-pretty "^11.2.1" - proper-lockfile "^4.1.2" - semver "^7.6.2" - ts-retry-promise "^0.8.1" - -"@salesforce/core@^8.0.5": - version "8.0.5" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.0.5.tgz#f3d4af7052ff39bf06ec89af3734339b3fabe879" - integrity sha512-+p1TYvKhXWlzah7qp+vnv5W63EZm6nn7zLRvivFsL6pza0B4siHWfx11ceJ4p7W8+kh/xeuygtkddwYoLS3KkA== +"@salesforce/core@^8.0.1", "@salesforce/core@^8.0.3", "@salesforce/core@^8.1.0": + version "8.1.0" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.1.0.tgz#8ee25acdacf9d70a6249907a2fe3503461f18766" + integrity sha512-oItr8cdeMe67glJN3dP1Gh/kasD0DUT6S6RfcLTH32wwuZNQAwMXNgBOCvlskr8nxPZ+YSSw7CVuqYMUmCtUXA== dependencies: "@jsforce/jsforce-node" "^3.2.1" "@salesforce/kit" "^3.1.6" @@ -709,12 +665,12 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.9.0.tgz#ba477a112653a20b4edcf989c61c57bdff9aa3ca" integrity sha512-LiN37zG5ODT6z70sL1fxF7BQwtCX9JOWofSU8iliSNIM+WDEeinnoFtVqPInRSNt8I0RiJxIKCrqstsmQRBNvA== -"@salesforce/source-deploy-retrieve@^12.0.2": - version "12.0.2" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.0.2.tgz#f2eaf487834499be72391d38a2e6168f8bbc27cf" - integrity sha512-3Zq2BdLOBcsAuGHykZBDQbLKvjDfwGr5I9KnQW1EaGhxnwo7uK/RhhaFCpskjvbL0+D3PU7+wOlPLdB16FeIbg== +"@salesforce/source-deploy-retrieve@^12.1.0": + version "12.1.0" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.1.0.tgz#4f82d809c40fb6477f86f5d6c545c38f3f34f13f" + integrity sha512-LI6hVzYTC6tl/sFnz1/sJGy1LuH+PfZHqZ7Sl9+kj4M5plgrx5R4urY1k2iuF/n/m1zYmagLmfnzE+DqQ/hbAA== dependencies: - "@salesforce/core" "^8.0.3" + "@salesforce/core" "^8.1.0" "@salesforce/kit" "^3.1.6" "@salesforce/ts-types" "^2.0.10" fast-levenshtein "^3.0.0" @@ -5132,16 +5088,7 @@ srcset@^5.0.0: resolved "https://registry.yarnpkg.com/srcset/-/srcset-5.0.0.tgz#9df6c3961b5b44a02532ce6ae4544832609e2e3f" integrity sha512-SqEZaAEhe0A6ETEa9O1IhSPC7MdvehZtCnTR0AftXk3QhY2UNgb+NApFOUPZILXk/YTDfFxMTNJOBpzrJsEdIA== -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"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: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -5200,14 +5147,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -5373,10 +5313,10 @@ ts-node@^10.8.1, ts-node@^10.9.2: v8-compile-cache-lib "^3.0.1" yn "3.1.1" -ts-patch@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ts-patch/-/ts-patch-3.2.0.tgz#537b0e19aa273da4a34e42be68240ef062646dd3" - integrity sha512-fUGMkjGIlD4BFibDM+6pLYLXRguzCUY6fhP1KQzSnFJfAtTDT7DKyX0yHn3CJqfBv4mia/o3ZRte31UVf9Dl1A== +ts-patch@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ts-patch/-/ts-patch-3.2.1.tgz#0c1ecfcb6b6633bf23e533016ffda4d566518628" + integrity sha512-hlR43v+GUIUy8/ZGFP1DquEqPh7PFKQdDMTAmYt671kCCA6AkDQMoeFaFmZ7ObPLYOmpMgyKUqL1C+coFMf30w== dependencies: chalk "^4.1.2" global-prefix "^3.0.0" @@ -5510,10 +5450,10 @@ typedoc@^0.25.13: minimatch "^9.0.3" shiki "^0.14.7" -"typescript@^4.6.4 || ^5.0.0", typescript@^5.4.3, typescript@^5.4.5: - version "5.4.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" - integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== +"typescript@^4.6.4 || ^5.0.0", typescript@^5.4.3, typescript@^5.5.2: + version "5.5.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507" + integrity sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew== unbox-primitive@^1.0.2: version "1.0.2" @@ -5711,7 +5651,7 @@ workerpool@6.2.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -5729,15 +5669,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"