break: use '/x' script for loading unocss (esm-dev#969)

code · Dec 31, 2024 · a5b6232 · a5b6232
1 parent d172f29
commit a5b6232
Show file tree

Hide file tree

Showing 23 changed files with 405 additions and 527 deletions.
diff --git a/cli/cmd/demo/preact/index.html b/cli/cmd/demo/preact/index.html
@@ -16,6 +16,6 @@
 </head>
 <body>
   <div id="root"></div>
-  <script type="module" src="https://esm.sh/x" main="./app/main.tsx"></script>
+  <script src="https://esm.sh/x" href="./app/main.tsx"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/react/index.html b/cli/cmd/demo/react/index.html
@@ -17,6 +17,6 @@
 </head>
 <body>
   <div id="root"></div>
-  <script type="module" src="https://esm.sh/x" main="./app/main.tsx"></script>
+  <script src="https://esm.sh/x" href="./app/main.tsx"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/svelte/index.html b/cli/cmd/demo/svelte/index.html
@@ -16,6 +16,6 @@
 </head>
 <body>
   <div id="root"></div>
-  <script type="module" src="https://esm.sh/x" main="./app/main.ts"></script>
+  <script src="https://esm.sh/x" href="./app/main.ts"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/vanilla/index.html b/cli/cmd/demo/vanilla/index.html
@@ -13,6 +13,6 @@
   </script>
 </head>
 <body>
-  <script type="module" src="https://esm.sh/x" main="./app/main.ts"></script>
+  <script src="https://esm.sh/x" href="./app/main.ts"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/vue/index.html b/cli/cmd/demo/vue/index.html
@@ -16,6 +16,6 @@
 </head>
 <body>
   <div id="root"></div>
-  <script type="module" src="https://esm.sh/x" main="./app/main.ts"></script>
+  <script src="https://esm.sh/x" href="./app/main.ts"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/with-markdown/preact/index.html b/cli/cmd/demo/with-markdown/preact/index.html
@@ -16,6 +16,6 @@
 </head>
 <body>
   <div id="root"></div>
-  <script type="module" src="https://esm.sh/x" main="./app/main.tsx"></script>
+  <script src="https://esm.sh/x" href="./app/main.tsx"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/with-markdown/react/index.html b/cli/cmd/demo/with-markdown/react/index.html
@@ -17,6 +17,6 @@
 </head>
 <body>
   <div id="root"></div>
-  <script type="module" src="https://esm.sh/x" main="./app/main.tsx"></script>
+  <script src="https://esm.sh/x" href="./app/main.tsx"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/with-markdown/svelte/index.html b/cli/cmd/demo/with-markdown/svelte/index.html
@@ -16,6 +16,6 @@
 </head>
 <body>
   <div id="root"></div>
-  <script type="module" src="https://esm.sh/x" main="./app/main.ts"></script>
+  <script src="https://esm.sh/x" href="./app/main.ts"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/with-markdown/vanilla/index.html b/cli/cmd/demo/with-markdown/vanilla/index.html
@@ -15,6 +15,6 @@
   </script>
 </head>
 <body>
-  <script type="module" src="https://esm.sh/x" main="./app/main.ts"></script>
+  <script src="https://esm.sh/x" href="./app/main.ts"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/with-markdown/vue/index.html b/cli/cmd/demo/with-markdown/vue/index.html
@@ -16,6 +16,6 @@
 </head>
 <body>
   <div id="root"></div>
-  <script type="module" src="https://esm.sh/x" main="./app/main.ts"></script>
+  <script src="https://esm.sh/x" href="./app/main.ts"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/with-unocss/preact/index.html b/cli/cmd/demo/with-unocss/preact/index.html
@@ -13,12 +13,12 @@
       }
     }
   </script>
-  <script src="https://esm.sh/uno"></script>
+  <script src="https://esm.sh/x" href="./uno.css"></script>
 </head>
 <body>
   <div id="root">
     <p class="center-box font-sans text-gray-400">Loading...</p>
   </div>
-  <script type="module" src="https://esm.sh/x" main="./app/main.tsx"></script>
+  <script src="https://esm.sh/x" href="./app/main.tsx"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/with-unocss/react/index.html b/cli/cmd/demo/with-unocss/react/index.html
@@ -14,12 +14,12 @@
       }
     }
   </script>
