Merge branch 'dev' into x/gorm

pull/351/head
Michael Li 2 years ago
commit 4a0d555c01
No known key found for this signature in database

@ -22,7 +22,7 @@
"naive-ui": "^2.34.3",
"nonesir-video": "^1.0.3",
"qrcanvas-vue": "^3.0.0",
"qrcode": "^1.5.1",
"qrcode": "^1.5.3",
"unplugin-vue-components": "^0.24.1",
"v3-infinite-loading": "^1.2.2",
"vfonts": "^0.0.3",
@ -32,13 +32,13 @@
"vuex": "^4.1.0"
},
"devDependencies": {
"@tauri-apps/cli": "^1.2.3",
"@types/node": "^18.15.11",
"@tauri-apps/cli": "^1.3.0",
"@types/node": "^18.16.0",
"@types/qrcode": "^1.5.0",
"@vitejs/plugin-vue": "^4.1.0",
"@vue/compiler-sfc": "^3.2.47",
"rollup-plugin-visualizer": "^5.9.0",
"typescript": "^5.0.4",
"vite": "^4.3.1"
"vite": "^4.3.5"
}
}

File diff suppressed because it is too large Load Diff

@ -9,10 +9,10 @@ edition = "2021"
rust-version = "1.60"
[build-dependencies]
tauri-build = { version = "1.2", features = [] }
tauri-build = { version = "1.3", features = [] }
[dependencies]
tauri = { version = "1.2", features = ["api-all", "macos-private-api"] }
tauri = { version = "1.3", features = ["api-all", "macos-private-api"] }
[features]
# by default Tauri runs in production mode

@ -1,7 +1,7 @@
{
"package": {
"productName": "Paopao",
"version": "0.1.0"
"version": "0.2.0"
},
"build": {
"distDir": "../dist",
@ -63,7 +63,7 @@
{
"title": "泡泡 | 一个清新文艺的微社区",
"width": 1080,
"height": 800,
"height": 860,
"resizable": false,
"fullscreen": false,
"transparent": true,

Loading…
Cancel
Save