resolve merge conflicts

knip.json

@@ -0,0 +1,9 @@
+{
+  "ignore": [
+		".husky/*",
+		"tsup.config.ts"
+	],
+  "ignoreBinaries": [
+		"lint-staged"
+	]
+}

package.json

@@ -16,7 +16,7 @@
     "bin",
     "LICENSE",
     "README.md",
-		"webvsc.mjs"
+    "webvsc.mjs"
   ],
 	"engines": {
 		"node": ">=18.0.0"
@@ -39,31 +39,35 @@
     "@visbot/webvsc": "3.0.0-alpha",
     "chokidar": "^3.5.3",
     "commander": "^9.4.1",
-    "globby": "^13.1.3",
-    "graceful-fs": "^4.2.10",
-    "log-symbols": "^5.1.0",
+    "diff": "^5.1.0",
+    "leven": "^4.0.0",
+    "log-symbols": "^6.0.0",
     "picocolors": "^1.0.0",
-    "pretty-bytes": "^6.0.0"
+    "pretty-bytes": "^6.1.1",
+    "seqalign": "^1.0.6"
   },
   "devDependencies": {
     "@types/node": "^18.11.18",
-    "@typescript-eslint/eslint-plugin": "^5.48.0",
-    "@typescript-eslint/parser": "^5.48.0",
-    "eslint": "^8.31.0",
+    "@typescript-eslint/eslint-plugin": "^6.9.1",
+    "@typescript-eslint/parser": "^6.9.1",
+    "eslint": "^8.52.0",
     "eslint-plugin-json": "^3.1.0",
     "husky": "^8.0.3",
-    "tslint": "^5.20.1",
+    "knip": "^2.38.6",
+    "npm-run-all2": "^6.1.1",
     "tsup": "^7.2.0",
-    "typescript": "^4.9.4"
+    "typescript": "^5.2.2"
   },
   "scripts": {
-    "build": "tsup src/cli.ts --format esm --target esnext --treeshake recommended --minify --dts --out-dir bin",
+    "build": "tsup",
     "dev": "npm run start",
-    "lint": "eslint ./src --ignore-path .gitignore",
+    "lint": "npm-run-all --parallel lint:*",
+    "lint:deps": "knip",
+    "lint:ts": "eslint ./src --ignore-path .gitignore",
     "prepack": "npm run build",
     "prepare": "husky install",
     "start": "npm run build -- --watch",
-		"test": "node ./webvsc.mjs --help"
+    "test": "node ./webvsc.mjs --help"
   },
   "lint-staged": {
     "*.(json|ts)": "eslint --cache --fix"