Move most assets from /static to /assets

Allows to only serve the file that we actually use. Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
matrix-org · Nov 13, 2024 · e9914bf · e9914bf
1 parent a493acb
commit e9914bf
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 14 deletions.
diff --git a/static/css/fonts/Inter.css → assets/css/fonts/Inter.css b/static/css/fonts/Inter.css → assets/css/fonts/Inter.css
diff --git a/static/css/fonts/README.md → assets/css/fonts/README.md b/static/css/fonts/README.md → assets/css/fonts/README.md
@@ -16,7 +16,7 @@ load them. Example call:
 ```sh
 python3 download_google_fonts_css.py \
   "https://fonts.googleapis.com/css?family=Inter:300,300i,400,400i,700,700i" \
-  ../../fonts \
+  ../../../static/fonts \
   ../../fonts 
 ```
 

diff --git a/...ic/css/fonts/download_google_fonts_css.py → ...ts/css/fonts/download_google_fonts_css.py b/...ic/css/fonts/download_google_fonts_css.py → ...ts/css/fonts/download_google_fonts_css.py
diff --git a/static/css/fonts/requirements.txt → assets/css/fonts/requirements.txt b/static/css/fonts/requirements.txt → assets/css/fonts/requirements.txt
diff --git a/static/diagrams/README.md → assets/diagrams/README.md b/static/diagrams/README.md → assets/diagrams/README.md
diff --git a/static/diagrams/membership.drawio → assets/diagrams/membership.drawio b/static/diagrams/membership.drawio → assets/diagrams/membership.drawio
diff --git a/static/diagrams/membership.png → assets/diagrams/membership.png b/static/diagrams/membership.png → assets/diagrams/membership.png
diff --git a/static/diagrams/threaded-dag-threads.drawio → assets/diagrams/threaded-dag-threads.drawio b/static/diagrams/threaded-dag-threads.drawio → assets/diagrams/threaded-dag-threads.drawio
diff --git a/static/diagrams/threaded-dag-threads.png → assets/diagrams/threaded-dag-threads.png b/static/diagrams/threaded-dag-threads.png → assets/diagrams/threaded-dag-threads.png
diff --git a/static/diagrams/threaded-dag.drawio → assets/diagrams/threaded-dag.drawio b/static/diagrams/threaded-dag.drawio → assets/diagrams/threaded-dag.drawio
diff --git a/static/diagrams/threaded-dag.png → assets/diagrams/threaded-dag.png b/static/diagrams/threaded-dag.png → assets/diagrams/threaded-dag.png
diff --git a/static/js/toc.js → assets/js/toc.js b/static/js/toc.js → assets/js/toc.js
diff --git a/config.toml b/config.toml
@@ -134,15 +134,6 @@ sidebar_menu_compact = true
   [[module.imports]]
     path = "github.com/matrix-org/docsy"
     disable = false
-  # Mounting /assets and /static as assets directories helps Hugo to generate
-  # the correct URL.
-  [[module.mounts]]
-    source = 'assets'
-    target = 'assets'
-  [[module.mounts]]
-    source = 'static'
-    target = 'assets'
-
 
 # custom output formats
 

diff --git a/layouts/partials/hooks/body-end.html b/layouts/partials/hooks/body-end.html
@@ -13,5 +13,5 @@
   in the document.
 
 */}}
-
-<script defer language="javascript" type="text/javascript"  src="{{ "js/toc.js" | urlize | relURL }}"></script>
+{{ $toc := resources.Get "js/toc.js" -}}
+<script defer language="javascript" type="text/javascript"  src="{{ $toc.RelPermalink }}"></script>
diff --git a/layouts/partials/hooks/head-end.html b/layouts/partials/hooks/head-end.html
@@ -13,5 +13,6 @@
  Google Fonts manually via a script:
  https://github.com/matrix-org/matrix-spec/tree/main/static/css/fonts
 */}}
-<link rel="preload" href="{{ "css/fonts/Inter.css" | relURL }}" as="style">
-<link rel="stylesheet" href="{{ "css/fonts/Inter.css" | relURL }}">
+{{ $inter := resources.Get "css/fonts/Inter.css" -}}
+<link rel="preload" href="{{ $inter.RelPermalink }}" as="style">
+<link rel="stylesheet" href="{{ $inter.RelPermalink }}">