merge: resolve conflicts with upstream

umijs · Nov 12, 2024 · fcecb4b · fcecb4b
2 parents f8d2987 + a8e477e
commit fcecb4b
Show file tree

Hide file tree

Showing 5 changed files with 487 additions and 21 deletions.
diff --git a/.commitlintrc.js b/.commitlintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: ['@commitlint/config-conventional']
+};
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -0,0 +1 @@
+npx --no -- commitlint --edit $1
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/tnf",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "scripts": {
     "build": "father build",
     "changeset": "tsx scripts/changeset.ts && changeset",
@@ -76,7 +76,9 @@
     "tsx": "^4.19.2",
     "typescript": "^5.6.3",
     "vitest": "^2.1.4",
-    "zx": "^8.2.0"
+    "zx": "^8.2.0",
+    "@commitlint/cli": "^19.0.3",
+    "@commitlint/config-conventional": "^19.0.3"
   },
   "lint-staged": {
     "*.{jsx,less,md,json}": [