chore: Resolve merge conflicts

2024-07-31 21:26:54 +08:00
parent 4074a88c13
commit 082847c441
44 changed files with 772 additions and 475 deletions
--- a/internal/lint-configs/eslint-config/package.json
+++ b/internal/lint-configs/eslint-config/package.json
@@ -27,7 +27,7 @@
    }
  },
  "dependencies": {
-    "eslint-config-turbo": "^2.0.9",
+    "eslint-config-turbo": "^2.0.10",
    "eslint-plugin-command": "^0.2.3",
    "eslint-plugin-import-x": "^3.1.0"
  },
@@ -39,7 +39,7 @@
    "eslint": "^9.8.0",
    "eslint-config-prettier": "^9.1.0",
    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-jsdoc": "^48.10.1",
+    "eslint-plugin-jsdoc": "^48.10.2",
    "eslint-plugin-jsonc": "^2.16.0",
    "eslint-plugin-n": "^17.10.1",
    "eslint-plugin-no-only-tests": "^3.1.0",