Handle base URL in fonts and allow changing it

Author: Kobzol

src/assets.rs

@@ -1,3 +1,4 @@
+use crate::BaseUrl;
 use crate::fs::ensure_directory;
 use anyhow::Context;
 use sass_rs::{Options, compile_file};
@@ -22,7 +23,12 @@ fn relative_url(path: &Path, out_dir: &Path) -> anyhow::Result<String> {
 }
 
 /// Compiles SASS file, stores it in `out_dir` and returns the relative URL to it.
-fn compile_sass(root_dir: &Path, out_dir: &Path, filename: &str) -> anyhow::Result<String> {
+fn compile_sass(
+    root_dir: &Path,
+    out_dir: &Path,
+    filename: &str,
+    base_url: &str,
+) -> anyhow::Result<String> {
     let scss_file = root_dir
         .join("src")
         .join("styles")
@@ -31,6 +37,7 @@ fn compile_sass(root_dir: &Path, out_dir: &Path, filename: &str) -> anyhow::Resu
     let css = compile_file(&scss_file, Options::default())
         .map_err(|e| anyhow::anyhow!("{e}"))
         .with_context(|| anyhow::anyhow!("couldn't compile sass: {}", scss_file.display()))?;
+    let css = css.replace("$BASEURL", base_url);
 
     let css_sha = format!("{filename}_{}", hash_string(&css));
     let out_css_path = out_dir
@@ -41,7 +48,7 @@ fn compile_sass(root_dir: &Path, out_dir: &Path, filename: &str) -> anyhow::Resu
     write_file(&out_css_path, &css.into_bytes())
         .with_context(|| anyhow::anyhow!("couldn't write css file: {}", out_css_path.display()))?;
 
-    Ok(relative_url(&out_css_path, &out_dir)?)
+    relative_url(&out_css_path, out_dir)
 }
 
 fn concat_files(
@@ -71,7 +78,7 @@ fn concat_files(
     write_file(Path::new(&out_file_path), concatted.as_bytes())
         .with_context(|| anyhow::anyhow!("couldn't write vendor {extension}"))?;
 
-    Ok(relative_url(&out_file_path, &out_dir)?)
+    relative_url(&out_file_path, out_dir)
 }
 
 fn concat_vendor_css(root_dir: &Path, out_dir: &Path, files: Vec<&str>) -> anyhow::Result<String> {
@@ -105,21 +112,21 @@ pub struct AssetFiles {
 pub fn compile_assets(
     root_dir: &Path,
     out_dir: &Path,
-    baseurl: &str,
+    base_url: &str,
 ) -> anyhow::Result<AssetFiles> {
-    let app_css_file = compile_sass(root_dir, out_dir, "app")?;
-    let fonts_css_file = compile_sass(root_dir, out_dir, "fonts")?;
+    let app_css_file = compile_sass(root_dir, out_dir, "app", base_url)?;
+    let fonts_css_file = compile_sass(root_dir, out_dir, "fonts", base_url)?;
     let vendor_css_file = concat_vendor_css(root_dir, out_dir, vec!["tachyons"])?;
     let app_js_file = concat_app_js(root_dir, out_dir, vec!["tools-install"])?;
 
     Ok(AssetFiles {
         css: CSSFiles {
-            app: format!("{baseurl}{app_css_file}"),
-            fonts: format!("{baseurl}{fonts_css_file}"),
-            vendor: format!("{baseurl}{vendor_css_file}"),
+            app: format!("{base_url}/{app_css_file}"),
+            fonts: format!("{base_url}/{fonts_css_file}"),
+            vendor: format!("{base_url}/{vendor_css_file}"),
         },
         js: JSFiles {
-            app: format!("{baseurl}{app_js_file}"),
+            app: format!("{base_url}/{app_js_file}"),
         },
     })
 }

src/i18n.rs

@@ -5,6 +5,7 @@ use handlebars::{
 use serde::Serialize;
 use std::{collections::HashSet, sync::LazyLock};
 
+use crate::ENGLISH;
 use handlebars_fluent::{
     fluent_bundle::{FluentResource, FluentValue, concurrent::FluentBundle},
     loader::SimpleLoader,
@@ -215,7 +216,7 @@ impl HelperDef for TeamHelper {
         let team_name = team.as_json()["name"].as_str().unwrap();
 
         // English uses the team data directly, so that it gets autoupdated
-        if lang == "en-US" {
+        if lang == ENGLISH {
             let english = param.english(team.as_json());
             out.write(english)
                 .map_err(|e| RenderErrorReason::NestedError(Box::new(e)))?;

src/main.rs

@@ -1,8 +1,10 @@
+#![allow(unused)]
+
 use crate::assets::compile_assets;
 use crate::i18n::{TeamHelper, create_loader};
 use crate::redirect::create_redirects;
 use crate::render::{RenderCtx, render_directory, render_governance, render_index};
-use crate::rust_version::RustVersion;
+use crate::rust_version::fetch_rust_version;
 use crate::teams::{encode_zulip_stream, load_rust_teams};
 use anyhow::Context;
 use handlebars::{DirectorySourceOptions, Handlebars};
@@ -24,11 +26,24 @@ const ZULIP_DOMAIN: &str = "https://rust-lang.zulipchat.com";
 static LAYOUT: &str = "components/layout";
 static ENGLISH: &str = "en-US";
 
-fn baseurl(lang: &str) -> String {
-    if lang == "en-US" {
-        String::new()
-    } else {
-        format!("/{lang}")
+/// Relative base url from the root of the website
+/// `url` can be e.g. `` or `/foo-bar`.
+struct BaseUrl {
+    url: String,
+}
+
+impl BaseUrl {
+    fn new(url: &str) -> Self {
+        let url = url.strip_suffix('/').unwrap_or(url).to_string();
+        Self { url }
+    }
+
+    fn resolve(&self, lang: &str) -> String {
+        if lang == ENGLISH {
+            self.url.clone()
+        } else {
+            format!("{}/{lang}", self.url)
+        }
     }
 }
 
@@ -52,6 +67,9 @@ fn setup_handlebars() -> anyhow::Result<Handlebars<'static>> {
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
+    let base_url = std::env::var("BASE_URL").unwrap_or_else(|_| "".to_string());
+    let base_url = BaseUrl::new(&base_url);
+
     let rust_version = fetch_rust_version().await?;
     let teams = load_rust_teams().await?;
 
@@ -61,7 +79,7 @@ async fn main() -> anyhow::Result<()> {
     std::fs::create_dir_all(&output_dir)?;
 
     let root_dir = Path::new(".");
-    let assets = compile_assets(root_dir, &output_dir, "/")?;
+    let assets = compile_assets(root_dir, &output_dir, &base_url.resolve(ENGLISH))?;
     let handlebars = setup_handlebars()?;
 
     let ctx = RenderCtx {
@@ -72,6 +90,7 @@ async fn main() -> anyhow::Result<()> {
         teams,
         handlebars,
         output_dir,
+        base_url,
     };
     ctx.copy_asset_dir("static", "static")?;
     ctx.copy_asset_file(

src/render.rs

@@ -3,7 +3,7 @@ use crate::fs::{copy_dir_all, ensure_directory};
 use crate::i18n::{EXPLICIT_LOCALE_INFO, LocaleInfo, SUPPORTED_LOCALES};
 use crate::rust_version::RustVersion;
 use crate::teams::{PageData, RustTeams};
-use crate::{ENGLISH, LAYOUT, PONTOON_ENABLED, baseurl};
+use crate::{BaseUrl, ENGLISH, LAYOUT, PONTOON_ENABLED};
 use anyhow::Context;
 use handlebars::Handlebars;
 use handlebars_fluent::{Loader, SimpleLoader};
@@ -72,6 +72,7 @@ pub struct RenderCtx<'a> {
     pub rust_version: RustVersion,
     pub teams: RustTeams,
     pub assets: AssetFiles,
+    pub base_url: BaseUrl,
 }
 
 impl<'a> RenderCtx<'a> {
@@ -95,8 +96,8 @@ impl<'a> RenderCtx<'a> {
                 parent: LAYOUT,
                 is_landing: false,
                 data,
-                baseurl: baseurl(&lang),
-                is_translation: lang != "en-US",
+                baseurl: self.base_url.resolve(lang),
+                is_translation: lang != ENGLISH,
                 lang: lang.to_string(),
                 pontoon_enabled: PONTOON_ENABLED,
                 assets: &self.assets,

src/styles/fonts.scss

@@ -119,7 +119,7 @@ $format-names: (
 @function urls($filename, $range, $extensions) {
   $urls: ();
   @each $extension in $extensions {
-    $url: url("/static/fonts/#{$extension}/#{$filename}.#{$range}.#{$extension}");
+    $url: url("$BASEURL/static/fonts/#{$extension}/#{$filename}.#{$range}.#{$extension}");
     $format: format(map-get($format-names, $extension));
 
     $urls: append($urls, $url $format, comma);

static/scripts/languages.js

@@ -21,3 +21,4 @@ function langChange() {
 
 nav_dropdown.onchange = langChange;
 footer_dropdown.onchange = langChange;
+// TODO: language redirect