From 214f7255aa9e5c888e2128d21867467bc710ebff Mon Sep 17 00:00:00 2001 From: Shane McLaughlin Date: Tue, 17 Oct 2023 18:22:45 -0500 Subject: [PATCH] fix(deps): bump stl (#979) * fix(deps): bump stl * test: filter out prm folders --- package.json | 2 +- test/nuts/trackingCommands/remoteChanges.nut.ts | 7 +++++-- yarn.lock | 16 ++++++++-------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index fa716938f..17ccd27f8 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@salesforce/kit": "^3.0.12", "@salesforce/sf-plugins-core": "^3.1.25", "@salesforce/source-deploy-retrieve": "^9.7.27", - "@salesforce/source-tracking": "^4.2.10", + "@salesforce/source-tracking": "^4.2.17", "chalk": "^4.1.2", "got": "^11.8.6", "proxy-agent": "^6.3.1", diff --git a/test/nuts/trackingCommands/remoteChanges.nut.ts b/test/nuts/trackingCommands/remoteChanges.nut.ts index 8ac0817de..a5ff438e8 100644 --- a/test/nuts/trackingCommands/remoteChanges.nut.ts +++ b/test/nuts/trackingCommands/remoteChanges.nut.ts @@ -106,9 +106,12 @@ describe('remote changes', () => { }); it('can pull the delete', () => { const result = execCmd('force:source:pull --json', { ensureExitCode: 0 }).jsonOutput.result; + // ebikes ignore file doesn't catch this somehow on windows (probably that slash) + // https://github.com/trailheadapps/ebikes-lwc/blob/3e5baf83d97bc71660feaa9922f8fed2e686f5f8/.forceignore#L136-L137 + const filteredSource = result.pulledSource.filter((r) => !r.fullName.includes('prm_channel_reports_folder')); // the 2 files for the apexClass, and possibly one for the Profile (depending on whether it got created in time) - expect(result.pulledSource, JSON.stringify(result)).to.have.length.greaterThanOrEqual(2); - expect(result.pulledSource, JSON.stringify(result)).to.have.length.lessThanOrEqual(4); + expect(filteredSource).to.have.length.greaterThanOrEqual(2); + expect(filteredSource).to.have.length.lessThanOrEqual(4); result.pulledSource .filter((r) => r.fullName === 'TestOrderController') .map((r) => expect(r.state).to.equal('Deleted')); diff --git a/yarn.lock b/yarn.lock index 189e13b9a..9c15a13d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -970,7 +970,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.7.1" -"@salesforce/core@^5.2.0", "@salesforce/core@^5.2.1", "@salesforce/core@^5.2.6", "@salesforce/core@^5.2.9", "@salesforce/core@^5.3.1", "@salesforce/core@^5.3.3", "@salesforce/core@^5.3.5": +"@salesforce/core@^5.2.0", "@salesforce/core@^5.2.1", "@salesforce/core@^5.2.6", "@salesforce/core@^5.2.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== @@ -1151,7 +1151,7 @@ chalk "^4" inquirer "^8.2.5" -"@salesforce/source-deploy-retrieve@^9.7.20", "@salesforce/source-deploy-retrieve@^9.7.24", "@salesforce/source-deploy-retrieve@^9.7.27", "@salesforce/source-deploy-retrieve@^9.7.7": +"@salesforce/source-deploy-retrieve@^9.7.24", "@salesforce/source-deploy-retrieve@^9.7.25", "@salesforce/source-deploy-retrieve@^9.7.27", "@salesforce/source-deploy-retrieve@^9.7.7": 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== @@ -1186,14 +1186,14 @@ shelljs "^0.8.4" sinon "^10.0.0" -"@salesforce/source-tracking@^4.2.10", "@salesforce/source-tracking@^4.2.16": - version "4.2.16" - resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-4.2.16.tgz#e64a7eeeb122045b61588b44c8c2e533ba5aa92a" - integrity sha512-HAuLaY+RrdKvWjx9FVYMrYlIUW4JyQtF/TA5hbDpy4Rw8IUOgrYyt+IaoiAAtMyRqU8En8fJBUqiq4qFvhdpCA== +"@salesforce/source-tracking@^4.2.16", "@salesforce/source-tracking@^4.2.17": + version "4.2.17" + resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-4.2.17.tgz#2f507a8352fecf6dbcddea074648fd898b142874" + integrity sha512-3tEXph7SiEFYY+eQEXFyEr6//7TlCLxWXS/YebY8gPY9zP/Ny6wVPP5E+A5QbN6GiXNMVJNmpq431b9NnQY8Fg== dependencies: - "@salesforce/core" "^5.3.3" + "@salesforce/core" "^5.3.9" "@salesforce/kit" "^3.0.13" - "@salesforce/source-deploy-retrieve" "^9.7.20" + "@salesforce/source-deploy-retrieve" "^9.7.25" "@salesforce/ts-types" "^2.0.8" fast-xml-parser "^4.2.5" graceful-fs "^4.2.11"