From fc19087e5c1a34d6139892f12520e7b17eda47b4 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 1 Oct 2023 12:18:17 +0200 Subject: source maps --- server/build.rs | 5 +++++ server/src/routes/mod.rs | 3 ++- server/src/routes/ui/style.rs | 14 ++++++++++---- 3 files changed, 17 insertions(+), 5 deletions(-) (limited to 'server') diff --git a/server/build.rs b/server/build.rs index 9c8be12..a8976a2 100644 --- a/server/build.rs +++ b/server/build.rs @@ -1,3 +1,8 @@ +/* + 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) 2023 metamuffin +*/ #![feature(exit_status_error)] use std::process::{Command, Stdio}; diff --git a/server/src/routes/mod.rs b/server/src/routes/mod.rs index 94a7547..a80ea4c 100644 --- a/server/src/routes/mod.rs +++ b/server/src/routes/mod.rs @@ -31,7 +31,7 @@ use ui::{ home::{r_home, r_home_unpriv}, node::r_library_node_filter, player::r_player, - style::{r_assets_font, r_assets_js, r_assets_style}, + style::{r_assets_font, r_assets_js, r_assets_js_map, r_assets_style}, }; pub mod api; @@ -87,6 +87,7 @@ pub fn build_rocket(database: Database, federation: Federation) -> Rocket r_assets_style, r_assets_font, r_assets_js, + r_assets_js_map, r_stream, r_player, r_account_login, diff --git a/server/src/routes/ui/style.rs b/server/src/routes/ui/style.rs index 171c3ce..282eaaa 100644 --- a/server/src/routes/ui/style.rs +++ b/server/src/routes/ui/style.rs @@ -30,7 +30,8 @@ macro_rules! concat_files { } fn css_bundle() -> String { - concat_files!(["../../../../web"], + concat_files!( + ["../../../../web"], "layout.css", "player.css", "nodepage.css", @@ -41,9 +42,10 @@ fn css_bundle() -> String { } fn js_bundle() -> String { - concat_files!([env!("OUT_DIR")], - "bundle.js" - ) + concat_files!([env!("OUT_DIR")], "bundle.js") +} +fn js_bundle_map() -> String { + concat_files!([env!("OUT_DIR")], "bundle.js.map") } #[get("/assets/style.css")] @@ -63,3 +65,7 @@ pub fn r_assets_font() -> (ContentType, &'static [u8]) { pub fn r_assets_js() -> (ContentType, String) { (ContentType::JavaScript, js_bundle()) } +#[get("/assets/bundle.js.map")] +pub fn r_assets_js_map() -> (ContentType, String) { + (ContentType::JSON, js_bundle_map()) +} -- cgit v1.2.3-70-g09d2