@marko/vite 4.1.12 → 4.1.14

package/dist/index.mjs

@@ -4,7 +4,6 @@ import path5 from "path";
 import crypto from "crypto";
 import anyMatch from "anymatch";
 import { pathToFileURL } from "url";
-import { transform as cjsToEsm } from "@chialab/cjs-to-esm";
 
 // src/server-entry-template.ts
 import path from "path";
@@ -54,22 +53,16 @@ function renderAssets(slot) {
         // To avoid FOUC we will hide the page until all of these modules are loaded.
         const { preload } = entry;
         if (preload) {
-          let sep = "";
-          html += \`<script\${this.___viteInjectAttrs}>((root=document.documentElement)=>{\`;
-          html += "root.style.visibility='hidden';";
-          html += "document.currentScript.remove();";
-          html += "Promise.allSettled([";
-
+          html += \`<script class=marko-vite-preload blocking=render type=module\${this.___viteInjectAttrs}>\`;
           for (const id of preload) {
-            html += \`\${sep}import(\${JSON.stringify(base + id)})\`;
-            sep = ",";
+            html += \`import \${JSON.stringify(base + id)};\`;
           }
 
-          html += "]).then(()=>{";
-          html += "root.style.visibility='';";
+          html += "document.querySelectorAll('.marko-vite-preload').forEach((el) => el.remove());";
+          html += "document.documentElement.style.visibility='';";
           html +=
-            "if(root.getAttribute('style')==='')root.removeAttribute('style')";
-          html += "})})()</script>";
+            "if(document.documentElement.getAttribute('style')==='')document.documentElement.removeAttribute('style');";
+          html += "</script><script class=marko-vite-preload>document.documentElement.style.visibility='hidden'</script>";
         }
       }`}
 
@@ -664,6 +657,7 @@ var babelCaller = {
   supportsExportNamespaceFrom: true
 };
 var registeredTagLib = false;
+var cjsToEsm;
 function markoPlugin(opts = {}) {
   let compiler;
   let { linked = true } = opts;
@@ -1088,10 +1082,20 @@ function markoPlugin(opts = {}) {
           if (!isBuild) {
             const ext = path5.extname(id);
             if (ext === ".cjs" || ext === ".js" && isCJSModule(id)) {
-              try {
-                return await cjsToEsm(source);
-              } catch {
-                return null;
+              if (cjsToEsm === void 0) {
+                try {
+                  cjsToEsm = (await import("@chialab/cjs-to-esm")).transform;
+                } catch {
+                  cjsToEsm = null;
+                  return null;
+                }
+              }
+              if (cjsToEsm) {
+                try {
+                  return await cjsToEsm(source);
+                } catch {
+                  return null;
+                }
               }
             }
           }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "4.1.12",
+  "version": "4.1.14",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {