Skip to content

Commit

Permalink
Merge branch 'update'
Browse files Browse the repository at this point in the history
# Conflicts:
#	bun.lockb
#	package.json
  • Loading branch information
17359898647 committed Jan 10, 2024
2 parents 88b4aab + 531e2a2 commit 9d8dbbd
Show file tree
Hide file tree
Showing 5 changed files with 1,587 additions and 947 deletions.
Binary file removed bun.lockb
Binary file not shown.
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
"dependencies": {
"@formkit/auto-animate": "^0.8.1",
"@hyoban/vite-plugin-checker": "^0.1.1",
"@iconify/json": "^2.2.161",
"@iconify/json": "^2.2.166",
"@types/lodash-es": "^4.17.12",
"@types/sortablejs": "^1.15.7",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"@vueuse/core": "^10.7.0",
"@vueuse/integrations": "^10.7.0",
"@vueuse/router": "^10.7.0",
"axios": "^1.6.2",
"@vueuse/core": "^10.7.1",
"@vueuse/integrations": "^10.7.1",
"@vueuse/router": "^10.7.1",
"axios": "^1.6.5",
"colord": "^2.9.3",
"dayjs": "^1.11.10",
"drauu": "^0.3.7",
"echarts": "^5.4.3",
"ge-eslint": "^0.0.6",
"lightningcss": "^1.22.1",
"lodash-es": "^4.17.21",
"naive-ui": "^2.36.0",
"naive-ui": "^2.37.3",
"pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.1",
"sortablejs": "^1.15.1",
Expand All @@ -40,31 +40,31 @@
"vite-plugin-compression": "^0.5.1",
"vite-plugin-svg-icons": "^2.0.1",
"vite-plugin-turbo-console": "^0.3.2",
"vite-plugin-vue-devtools": "^0.5.1",
"vite-plugin-vue-devtools": "0.5.1",
"vite-plugin-vue-inspector": "^4.0.2",
"vite-plugin-vue-layouts": "^0.10.0",
"vue": "3.3.8",
"vite-plugin-vue-layouts": "^0.11.0",
"vue": "^3.4.7",
"vue-router": "^4.2.5",
"vuedraggable": "^4.1.0"
},
"devDependencies": {
"@types/node": "^20.10.5",
"@unocss/reset": "^0.58.0",
"@vitejs/plugin-vue": "^4.5.2",
"@types/node": "^20.10.8",
"@unocss/reset": "^0.58.3",
"@vitejs/plugin-vue": "^5.0.2",
"@vue/test-utils": "^2.4.3",
"eslint": "^8.56.0",
"jsdom": "^23.0.1",
"jsdom": "^23.2.0",
"lint-staged": "^15.2.0",
"pnpm": "^8.12.1",
"pnpm": "^8.14.0",
"simple-git-hooks": "^2.9.0",
"taze": "^0.13.0",
"taze": "^0.13.1",
"typescript": "^5.3.3",
"unocss": "^0.58.0",
"unplugin-auto-import": "^0.17.2",
"unocss": "^0.58.3",
"unplugin-auto-import": "^0.17.3",
"unplugin-vue-components": "^0.26.0",
"vite": "^5.0.10",
"vitest": "^1.1.0",
"vue-tsc": "^1.8.26"
"vite": "^5.0.11",
"vitest": "^1.1.3",
"vue-tsc": "^1.8.27"
},
"simple-git-hooks": {
"pre-commit": "bun lint-staged && bun typecheck"
Expand Down
Loading

0 comments on commit 9d8dbbd

Please sign in to comment.