diff options
| author | metamuffin <metamuffin@disroot.org> | 2026-01-18 23:43:12 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2026-01-18 23:43:12 +0100 |
| commit | ed19a428cb5eef84c8cf3fed5fda3afd5fc96305 (patch) | |
| tree | 39e3167a4f8b7423a15b3a5f56e973554bdb3195 /server | |
| parent | 901dff07ed357694eb35284a58c3cc6c003c53ce (diff) | |
| download | jellything-ed19a428cb5eef84c8cf3fed5fda3afd5fc96305.tar jellything-ed19a428cb5eef84c8cf3fed5fda3afd5fc96305.tar.bz2 jellything-ed19a428cb5eef84c8cf3fed5fda3afd5fc96305.tar.zst | |
Move client scripts to build-crate
Diffstat (limited to 'server')
| -rw-r--r-- | server/Cargo.toml | 5 | ||||
| -rw-r--r-- | server/build.rs | 31 | ||||
| -rw-r--r-- | server/src/ui/style.rs | 7 |
3 files changed, 0 insertions, 43 deletions
diff --git a/server/Cargo.toml b/server/Cargo.toml index 84b978a..b790291 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -10,7 +10,6 @@ jellytranscoder = { path = "../transcoder" } jellyimport = { path = "../import" } jellycache = { path = "../cache" } jellyui = { path = "../ui" } -jellylogic = { path = "../logic" } anyhow = { workspace = true } async-recursion = "1.1.1" @@ -30,9 +29,5 @@ serde_yaml_ng = "0.10.0" tokio = { workspace = true } tokio-util = { version = "0.7.17", features = ["io", "io-util"] } -[build-dependencies] -glob = "0.3.3" - [features] bypass-auth = [] -hot-css = [] diff --git a/server/build.rs b/server/build.rs deleted file mode 100644 index 6949c9b..0000000 --- a/server/build.rs +++ /dev/null @@ -1,31 +0,0 @@ -/* - This file is part of jellything (https://codeberg.org/metamuffin/jellything) - which is licensed under the GNU Affero General Public License (version 3); see /COPYING. - Copyright (C) 2026 metamuffin <metamuffin.org> -*/ -#![feature(exit_status_error)] -use std::process::{Command, Stdio}; - -fn main() { - println!("cargo:rerun-if-changed=build.rs"); - for file in glob::glob("../web/script/**/*.ts") - .unwrap() - .map(Result::unwrap) - { - println!("cargo:rerun-if-changed={}", file.to_str().unwrap()); - } - let outpath = std::env::var("OUT_DIR").unwrap(); - // this is great :))) - println!("cargo:warning=\r\x1b[32m\x1b[1m Bundle\x1b[0m writing bundle.js ({outpath})"); - let mut proc = Command::new("esbuild") - .arg("../web/script/main.ts") - .arg("--bundle") - .arg(format!("--outfile={outpath}/bundle.js")) - .arg("--target=esnext") - .arg("--sourcemap") - .arg("--format=esm") - .stderr(Stdio::piped()) - .spawn() - .unwrap(); - proc.wait().unwrap().exit_ok().unwrap(); -} diff --git a/server/src/ui/style.rs b/server/src/ui/style.rs index 4d458c9..5226b6a 100644 --- a/server/src/ui/style.rs +++ b/server/src/ui/style.rs @@ -60,13 +60,6 @@ impl<'r, 'o: 'r, T: Responder<'r, 'o>> Responder<'r, 'o> for CachedAsset<T> { } } -fn js_bundle() -> String { - concat_files!([env!("OUT_DIR")], "bundle.js") -} -fn js_bundle_map() -> String { - concat_files!([env!("OUT_DIR")], "bundle.js.map") -} - #[get("/assets/style.css")] pub fn r_assets_style() -> CachedAsset<(ContentType, String)> { CachedAsset((ContentType::CSS, css_bundle())) |