Clean up build, ship mapfile, ignore generated javascript

nshalman · nshalman · commit 15c53adc99bc · 2025-05-02T14:11:45.000Z
diff --git a/Makefile b/Makefile
@@ -53,11 +53,9 @@ ui/assets/node_modules: ui/assets/package.json ui/assets/package-lock.json
 
 ui/assets/main.css: ui/assets/main.in.css ui/assets/tailwind.config.js $(J2_FILES)
 	cd ui/assets && \
-		./node_modules/.bin/tailwindcss -m -i ./main.in.css -o ./main.css && \
-		gsed -i -e 's/\/\*\#\ sourceMappingURL=main.css.map\ \*\///' ./main.css
+		./node_modules/.bin/tailwindcss -m -i ./main.in.css -o ./main.css
 
-ui/assets/main.css.gz: ui/assets/node_modules ui/assets/main.css
-	cd ui/assets && rm -f ./main.css.gz && gzip ./main.css
+ui/assets/main.css.map: ui/assets/main.css
 
 ui/assets/main.js: ui/assets/node_modules $(JS_FILES)
 	cd ui/assets && \
@@ -66,11 +64,11 @@ ui/assets/main.js: ui/assets/node_modules $(JS_FILES)
 		--format=esm \
 		--outfile=main.js
 
-ui/assets/main.js.gz: ui/assets/main.js
-	cd ui/assets && rm -f main.js.gz && gzip ./main.js
+%.gz: %
+	gzip <$< > $@
 
 .PHONY: assets
-assets: nodejs ui/assets/main.css.gz ui/assets/main.js.gz
+assets: nodejs ui/assets/main.css.gz ui/assets/main.css.map.gz ui/assets/main.js.gz
 
 .PHONY: clean
 clean:: clean-assets
diff --git a/ui/assets/package.json b/ui/assets/package.json
@@ -7,6 +7,11 @@
   "scripts": {
     "fmt": "standard --fix *.js ../../test/mock/imgadm ../../test/mock/vmadm ../../test/mock/vminfod"
   },
+  "standard": {
+    "ignore": [
+      "main.js"
+    ]
+  },
   "dependencies": {
     "@tailwindcss/forms": "^0.5.7",
     "bunyan": "^1.8.15",
diff --git a/ui/src/endpoints/assets.rs b/ui/src/endpoints/assets.rs
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright 2024 MNX Cloud, Inc.
+ * Copyright 2025 MNX Cloud, Inc.
  */
 
 use crate::endpoints::Context;
@@ -58,3 +58,19 @@ pub async fn get_css_main(
         .body(Body::from(bytes))
         .map_err(to_internal_error)
 }
+
+#[endpoint {
+method = GET,
+path = "/css/main.css.map"
+}]
+pub async fn get_css_main_map(
+    _: RequestContext<Context>,
+) -> Result<Response<Body>, HttpError> {
+    let bytes =
+        Bytes::from_static(include_bytes!("../../assets/main.css.map.gz"));
+    Response::builder()
+        .header("Content-Encoding", "gzip")
+        .header("Content-Type", "text/css")
+        .body(Body::from(bytes))
+        .map_err(to_internal_error)
+}
diff --git a/ui/src/main.rs b/ui/src/main.rs
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright 2024 MNX Cloud, Inc.
+ * Copyright 2025 MNX Cloud, Inc.
  */
 
 #[macro_use]
@@ -123,6 +123,9 @@ async fn main() -> Result<(), String> {
     // /css/main.css
     api.register(endpoints::assets::get_css_main)?;
 
+    // /css/main.css.map
+    api.register(endpoints::assets::get_css_main_map)?;
+
     // /instances
     api.register(endpoints::instances::get_index)?;
     api.register(endpoints::instances::get_by_id)?;
