chore: merge main, resolve conflicts

Author: WillieRuemmele

.github/workflows/onRelease.yml

@@ -25,7 +25,7 @@ jobs:
     uses: salesforcecli/github-workflows/.github/workflows/npmPublish.yml@main
     needs: [getDistTag]
     with:
-      ctc: true
+      #      ctc: true
       sign: true
       tag: ${{ needs.getDistTag.outputs.tag || 'latest' }}
       githubTag: ${{ github.event.release.tag_name || inputs.tag }}

package.json

@@ -25,17 +25,17 @@
   },
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^5.2.19",
-    "@oclif/test": "^4.1.0",
+    "@oclif/test": "^4.1.14",
     "@salesforce/cli-plugins-testkit": "^5.3.41",
     "@salesforce/dev-scripts": "^11.0.4",
-    "@salesforce/plugin-command-reference": "^3.1.67",
+    "@salesforce/plugin-command-reference": "^3.1.72",
     "@types/inquirer": "^9.0.9",
     "@types/react": "^18.3.3",
     "eslint-config-xo": "^0.49.0",
     "eslint-config-xo-react": "^0.27.0",
     "eslint-plugin-react": "^7.34.3",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-sf-plugin": "^1.20.20",
+    "eslint-plugin-sf-plugin": "^1.20.33",
     "esmock": "^2.7.1",
     "oclif": "^4.22.14",
     "ts-node": "^10.9.2",

test/nuts/agent.nut.ts

@@ -193,8 +193,10 @@ describe('plugin-agent NUTs', () => {
         execCmd(`agent activate --api-name ${botApiName} --target-org ${username} --json`, { ensureExitCode: 0 });
       } catch (err) {
         const errMsg = err instanceof Error ? err.message : 'unknown';
-        console.log(`Error activating agent due to ${errMsg}. \nWaiting 2 minutes and trying again...`);
-        await sleep(120_000);
+        const waitMin = 3;
+        console.log(`Error activating agent due to ${errMsg}. \nWaiting ${waitMin} minutes and trying again...`);
+        await sleep(waitMin * 60 * 1000);
+        console.log(`${waitMin} minutes is up, retrying now.`);
         execCmd(`agent activate --api-name ${botApiName} --target-org ${username} --json`, { ensureExitCode: 0 });
       }
 

yarn.lock

@@ -1539,7 +1539,7 @@
     strip-ansi "^7.1.2"
     wrap-ansi "^9.0.2"
 
-"@oclif/test@^4.1.0":
+"@oclif/test@^4.1.14":
   version "4.1.14"
   resolved "https://registry.yarnpkg.com/@oclif/test/-/test-4.1.14.tgz#3138664c28199957289d88aff78c4bd50a276fbf"
   integrity sha512-FKPUBOnC1KnYZBcYOMNmt0DfdqTdSo2Vx8OnqgnMslHVPRPqrUF1bxfEHaw5W/+vOQLwF7MiEPq8DObpXfJJbg==
@@ -1607,7 +1607,7 @@
     strip-ansi "6.0.1"
     ts-retry-promise "^0.8.1"
 
-"@salesforce/core@^8.18.7", "@salesforce/core@^8.19.1", "@salesforce/core@^8.22.0", "@salesforce/core@^8.23.0", "@salesforce/core@^8.23.1", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0":
+"@salesforce/core@^8.18.7", "@salesforce/core@^8.19.1", "@salesforce/core@^8.22.0", "@salesforce/core@^8.23.1", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0":
   version "8.23.1"
   resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.23.1.tgz#89e04518d6d4033ef6a248380eb952328068797c"
   integrity sha512-/mQMu6g0gmkKQsl+G93VkkU+yrLEjnBzdUu0sPlS0WY5jM4M9sxg97LmRXa6dchECU3c/ugamsXaP6j6QmEfsQ==
@@ -1676,7 +1676,7 @@
   dependencies:
     "@salesforce/ts-types" "^2.0.12"
 
-"@salesforce/plugin-command-reference@^3.1.67":
+"@salesforce/plugin-command-reference@^3.1.72":
   version "3.1.72"
   resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-3.1.72.tgz#cfd03311c2a0d1dc3083d1ebf59ce9b9175626c3"
   integrity sha512-/i4F7u16M3IT4oh3w7uYQM6Lk6cGsHldtcz+sV+uNKdFoYK3ikcEt1dX/RSXhm9SHMFGzcbhvDwGFZpGrHvplw==
@@ -4319,12 +4319,12 @@ eslint-plugin-react@^7.34.3:
     string.prototype.matchall "^4.0.12"
     string.prototype.repeat "^1.0.0"
 
-eslint-plugin-sf-plugin@^1.20.20:
-  version "1.20.32"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.20.32.tgz#9a3c1c84295090088addcf801abc082bb4980e35"
-  integrity sha512-laSlqqFgJEbffPw5XOxIgIdswsM7JxHqI0F7azKVmezIC0+ceEw0fkbIY1cI9cE/Ihu57/46GM5+fXRUYrodzw==
+eslint-plugin-sf-plugin@^1.20.33:
+  version "1.20.33"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.20.33.tgz#c59f7b330d71f09f02ff71a75e06ae7a98ceca40"
+  integrity sha512-qzl3IJ2Tqe33IXMlytehBk1Taz5o8CMu3Ujli3VW965k9RI90nCHxXj/JyRm8q7PqA02ENjJpNRR4Y5UP5kwIg==
   dependencies:
-    "@salesforce/core" "^8.23.0"
+    "@salesforce/core" "^8.23.1"
     "@typescript-eslint/utils" "^7.18.0"
 
 eslint-plugin-unicorn@^50.0.1: