Skip to content

Commit

Permalink
Update packages & update markdown
Browse files Browse the repository at this point in the history
  • Loading branch information
Berrysoft committed Sep 15, 2024
1 parent c8ce35d commit 405f3fa
Show file tree
Hide file tree
Showing 24 changed files with 1,836 additions and 1,315 deletions.
1,539 changes: 866 additions & 673 deletions bins/Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bins/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ ayaka-runtime = { path = "../utils/ayaka-runtime" }
ayaka-model = { path = "../utils/ayaka-model" }
tokio = { version = "1" }
clap = { version = "4" }
flexi_logger = { version = "0.27", default-features = false, features = [
flexi_logger = { version = "0.29", default-features = false, features = [
"colors",
] }
1,116 changes: 666 additions & 450 deletions bins/ayaka-gui/package-lock.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions bins/ayaka-gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,32 @@
"tauri": "tauri"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/vue-fontawesome": "^3.0.6",
"@tauri-apps/api": "^2.0.0-beta.11",
"@tauri-apps/plugin-os": "^2.0.0-beta.3",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@fortawesome/vue-fontawesome": "^3.0.8",
"@tauri-apps/api": "^2.0.0-rc.4",
"@tauri-apps/plugin-os": "^2.0.0-rc.1",
"async-mutex": "^0.5.0",
"bootstrap": "^5.3.3",
"bootstrap-dark-5": "^1.1.3",
"lodash": "^4.17.21",
"pixi-live2d-display": "^0.5.0-beta",
"pixi.js": "^7.4.2",
"timers-promises": "^1.0.1",
"vue": "^3.4.21",
"vue-i18n": "^9.10.2",
"vue-router": "^4.3.0"
"vue": "^3.5.5",
"vue-i18n": "10.0.1",
"vue-router": "^4.4.5"
},
"devDependencies": {
"@types/bootstrap": "^5.2.10",
"@types/lodash": "^4.17.0",
"@types/node": "^20.12.2",
"@vitejs/plugin-vue": "^5.0.4",
"@types/lodash": "^4.17.7",
"@types/node": "^22.5.5",
"@vitejs/plugin-vue": "^5.1.3",
"@vue/tsconfig": "^0.5.1",
"internal-ip": "^7.0.0",
"internal-ip": "^8.0.0",
"process": "^0.11.10",
"typescript": "~5.4.5",
"vite": "^5.2.7",
"vue-tsc": "^2.0.19"
"typescript": "~5.6.2",
"vite": "^5.4.5",
"vue-tsc": "^2.1.6"
}
}
}
14 changes: 7 additions & 7 deletions bins/ayaka-gui/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ name = "ayaka_gui_lib"
crate-type = ["staticlib", "cdylib", "rlib"]

[build-dependencies]
tauri-build = { version = "2.0.0-beta.15", features = [] }
tauri-build = { version = "2.0.0-rc.10", features = [] }

[dependencies]
ayaka-plugin-wasmi = { workspace = true }
ayaka-model = { workspace = true }
serde_json = "1"
serde = { version = "1", features = ["derive"] }
tauri = { version = "2.0.0-beta.19", features = [] }
tauri-plugin-os = "2.0.0-beta.4"
tauri = { version = "2.0.0-rc.11", features = [] }
tauri-plugin-os = "2.0.0-rc.1"
clap = { workspace = true, features = ["derive"] }
tokio = { workspace = true, features = ["sync"] }
axum = { version = "0.7", default-features = false, features = [
Expand All @@ -33,18 +33,18 @@ axum-extra = { version = "0.9", features = ["typed-header"] }
tower-http = { version = "0.5", features = ["cors", "trace"] }
headers = "0.4"
mime_guess = "2"
vfs-tar = { version = "0.4", features = ["mmap"] }
vfs-tar = { version = "0.5", features = ["mmap"] }

[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
tauri-plugin-dialog = "2.0.0-beta.7"
tauri-plugin-window-state = "2.0.0-beta.7"
tauri-plugin-dialog = "2.0.0-rc.6"
tauri-plugin-window-state = "2.0.0-rc.3"
flexi_logger = { workspace = true }

[target.'cfg(target_os = "ios")'.dependencies]
file-picker-ios = { git = "https://github.com/Berrysoft/file-picker-ios.git" }

[target.'cfg(target_os = "android")'.dependencies]
android_logger = "0.13"
android_logger = "0.14"
file-picker-android = { git = "https://github.com/Berrysoft/file-picker-android.git" }

[features]
Expand Down
12 changes: 6 additions & 6 deletions bins/ayaka-gui/src-tauri/capabilities/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"main"
],
"permissions": [
"app:default",
"app:allow-name",
"event:default",
"core:app:default",
"core:app:allow-name",
"core:event:default",
"os:allow-platform",
"window:default",
"window:allow-close",
"window:allow-destroy"
"core:window:default",
"core:window:allow-close",
"core:window:allow-destroy"
]
}
4 changes: 2 additions & 2 deletions bins/ayaka-gui/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use std::{
};
use tauri::{
async_runtime::RwLock, command, utils::config::FrontendDist, webview::Url, App, AppHandle,
Manager, State, WebviewWindow,
Emitter, Manager, State, WebviewWindow,
};
use vfs_tar::TarFS;

Expand Down Expand Up @@ -103,7 +103,7 @@ async fn show_pick_files(handle: &AppHandle, _window: &WebviewWindow) -> Result<
.unwrap_or_default()
.into_iter()
.map(|p| {
TarFS::new_mmap(p.path)
TarFS::new_mmap(p.into_path()?)
.map(VfsPath::from)
.map_err(anyhow::Error::from)
})
Expand Down
6 changes: 3 additions & 3 deletions bins/ayaka-gui/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import 'bootstrap-dark-5/dist/css/bootstrap-dark.min.css'
import { getCurrent } from "@tauri-apps/api/window"
import { getCurrentWindow } from "@tauri-apps/api/window"
import { init } from './interop'
import { Modal } from 'bootstrap'
</script>
Expand All @@ -9,15 +9,15 @@ import { Modal } from 'bootstrap'
export default {
async created() {
await init()
getCurrent().listen("tauri://close-requested", this.quit)
getCurrentWindow().listen("tauri://close-requested", this.quit)
},
methods: {
quit() {
let modal = new Modal(this.$refs.quitModal as HTMLElement)
modal.show()
},
async quit_direct() {
await getCurrent().destroy()
await getCurrentWindow().destroy()
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion bins/ayaka-latex/src/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ impl LaTeXWriter {
.write_all(format!("[{}]", attr.as_ref()).as_bytes())
.await?;
}
self.file.write_all(&[b'\n']).await?;
self.file.write_all(b"\n").await?;
Ok(self)
}

Expand Down
1 change: 1 addition & 0 deletions examples/Styles/paras/en/md.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
- '**Bold**'
- '`code`'
- Mixed normal *italic* **bold** `code`.
- 'Math: $E=mc^2$'
next: tex
Loading

0 comments on commit 405f3fa

Please sign in to comment.