MercuryWorkshop · Jun 26, 2024 · Jun 26, 2024 · Jun 26, 2024 · Jun 26, 2024 · Jun 26, 2024
Showing with 33 additions and 5 deletions.

+0 −3 README.md

+32 −1 src/bundle/rewriters/html.ts

+1 −1 src/bundle/rewriters/js.ts
diff --git a/README.md b/README.md
@@ -12,9 +12,6 @@ Running `pnpm dev` will build Scramjet and start a dev server on localhost:1337.
 
 
 ## TODO
-- Finish HTML rewriting
-    - `<script type="importmap"></script>` rewriting
-        - Make an array of all possible import values and pass the array onto the JS rewriter, then rewrite all the URLs inside of it
 - Finish JS rewriting 
     - Only thing rewritten currently are imports and exports
     - Check imports/exports for values contained in the `importmap` array, don't rewrite the node value if present

diff --git a/src/bundle/rewriters/html.ts b/src/bundle/rewriters/html.ts
@@ -38,8 +38,33 @@ function traverseParsedHtml(node, origin?: URL) {
     if (hasAttrib(node, "srcset")) node.attribs.srcset = rewriteSrcset(node.attribs.srcset, origin);
     if (hasAttrib(node, "imagesrcset")) node.attribs.imagesrcset = rewriteSrcset(node.attribs.imagesrcset, origin);
     if (hasAttrib(node, "style")) node.attribs.style = rewriteCss(node.attribs.style, origin);
+    //importmaps!!!
+    if (node.type === "script" && node.attribs.type === "importmap" && node.children.length > 0) {
+        const scriptContent = node.children[0].data.trim();
+
+        let imports;
+        try {
+            imports = JSON.parse(scriptContent).imports || {};
+        } catch (error) {
+            console.error("Error parsing import map:", error);
+            imports = {};
+        }
+
+        for (const key in imports) {
+            if (Object.prototype.hasOwnProperty.call(imports, key)) {
+                imports[key] = encodeUrl(imports[key], origin);
+            }
+        }
+
+        const formattedScriptContent = JSON.stringify({ imports }, null, 2); // retain formatting 
+
+        node.children[0].data = formattedScriptContent;
+
+        node.attribs.type = "importmap";
+    }
 
     if (node.name === "style" && node.children[0] !== undefined) node.children[0].data = rewriteCss(node.children[0].data, origin);
+    //leaving this alone for now
     if (node.name === "script" && /(application|text)\/javascript|importmap|undefined/.test(node.attribs.type) && node.children[0] !== undefined) node.children[0].data = rewriteJs(node.children[0].data, origin);
     if (node.name === "meta" && hasAttrib(node, "http-equiv")) {
         if (node.attribs["http-equiv"] === "content-security-policy") {
@@ -71,6 +96,12 @@ function traverseParsedHtml(node, origin?: URL) {
     return node;
 }
 
+
+function parseImportValues(scriptContent: string): string[] {
+    const importMap = JSON.parse(scriptContent);
+    return Object.values(importMap.imports || {});
+}
+
 // stole from osana lmao
 export function rewriteSrcset(srcset: string, origin?: URL) {
     const urls = srcset.split(/ [0-9]+x,? ?/g);
@@ -84,4 +115,4 @@ export function rewriteSrcset(srcset: string, origin?: URL) {
     });
 
     return rewrittenUrls.join("");
-}
+}
diff --git a/src/bundle/rewriters/js.ts b/src/bundle/rewriters/js.ts
@@ -59,4 +59,4 @@ export function rewriteJs(js: string, origin?: URL) {
 
         return js;
     }
-}
+}
-Original file line number
+Diff line change
@@ @@ -59,4 +59,4 @@ export function rewriteJs(js: string, origin?: URL) { @@
             return js;
         }
-    }
+    }