From b611415d32f29ac5f8bc091652031d635d7338fe Mon Sep 17 00:00:00 2001 From: Shane McLaughlin Date: Fri, 25 Mar 2022 08:39:01 -0700 Subject: [PATCH] fix: bump stl for graceful (#459) * fix: bump stl for graceful * fix: squash merges are rquired on plugin-source --- .circleci/config.yml | 3 ++- package.json | 2 +- yarn.lock | 11 ++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9e12cd52d..c8067362f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -126,4 +126,5 @@ workflows: only: - main jobs: - - release-management/dependabot-automerge + - release-management/dependabot-automerge: + merge-method: squash diff --git a/package.json b/package.json index b8581861b..d5f824ce4 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "@salesforce/command": "^4.2.2", "@salesforce/core": "^2.35.0", "@salesforce/source-deploy-retrieve": "^5.12.2", - "@salesforce/source-tracking": "^1.2.0", + "@salesforce/source-tracking": "^1.3.0", "chalk": "^4.1.2", "cli-ux": "^5.6.3", "got": "^11.8.3", diff --git a/yarn.lock b/yarn.lock index fa9caf620..8dbdd2f67 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1012,14 +1012,15 @@ sinon "^10.0.0" strip-ansi "^6.0.0" -"@salesforce/source-tracking@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-1.2.0.tgz#3a64ce059dffbfaae2871e4197260b34ca8bfe59" - integrity sha512-7kVD5dXg0ksIYmsZxDfo9qcpOjFiEjNEH3GY5liYDeAatQPKyjKuvRtjeY5NLbblpvZiu2yjLLSACpKq0B1vWw== +"@salesforce/source-tracking@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-1.3.0.tgz#a31f4d6a812e6da6b132f441e2dd1f6fd1bfef51" + integrity sha512-SCuiQZcpcZy/Emznd/FqCZGIQ+BkmPsFISv/rVhZCWj+v1wJTZGGDs/0XWObTaHAU7lTcv1VfMkAXcr6RMt0Pg== dependencies: "@salesforce/core" "^2.33.1" "@salesforce/kit" "^1.5.17" "@salesforce/source-deploy-retrieve" "^5.9.4" + graceful-fs "^4.2.9" isomorphic-git "1.16.0" ts-retry-promise "^0.6.0" @@ -4114,7 +4115,7 @@ got@^6.2.0: unzip-response "^2.0.1" url-parse-lax "^1.0.0" -graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.8: +graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.8, graceful-fs@^4.2.9: version "4.2.9" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==