chore: merge conflicts

.github/workflows/releaseWithCoreBundle.yml

@@ -1,5 +1,11 @@
 name: publish source-tracking-bundle
 on:
+  workflow_run:
+    workflows:
+      - publish
+    types:
+      - completed
+
   workflow_dispatch:
     inputs:
       branch:
@@ -10,7 +16,8 @@ on:
 
 jobs:
   call-release-workflow:
+    if: ${{ inputs.branch || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success')}}
     uses: forcedotcom/bundle-publish-scripts/.github/workflows/releaseWithCoreBundle.yml@main
     secrets: inherit
     with:
-      branch: ${{ inputs.branch }}
+      branch: ${{ inputs.branch || 'main'}}

.github/workflows/validate-bundle.yml

@@ -0,0 +1,10 @@
+name: Run Tests for bundling against Change
+
+on:
+  push:
+    branches-ignore: [main]
+
+jobs:
+  call-validate-bundle:
+    uses: forcedotcom/bundle-publish-scripts/.github/workflows/validateBundleForDependents.yml@main
+    secrets: inherit

CHANGELOG.md

@@ -1,11 +1,14 @@
-## [6.3.4](https://github.com/forcedotcom/source-tracking/compare/6.3.3...6.3.4) (2024-06-04)
+# [6.4.0](https://github.com/forcedotcom/source-tracking/compare/6.3.4...6.4.0) (2024-06-07)
 
+### Features
 
-### Reverts
+- use oclif/core v4 ([#604](https://github.com/forcedotcom/source-tracking/issues/604)) ([58f7d15](https://github.com/forcedotcom/source-tracking/commit/58f7d15b404e28eb1508f9eb4815559abbb9c69d))
 
-* Revert "Mz/automation test bundling (#600)" (#602) ([0e6fe38](https://github.com/forcedotcom/source-tracking/commit/0e6fe3845a9a4d44cced23771d50126348decc13)), closes [#600](https://github.com/forcedotcom/source-tracking/issues/600) [#602](https://github.com/forcedotcom/source-tracking/issues/602)
+## [6.3.4](https://github.com/forcedotcom/source-tracking/compare/6.3.3...6.3.4) (2024-06-04)
 
+### Reverts
 
+- Revert "Mz/automation test bundling (#600)" (#602) ([0e6fe38](https://github.com/forcedotcom/source-tracking/commit/0e6fe3845a9a4d44cced23771d50126348decc13)), closes [#600](https://github.com/forcedotcom/source-tracking/issues/600) [#602](https://github.com/forcedotcom/source-tracking/issues/602)
 
 ## [6.3.3](https://github.com/forcedotcom/source-tracking/compare/6.3.2...6.3.3) (2024-06-01)
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/source-tracking",
   "description": "API for tracking local and remote Salesforce metadata changes",
-  "version": "6.3.4",
+  "version": "6.4.0",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",
@@ -49,7 +49,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@oclif/core": "^4.0.0",
+    "@oclif/core": "^4.0.3",
     "@salesforce/core": "^7.3.10",
     "@salesforce/kit": "^3.1.2",
     "@salesforce/source-deploy-retrieve": "^11.6.5",
@@ -61,7 +61,7 @@
   },
   "devDependencies": {
     "@salesforce/cli-plugins-testkit": "^5.3.8",
-    "@salesforce/dev-scripts": "^9.1.2",
+    "@salesforce/dev-scripts": "^10.1.0",
     "@salesforce/schemas": "^1.9.0",
     "@types/graceful-fs": "^4.1.9",
     "eslint-plugin-sf-plugin": "^1.18.5",

src/shared/local/localShadowRepo.ts

@@ -12,7 +12,7 @@ import { NamedPackageDir, Lifecycle, Logger, SfError } from '@salesforce/core';
 import { env } from '@salesforce/kit';
 // @ts-expect-error isogit has both ESM and CJS exports but node16 module/resolution identifies it as ESM
 import git from 'isomorphic-git';
-import { Performance } from '@oclif/core';
+import { Performance } from '@oclif/core/performance';
 import { RegistryAccess } from '@salesforce/source-deploy-retrieve';
 import { chunkArray, excludeLwcLocalOnlyTest, folderContainsPath } from '../functions';
 import { filenameMatchesToMap, getLogMessage, getMatches } from './moveDetection';

yarn.lock

@@ -543,10 +543,10 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@oclif/core@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-4.0.0.tgz#c47783c9803cb440e3fd325157437400765eae3f"
-  integrity sha512-BMWGvJrzn5PnG60gTNFEvaBT0jvGNiJCKN4aJBYP6E7Bq/Y5XPnxPrkj7ZZs/Jsd1oVn6K/JRmF6gWpv72DOew==
+"@oclif/core@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-4.0.3.tgz#6231272447c7057813986860448613ed38cfdc47"
+  integrity sha512-yM8R/M2WfSNfL9eF8clS/SbQvanvHZJgoij5bLs3ro7uAFCkL/LYcagyj0UVGbysx5AI+SNIof6OHQUXYZpOZw==
   dependencies:
     ansi-escapes "^4.3.2"
     ansis "^3.1.1"
@@ -615,10 +615,10 @@
   resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.1.0.tgz#e529576466d074e7a5f1441236510fef123da01e"
   integrity sha512-2iDDepiIwjXHS5IVY7pwv8jMo4xWosJ7p/UTj+lllpB/gnJiYLhjJPE4Z3FCGFKyvfg5jGaimCd8Ca6bLGsCQA==
 
-"@salesforce/dev-scripts@^9.1.2":
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-9.1.2.tgz#41180b427bc4d97acd6667410f6b7642bfc000fe"
-  integrity sha512-ZVNL2j3rU+qDZ6G1nxu6pV8HFdru2L9PYL//npEmvnofwt4j8fmYiZD39K8ljLN3RxT7X1//b55R1h0DbcgeLA==
+"@salesforce/dev-scripts@^10.1.0":
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-10.1.0.tgz#9bf765a5c8d46725e35d994fa32a1fe8f25019ba"
+  integrity sha512-8fItXnCR8G5n950Ymgrjc6CGJjR80376v6GIdjatv3AmMVJAB/GerglcNF/LIJjBXB5OLxiTLAjQdPCvWqBL1g==
   dependencies:
     "@commitlint/cli" "^17.1.2"
     "@commitlint/config-conventional" "^17.8.1"
@@ -1050,14 +1050,14 @@ ajv@^6.12.4:
     uri-js "^4.2.2"
 
 ajv@^8.11.0, ajv@^8.15.0:
-  version "8.15.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.15.0.tgz#d918c661e3e820bbbc65a320e182ee56a1aa978a"
-  integrity sha512-15BTtQUOsSrmHCy+B4VnAiJAJxJ8IFgu6fcjFQF3jQYZ78nLSQthlFg4ehp+NLIyfvFgOlxNsjKIEhydtFPVHQ==
+  version "8.16.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.16.0.tgz#22e2a92b94f005f7e0f9c9d39652ef0b8f6f0cb4"
+  integrity sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==
   dependencies:
     fast-deep-equal "^3.1.3"
-    fast-uri "^2.3.0"
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
+    uri-js "^4.4.1"
 
 [email protected]:
   version "4.1.1"