diff --git a/Cargo.lock b/Cargo.lock index a6c704308..b6f3a5668 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4185,10 +4185,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -10068,9 +10069,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -10079,13 +10080,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.90", @@ -10106,9 +10106,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -10116,9 +10116,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", @@ -10129,9 +10129,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "wasm-streams" @@ -10208,9 +10208,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index d370985c4..5cfe978f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,20 +2,24 @@ resolver = '2' members = [ './packages/app-lib', - './apps/app-playground', + './apps/app-playground', './apps/app', './apps/labrinth', - './apps/daedalus_client', - './packages/daedalus', + './apps/daedalus_client', + './packages/daedalus', +] + +exclude = [ + './packages/tartaros' ] # Optimize for speed and reduce size on release builds [profile.release] -panic = "abort" # Strip expensive panic clean-up logic +panic = "abort" # Strip expensive panic clean-up logic codegen-units = 1 # Compile crates one after another so the compiler can optimize better -lto = true # Enables link to optimizations -opt-level = "s" # Optimize for binary size -strip = true # Remove debug symbols +lto = true # Enables link to optimizations +opt-level = "s" # Optimize for binary size +strip = true # Remove debug symbols [profile.dev.package.sqlx-macros] opt-level = 3 diff --git a/apps/app-frontend/package.json b/apps/app-frontend/package.json index 3f7fe8ed2..c8afc4ba9 100644 --- a/apps/app-frontend/package.json +++ b/apps/app-frontend/package.json @@ -13,6 +13,7 @@ }, "dependencies": { "@modrinth/assets": "workspace:*", + "@pyro/tartaros": "workspace:*", "@modrinth/ui": "workspace:*", "@modrinth/utils": "workspace:*", "@sentry/vue": "^8.27.0", diff --git a/apps/app-frontend/tsconfig.app.json b/apps/app-frontend/tsconfig.app.json index 000aadc29..f7200093a 100644 --- a/apps/app-frontend/tsconfig.app.json +++ b/apps/app-frontend/tsconfig.app.json @@ -18,7 +18,8 @@ "paths": { "@/*": ["./src/*"] - } + }, + "types": ["vite/client"] }, "include": ["src"] } diff --git a/apps/frontend/nuxt.config.ts b/apps/frontend/nuxt.config.ts index 6f9418832..4c5263741 100644 --- a/apps/frontend/nuxt.config.ts +++ b/apps/frontend/nuxt.config.ts @@ -1,6 +1,7 @@ import { promises as fs } from "fs"; import { pathToFileURL } from "node:url"; import svgLoader from "vite-svg-loader"; +import wasm from "vite-plugin-wasm"; import { resolve, basename, relative } from "pathe"; import { defineNuxtConfig } from "nuxt/config"; import { $fetch } from "ofetch"; @@ -93,6 +94,7 @@ export default defineNuxtConfig({ dedupe: ["vue"], }, plugins: [ + wasm(), svgLoader({ svgoConfig: { plugins: [ @@ -357,6 +359,7 @@ export default defineNuxtConfig({ compilerOptions: { moduleResolution: "bundler", allowImportingTsExtensions: true, + types: ["vite/client"], }, }, }, diff --git a/apps/frontend/package.json b/apps/frontend/package.json index 52faf1324..4158857a8 100644 --- a/apps/frontend/package.json +++ b/apps/frontend/package.json @@ -29,6 +29,8 @@ "sass": "^1.58.0", "tailwindcss": "^3.4.4", "typescript": "^5.4.5", + "vite": "^5.4.6", + "vite-plugin-wasm": "3.3.0", "vite-svg-loader": "^5.1.0", "vue-tsc": "^2.0.24" }, @@ -39,6 +41,7 @@ "@modrinth/assets": "workspace:*", "@modrinth/ui": "workspace:*", "@modrinth/utils": "workspace:*", + "@pyro/tartaros": "workspace:*", "@pinia/nuxt": "^0.5.1", "@vintl/vintl": "^4.4.1", "@vueuse/core": "^11.1.0", diff --git a/apps/frontend/src/components/ui/servers/PanelTerminal.vue b/apps/frontend/src/components/ui/servers/PanelTerminal.vue index 29dfb8c0c..16197dccd 100644 --- a/apps/frontend/src/components/ui/servers/PanelTerminal.vue +++ b/apps/frontend/src/components/ui/servers/PanelTerminal.vue @@ -2,41 +2,11 @@
-