upgrade dependencies and changelog

.github/workflows/deploy.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 18
       - run: npm ci
       - name: Publish to Open VSX Registry
         uses: HaaLeo/publish-vscode-extension@v1

.github/workflows/node.js.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.6.37] - 2023-03-01
+- Upgrade to newer refs api to fix breakage on coming VSCode versions (Burak @unexge)
+- Upgrade dependencies
+
 ## [0.6.36] - 2022-12-07
 - Make forge status fully async as to not block the git status buffer
 - Move away from private vscode APIs that are to be removed soon

package.json

@@ -7,7 +7,7 @@
   "author": {
     "name": "Kristian Andersen Hole"
   },
-  "version": "0.6.36",
+  "version": "0.6.37",
   "engines": {
     "vscode": "^1.50.0"
   },
@@ -37,38 +37,6 @@
     }
   },
   "activationEvents": [
-    "onCommand:magit.status",
-    "onCommand:magit.dispatch",
-    "onCommand:magit.commit",
-    "onCommand:magit.branching",
-    "onCommand:magit.merging",
-    "onCommand:magit.rebasing",
-    "onCommand:magit.resetting",
-    "onCommand:magit.pushing",
-    "onCommand:magit.pulling",
-    "onCommand:magit.remoting",
-    "onCommand:magit.logging",
-    "onCommand:magit.show-refs",
-    "onCommand:magit.diffing",
-    "onCommand:magit.tagging",
-    "onCommand:magit.cherry-picking",
-    "onCommand:magit.reverting",
-    "onCommand:magit.ignoring",
-    "onCommand:magit.running",
-    "onCommand:magit.worktree",
-    "onCommand:magit.help",
-    "onCommand:magit.stashing",
-    "onCommand:magit.submodules",
-    "onCommand:magit.fetching",
-    "onCommand:magit.process-log",
-    "onCommand:magit.file-popup",
-    "onCommand:magit.blame-file",
-    "onCommand:magit.diff-file",
-    "onCommand:magit.log-file",
-    "onCommand:magit.stage-file",
-    "onCommand:magit.stage-all",
-    "onCommand:magit.unstage-file",
-    "onCommand:magit.unstage-all",
     "onCommand:magit.save-and-close-editor",
     "onCommand:magit.clear-and-abort-editor"
   ],
@@ -737,20 +705,20 @@
   "devDependencies": {
     "@types/glob": "^7.1.3",
     "@types/mocha": "^8.2.0",
-    "@types/node": "^14.14.14",
-    "@types/vscode": "^1.50.0",
+    "@types/node": "^18.14.2",
+    "@types/vscode": "^1.75.1",
     "@types/which": "^2.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.10.0",
-    "@typescript-eslint/parser": "^4.10.0",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/parser": "^5.54.0",
     "eslint": "^7.16.0",
     "eslint-loader": "^4.0.2",
     "glob": "^7.1.6",
     "mocha": "^10.1.0",
-    "ts-loader": "^8.0.12",
-    "typescript": "^4.1.3",
+    "ts-loader": "^9.4.2",
+    "typescript": "^4.9.5",
     "vscode-test": "^1.4.1",
-    "webpack": "^5.11.0",
-    "webpack-cli": "^4.2.0"
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.1"
   },
   "dependencies": {
     "@vscode/iconv-lite-umd": "^0.7.0",

src/commands/branchingCommands.ts

@@ -116,7 +116,7 @@ async function deleteBranch({ repository }: MenuState) {
   if (ref) {
     try {
       await gitRun(repository.gitRepository, ['branch', '--delete', ref]);
-    } catch (error) {
+    } catch (error: any) {
       if (error.gitErrorCode === GitErrorCodes.BranchNotFullyMerged) {
         if (await MagitUtils.confirmAction(`Delete unmerged branch ${ref}?`)) {
           return await gitRun(repository.gitRepository, ['branch', '--delete', '--force', ref]);

src/commands/discardAtPointCommands.ts

@@ -118,7 +118,7 @@ async function discard(repository: MagitRepository, selection: Selection, select
       if (await MagitUtils.confirmAction(`Delete branch ${branch.name}?`)) {
         try {
           await gitRun(repository.gitRepository, ['branch', '--delete', branch.name]);
-        } catch (error) {
+        } catch (error: any) {
           if (error.gitErrorCode === GitErrorCodes.BranchNotFullyMerged) {
             if (await MagitUtils.confirmAction(`Delete unmerged branch ${branch.name}?`)) {
               return gitRun(repository.gitRepository, ['branch', '--delete', '--force', branch.name]);
@@ -137,7 +137,7 @@ async function discard(repository: MagitRepository, selection: Selection, select
       if (await MagitUtils.confirmAction(`Delete branch ${branch.name} at REMOTE ${remote} (push --delete)?`)) {
         try {
           await gitRun(repository.gitRepository, ['push', '--delete', remote, name]);
-        } catch (error) {
+        } catch (error: any) {
           if (error.gitErrorCode === GitErrorCodes.BranchNotFullyMerged) {
             if (await MagitUtils.confirmAction(`Delete unmerged branch ${branch.name}?`)) {
               return gitRun(repository.gitRepository, ['push', '--delete', remote, name]);

src/utils/commitCache.ts

@@ -4,6 +4,7 @@ const commitCache: { [hash: string]: Promise<Commit>; } = {};
 
 export function getCommit(repository: Repository, hash: string): Promise<Commit> {
 
+  //@ts-expect-error TS2801
   if (commitCache[hash]) {
     return commitCache[hash];
   }