inline all js/css files

r-universe-org · Aug 27, 2024 · 5d75e51 · 5d75e51
1 parent 4b7d06f
commit 5d75e51
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 123 deletions.
diff --git a/static/search.css b/static/search.css
diff --git a/static/apis.js → views/apis.js b/static/apis.js → views/apis.js
diff --git a/views/apis.pug b/views/apis.pug
@@ -88,4 +88,5 @@ block content
                 option #{x.Package}
 
 block after_scripts
-  script(src='apis.js?nocache=2')
+  script
+    include apis.js
diff --git a/static/badges.js → views/badges.js b/static/badges.js → views/badges.js
diff --git a/views/badges.pug b/views/badges.pug
@@ -28,4 +28,5 @@ block content
                   i.fa-brands.fa-markdown.fa-xl.grow-on-over
 
 block after_scripts
-  script(src='badges.js')
+  script
+    include badges.js
diff --git a/static/builds.js → views/builds.js b/static/builds.js → views/builds.js
diff --git a/views/builds.pug b/views/builds.pug
@@ -107,4 +107,5 @@ block after_scripts
   script(src='https://cdnjs.cloudflare.com/ajax/libs/chartjs-plugin-annotation/3.0.1/chartjs-plugin-annotation.min.js')
   script(src='https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.30.1/moment.min.js')
   script(src='https://cdnjs.cloudflare.com/ajax/libs/chartjs-adapter-moment/1.0.1/chartjs-adapter-moment.min.js')
-  script(src='builds.js')
+  script
+    include builds.js
diff --git a/static/contributors.js → views/contributors.js b/static/contributors.js → views/contributors.js
diff --git a/views/contributors.pug b/views/contributors.pug
@@ -11,4 +11,5 @@ block content
 
 block after_scripts
   script(src='https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.1/chart.umd.js')
-  script(src='contributors.js')
+  script
+    include contributors.js
diff --git a/static/galaxy.css → views/global/galaxy.css b/static/galaxy.css → views/global/galaxy.css
diff --git a/views/global/galaxy.pug b/views/global/galaxy.pug
@@ -3,7 +3,8 @@ head
   meta(charset='utf-8')
   meta(name='viewport' content='width=device-width, initial-scale=1, shrink-to-fit=no')
   link(rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.3.2/css/bootstrap.min.css')
-  link(rel='stylesheet' href='/galaxy.css')
+  style
+    include galaxy.css
   title R-universe: personal package repositories for R!
 
 img#runiverselogo(src='/logo-big.svg')

diff --git a/views/includes/default-scripts.pug b/views/includes/default-scripts.pug
@@ -2,4 +2,6 @@ script(src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.slim.min.
 script(src='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.3.2/js/bootstrap.bundle.min.js')
 script(src='https://cdnjs.cloudflare.com/ajax/libs/masonry/4.2.2/masonry.pkgd.min.js')
 if node_env == 'production'
-  script(src='https://r-universe.dev/matomo.js' async)
+  script
+    include matomo.js
+
diff --git a/static/matomo.js → views/includes/matomo.js b/static/matomo.js → views/includes/matomo.js
diff --git a/static/layout.css → views/layout.css b/static/layout.css → views/layout.css
diff --git a/views/layout.pug b/views/layout.pug
@@ -11,7 +11,8 @@ html
     link(rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.3.2/css/bootstrap.min.css')
     link(rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css')
     block after_head
-    link(rel='stylesheet' href='/layout.css?nocache=1')
+    style
+      include layout.css
   body
     header.mb-3.border-bottom.bg-body-tertiary
       .container(style='max-width: 1440px')
@@ -143,5 +144,6 @@ html
       | window.universe="#{universe}"
     block before_scripts
     include includes/default-scripts.pug
-    script(src='/sidebar.js?nocache=2')
+    script
+      include sidebar.js
     block after_scripts
diff --git a/static/packages.js → views/packages.js b/static/packages.js → views/packages.js
diff --git a/views/packages.pug b/views/packages.pug
@@ -42,4 +42,5 @@ block content
 
 block after_scripts
   script(src='https://cdnjs.cloudflare.com/ajax/libs/masonry/4.2.2/masonry.pkgd.min.js')
-  script(src='packages.js')
+  script
+    include packages.js
diff --git a/static/pkginfo.js → views/pkginfo.js b/static/pkginfo.js → views/pkginfo.js
diff --git a/views/pkginfo.pug b/views/pkginfo.pug
@@ -400,4 +400,5 @@ block after_scripts
   script(src='https://cdnjs.cloudflare.com/ajax/libs/chartjs-plugin-annotation/3.0.1/chartjs-plugin-annotation.min.js')
   script(src='https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.30.1/moment.min.js')
   script(src='https://cdnjs.cloudflare.com/ajax/libs/chartjs-adapter-moment/1.0.1/chartjs-adapter-moment.min.js')
-  script(src='pkginfo.js?nocache=3')
+  script
+    include pkginfo.js
diff --git a/static/sidebar.js → views/sidebar.js b/static/sidebar.js → views/sidebar.js