From 2bd94667ed5708fea216e5aa097adfe1f1312190 Mon Sep 17 00:00:00 2001
From: dcode <dcode@dcode.io>
Date: Tue, 25 Oct 2022 14:17:45 +0200
Subject: [PATCH 1/2] Expose import maps in web template

---
 scripts/build-web.js | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/scripts/build-web.js b/scripts/build-web.js
index fded04b86b..698156236c 100644
--- a/scripts/build-web.js
+++ b/scripts/build-web.js
@@ -11,20 +11,26 @@ const mainVersion = pkg.version;
 const binaryenVersion = pkg.dependencies.binaryen.version;
 const longVersion = pkg.dependencies.long.version;
 
-const distUrl = mainVersion === "0.0.0" ? `../dist/` : `https://cdn.jsdelivr.net/npm/assemblyscript@${mainVersion}/dist/`;
+const distUrl = mainVersion === "0.0.0" ? `./` : `https://cdn.jsdelivr.net/npm/assemblyscript@${mainVersion}/dist/`;
 const binaryenUrl = `https://cdn.jsdelivr.net/npm/binaryen@${binaryenVersion}/index.js`;
 const longUrl = `https://cdn.jsdelivr.net/npm/long@${longVersion}/index.js`;
-
-fs.writeFileSync(path.join(dirname, "..", "dist", "web.html"), `<script async src="https://cdn.jsdelivr.net/npm/es-module-shims@1.3.2/dist/es-module-shims.js"></script>
-<script type="importmap">
-{
+const imports = {
   "imports": {
-    "binaryen": ${JSON.stringify(binaryenUrl)},
-    "long": ${JSON.stringify(longUrl)},
-    "assemblyscript": ${JSON.stringify(distUrl + "assemblyscript.js")},
-    "assemblyscript/asc": ${JSON.stringify(distUrl + "asc.js")}
+    "assemblyscript": `${distUrl}assemblyscript.js`,
+    "assemblyscript/asc": `${distUrl}asc.js`,
+    "binaryen": binaryenUrl,
+    "long": longUrl
   }
-}
+};
+
+fs.writeFileSync(path.join(dirname, "..", "dist", "web.json"), `${JSON.stringify(imports, null, 2)}
+`);
+fs.writeFileSync(path.join(dirname, "..", "dist", "web.js"), `export const importMap = ${JSON.stringify(imports, null, 2)}
+export default importMap;
+`);
+fs.writeFileSync(path.join(dirname, "..", "dist", "web.html"), `<script async src="https://cdn.jsdelivr.net/npm/es-module-shims@1/dist/es-module-shims.js"></script>
+<script type="importmap">
+${JSON.stringify(imports, null, 2)}
 </script>
 <script type="module">
 import asc from "assemblyscript/asc";

From 77b5a27133c471779847fd18c1b5c2ad3a7e1c3f Mon Sep 17 00:00:00 2001
From: dcode <dcode@dcode.io>
Date: Tue, 25 Oct 2022 14:23:04 +0200
Subject: [PATCH 2/2] name these `importmap`

---
 scripts/build-web.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/build-web.js b/scripts/build-web.js
index 698156236c..fe3111b851 100644
--- a/scripts/build-web.js
+++ b/scripts/build-web.js
@@ -14,7 +14,7 @@ const longVersion = pkg.dependencies.long.version;
 const distUrl = mainVersion === "0.0.0" ? `./` : `https://cdn.jsdelivr.net/npm/assemblyscript@${mainVersion}/dist/`;
 const binaryenUrl = `https://cdn.jsdelivr.net/npm/binaryen@${binaryenVersion}/index.js`;
 const longUrl = `https://cdn.jsdelivr.net/npm/long@${longVersion}/index.js`;
-const imports = {
+const importmap = {
   "imports": {
     "assemblyscript": `${distUrl}assemblyscript.js`,
     "assemblyscript/asc": `${distUrl}asc.js`,
@@ -23,14 +23,14 @@ const imports = {
   }
 };
 
-fs.writeFileSync(path.join(dirname, "..", "dist", "web.json"), `${JSON.stringify(imports, null, 2)}
+fs.writeFileSync(path.join(dirname, "..", "dist", "importmap.json"), `${JSON.stringify(importmap, null, 2)}
 `);
-fs.writeFileSync(path.join(dirname, "..", "dist", "web.js"), `export const importMap = ${JSON.stringify(imports, null, 2)}
-export default importMap;
+fs.writeFileSync(path.join(dirname, "..", "dist", "importmap.js"), `export const importmap = ${JSON.stringify(importmap, null, 2)}
+export default importmap;
 `);
 fs.writeFileSync(path.join(dirname, "..", "dist", "web.html"), `<script async src="https://cdn.jsdelivr.net/npm/es-module-shims@1/dist/es-module-shims.js"></script>
 <script type="importmap">
-${JSON.stringify(imports, null, 2)}
+${JSON.stringify(importmap, null, 2)}
 </script>
 <script type="module">
 import asc from "assemblyscript/asc";