-  <script src="https://esm.sh/uno"></script>
+  <script src="https://esm.sh/x" href="./uno.css"></script>
 </head>
 <body>
   <div id="root">
     <p class="center-box font-sans text-gray-400">Loading...</p>
   </div>
-  <script type="module" src="https://esm.sh/x" main="./app/main.tsx"></script>
+  <script src="https://esm.sh/x" href="./app/main.tsx"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/with-unocss/svelte/index.html b/cli/cmd/demo/with-unocss/svelte/index.html
@@ -13,12 +13,12 @@
       }
     }
   </script>
-  <script src="https://esm.sh/uno"></script>
+  <script src="https://esm.sh/x" href="./uno.css"></script>
 </head>
 <body>
   <div id="root">
     <p class="center-box font-sans text-gray-400">Loading...</p>
   </div>
-  <script type="module" src="https://esm.sh/x" main="./app/main.ts"></script>
+  <script src="https://esm.sh/x" href="./app/main.ts"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/with-unocss/vanilla/index.html b/cli/cmd/demo/with-unocss/vanilla/index.html
@@ -11,7 +11,7 @@
       "imports": {}
     }
   </script>
-  <script src="https://esm.sh/uno"></script>
+  <script src="https://esm.sh/x" href="./uno.css"></script>
 </head>
 <body>
   <div class="center-box relative">
@@ -25,6 +25,6 @@ <h1 class="font-sans text-5xl fw500 text-primary select-none">esm.sh</h1>
       <a class="logo i-tabler-brand-github" href="https://github.com/esm-dev/esm.sh" target="_blank" title="Github"></a>
     </div>
   </div>
-  <script type="module" src="https://esm.sh/x" main="./app/main.ts"></script>
+  <script src="https://esm.sh/x" href="./app/main.ts"></script>
 </body>
 </html>
diff --git a/cli/cmd/demo/with-unocss/vue/index.html b/cli/cmd/demo/with-unocss/vue/index.html
@@ -13,12 +13,12 @@
       }
     }
   </script>
-  <script src="https://esm.sh/uno"></script>
+  <script src="https://esm.sh/x" href="./uno.css"></script>
 </head>
 <body>
   <div id="root">
     <p class="center-box font-sans text-gray-400">Loading...</p>
   </div>
-  <script type="module" src="https://esm.sh/x" main="./app/main.ts"></script>
+  <script src="https://esm.sh/x" href="./app/main.ts"></script>
 </body>
 </html>
diff --git a/cli/cmd/internal/loader.js b/cli/cmd/internal/loader.js
@@ -5,7 +5,7 @@ const regexpVuePath = /^\/\*?vue@([~\^]?[\w\+\-\.]+)(\/|\?|&|$)/;
 const regexpSveltePath = /^\/\*?svelte@([~\^]?[\w\+\-\.]+)(\/|\?|&|$)/;
 const output = (type, data) => Deno.stdout.write(enc.encode(">>>" + type + ":" + JSON.stringify(data) + "\n"));
 
-let tsx
+let tsx;
 let unoGenerators;
 
 async function transformModule(filename, importMap, sourceCode) {
@@ -118,30 +118,18 @@ function isHttpSpecifier(specifier) {
 }
 
 async function unocss(config, content, id) {
+  const generatorId = config?.filename ?? ".";
   if (!unoGenerators) {
     unoGenerators = new Map();
   }
-  const generatorId = config?.filename ?? ".";
   let uno = unoGenerators.get(generatorId);
   if (!uno || uno.configCSS !== config?.css) {
     uno = import("npm:@esm.sh/[email protected]").then(({ init }) => init({ configCSS: config?.css }));
     uno.configCSS = config?.css;
     unoGenerators.set(generatorId, uno);
   }
   const { update, generate } = await uno;
-  if (id) {
-    if (!(await update(content, id))) {
-      return "";
-    }
-  } else {
-    if (typeof content === "object" && content !== null) {
-      for (const [id, code] of Array.isArray(content) ? content : Object.entries(content)) {
-        await update(code, id);
-      }
-    } else if (typeof content === "string") {
-      await update(content);
-    }
-  }
+  await update(content, id);
   return await generate();
 }