chore: release v0.4.0

.vscode/extensions.json

@@ -1,3 +1,3 @@
 {
-  "recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
+  "recommendations": ["oxc.oxc-vscode"]
 }

.vscode/settings.json

@@ -1,27 +1,9 @@
 {
-  "eslint.trace.server": "verbose",
   "editor.formatOnSave": true,
   "editor.rulers": [80],
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "[typescript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  "editor.defaultFormatter": "oxc.oxc-vscode",
+  "editor.codeActionsOnSave": {
+    "source.fixAll.oxc": "always"
   },
-  "[javascript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[typescriptreact]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[javascriptreact]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[scss]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[css]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[json]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  }
+  "oxc.fmt.configPath": ".oxfmtrc.json"
 }

CHANGELOG.md

@@ -1,5 +1,11 @@
 # lockfile-conflicts
 
+## 0.4.0
+
+### Minor Changes
+
+- 7f97c67: Guard generated Git hooks before running `lockfile cleanup`, avoid mutating global hooks while supporting hook-manager shim directories and shared worktree hooks, and migrate the project toolchain to pnpm 11, Oxlint, and Oxfmt.
+
 ## 0.3.0
 
 ### Minor Changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lockfile-conflicts",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "type": "module",
   "packageManager": "pnpm@11.5.2",
   "description": "A custom merge driver, aims to handle lockfile conflicts automatically in merge/rebase process.",