fix conflicts

2025-11-16 22:23:42 +08:00 · 2024-03-12 18:03:24 +08:00
parent be379b6d63 2de655a1cf
commit 72f80a96bc
239 changed files with 602 additions and 452 deletions
--- a/new-ui/package.json
+++ b/new-ui/package.json
@@ -0,0 +1,27 @@
+{
+  "name": "gpt-vue",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "clear": "rimraf node_modules projects/vue-admin/node_modules projects/vue-mobile/node_modules projects/vue-web/node_modules",
+    "dev": "pnpm --filter=@gpt-vue-projects/* run dev",
+    "build": "pnpm --filter=@gpt-vue-projects/* run build"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@rushstack/eslint-patch": "^1.3.3",
+    "@tsconfig/node20": "^20.1.2",
+    "@types/node": "^20.11.10",
+    "@vue/eslint-config-typescript": "^12.0.0",
+    "@vue/tsconfig": "^0.5.1",
+    "eslint": "^8.49.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-vue": "^9.17.0",
+    "prettier": "^3.2.5",
+    "rimraf": "^5.0.5"
+  }
+}