Merge pull request #60 from DSACMS/natalia/production_fixes

Re-added Vite & Changed /metrics config
DSACMS · Nov 27, 2023 · 56747a7 · 56747a7
2 parents c50e122 + 858ed44
commit 56747a7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 33 deletions.
diff --git a/app/.eleventy.js b/app/.eleventy.js
@@ -1,6 +1,7 @@
 const fs = require("fs")
 const path = require("path")
 const Image = require("@11ty/eleventy-img")
+const EleventyVitePlugin = require("@11ty/eleventy-plugin-vite");
 const lucideIcons = require("@grimlink/eleventy-plugin-lucide-icons");
 const { baseurl } = require("./site/_data/site");
 require("dotenv").config()
@@ -78,6 +79,7 @@ module.exports = function (eleventyConfig) {
   });
 
   eleventyConfig.setLiquidOptions({ outputEscape: "escape" })
+  eleventyConfig.addPlugin(EleventyVitePlugin)
   eleventyConfig.addPlugin(lucideIcons, {
     "class": "custom-class",
     "width": 17,
@@ -86,8 +88,6 @@ module.exports = function (eleventyConfig) {
     "stroke-width": 2
 });
 
-  const pathPrefix = process.env.NODE_ENV == "production" ? "/metrics" : "/"
-
   return {
     dir: {
       input: "site/",
@@ -97,6 +97,5 @@ module.exports = function (eleventyConfig) {
     },
     templateFormats: ["html", "md", "liquid", "11ty.js"],
     passthroughFileCopy: true,
-    pathPrefix
   }
 }
diff --git a/app/postcss.config.js b/app/postcss.config.js
diff --git a/app/site/_data/site.js b/app/site/_data/site.js
@@ -3,7 +3,7 @@ const production = process.env.NODE_ENV === "production"
 const host = production ? process.env.SITE_HOST : "http://0.0.0.0:8080"
 
 // For modifying the <base> tag
-const baseurl = production ? "" : ""
+const baseurl = production ? "/metrics" : ""
 
 module.exports = {
   name: "Open Source at CMS",

diff --git a/app/site/_includes/assets.liquid b/app/site/_includes/assets.liquid
@@ -28,5 +28,5 @@
     window.addEventListener('load', verifyLoaded, true)
   })()
 </script>
-<link rel="stylesheet" href="{{ site.url }}/css/style.css"/>
+<link rel="stylesheet" href="/css/style.css"/>
 <script type="module" src="/assets/js/index.js"></script>