Merge branch 'develop' into vite
This commit is contained in:
commit
b2886b5ecb
21 changed files with 581 additions and 1305 deletions
|
|
@ -3,7 +3,7 @@
|
|||
"scripts": {
|
||||
"watch": "vite build --watch --mode development",
|
||||
"build": "vite build",
|
||||
"lint": "eslint --quiet 'src/**/*.{ts,vue}'"
|
||||
"lint": "eslint --quiet \"src/**/*.{ts,vue}\""
|
||||
},
|
||||
"resolutions": {
|
||||
"chokidar": "^3.3.1",
|
||||
|
|
@ -15,15 +15,15 @@
|
|||
"@rollup/plugin-alias": "3.1.9",
|
||||
"@rollup/plugin-json": "4.1.0",
|
||||
"@syuilo/aiscript": "0.11.1",
|
||||
"@typescript-eslint/parser": "5.18.0",
|
||||
"@typescript-eslint/parser": "5.20.0",
|
||||
"@vitejs/plugin-vue": "2.3.1",
|
||||
"@vue/compiler-sfc": "3.2.31",
|
||||
"@vue/compiler-sfc": "3.2.33",
|
||||
"abort-controller": "3.0.0",
|
||||
"autobind-decorator": "2.4.0",
|
||||
"autosize": "5.0.1",
|
||||
"autwh": "0.1.0",
|
||||
"blurhash": "1.1.5",
|
||||
"broadcast-channel": "4.10.0",
|
||||
"broadcast-channel": "4.11.0",
|
||||
"chart.js": "3.7.1",
|
||||
"chartjs-adapter-date-fns": "2.0.0",
|
||||
"chartjs-plugin-gradient": "0.2.2",
|
||||
|
|
@ -34,14 +34,13 @@
|
|||
"cssnano": "5.1.7",
|
||||
"date-fns": "2.28.0",
|
||||
"escape-regexp": "0.0.1",
|
||||
"eslint": "8.13.0",
|
||||
"eslint-plugin-vue": "8.6.0",
|
||||
"eslint": "8.14.0",
|
||||
"eslint-plugin-vue": "8.7.1",
|
||||
"eventemitter3": "4.0.7",
|
||||
"feed": "4.2.2",
|
||||
"glob": "7.2.0",
|
||||
"idb-keyval": "6.1.0",
|
||||
"insert-text-at-cursor": "0.3.0",
|
||||
"ip-cidr": "3.0.4",
|
||||
"json5": "2.2.1",
|
||||
"json5-loader": "4.0.1",
|
||||
"katex": "0.15.3",
|
||||
|
|
@ -56,7 +55,7 @@
|
|||
"portscanner": "2.2.0",
|
||||
"postcss": "8.4.12",
|
||||
"postcss-loader": "6.2.1",
|
||||
"prismjs": "1.27.0",
|
||||
"prismjs": "1.28.0",
|
||||
"private-ip": "2.3.3",
|
||||
"promise-limit": "2.7.0",
|
||||
"pug": "3.0.2",
|
||||
|
|
@ -67,7 +66,7 @@
|
|||
"reflect-metadata": "0.1.13",
|
||||
"rndstr": "1.0.0",
|
||||
"s-age": "1.1.2",
|
||||
"sass": "1.50.0",
|
||||
"sass": "1.50.1",
|
||||
"sass-loader": "12.6.0",
|
||||
"seedrandom": "3.0.5",
|
||||
"strict-event-emitter-types": "2.0.0",
|
||||
|
|
@ -76,7 +75,7 @@
|
|||
"syuilo-password-strength": "0.0.1",
|
||||
"textarea-caret": "3.1.0",
|
||||
"three": "0.139.2",
|
||||
"throttle-debounce": "4.0.0",
|
||||
"throttle-debounce": "4.0.1",
|
||||
"tinycolor2": "1.4.2",
|
||||
"ts-loader": "9.2.8",
|
||||
"tsc-alias": "1.5.0",
|
||||
|
|
@ -86,8 +85,12 @@
|
|||
"uuid": "8.3.2",
|
||||
"v-debounce": "0.1.2",
|
||||
"vanilla-tilt": "1.7.2",
|
||||
<<<<<<< HEAD
|
||||
"vite": "2.9.5",
|
||||
"vue": "3.2.31",
|
||||
=======
|
||||
"vue": "3.2.33",
|
||||
>>>>>>> develop
|
||||
"vue-loader": "17.0.0",
|
||||
"vue-prism-editor": "2.0.0-alpha.2",
|
||||
"vue-router": "4.0.14",
|
||||
|
|
@ -107,23 +110,23 @@
|
|||
"@types/is-url": "1.2.30",
|
||||
"@types/katex": "0.14.0",
|
||||
"@types/matter-js": "0.17.7",
|
||||
"@types/mocha": "9.1.0",
|
||||
"@types/mocha": "9.1.1",
|
||||
"@types/oauth": "0.9.1",
|
||||
"@types/parse5": "6.0.3",
|
||||
"@types/punycode": "2.1.0",
|
||||
"@types/qrcode": "1.4.2",
|
||||
"@types/random-seed": "0.3.3",
|
||||
"@types/seedrandom": "3.0.2",
|
||||
"@types/throttle-debounce": "2.1.0",
|
||||
"@types/throttle-debounce": "4.0.0",
|
||||
"@types/tinycolor2": "1.4.3",
|
||||
"@types/uuid": "8.3.4",
|
||||
"@types/webpack": "5.28.0",
|
||||
"@types/webpack-stream": "3.2.12",
|
||||
"@types/websocket": "1.0.5",
|
||||
"@types/ws": "8.5.3",
|
||||
"@typescript-eslint/eslint-plugin": "5.18.0",
|
||||
"@typescript-eslint/eslint-plugin": "5.20.0",
|
||||
"cross-env": "7.0.3",
|
||||
"cypress": "9.5.3",
|
||||
"cypress": "9.5.4",
|
||||
"eslint-plugin-import": "2.26.0",
|
||||
"start-server-and-test": "1.14.0"
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue