@marko/vite 5.1.2 → 5.1.4

package/dist/index.mjs

@@ -651,16 +651,18 @@ function renderAssets(slot) {
         // To avoid FOUC we will hide the page until all of these modules are loaded.
         const { preload } = entry;
         if (preload) {
-          html += \`<script class=marko-vite-preload async blocking=render type=module\${this.___viteInjectAttrs}>\`;
+          html += \`<script marko-vite-preload async blocking=render type=module\${this.___viteInjectAttrs}>\`;
+          html+= "await Promise.allSettled([";
+
           for (const id of preload) {
-            html += \`import \${JSON.stringify(base + id)};\`;
+            html += \`import(\${JSON.stringify(base + id)}),\`;
           }
 
-          html += "document.querySelectorAll('.marko-vite-preload').forEach((el) => el.remove());";
+          html += "]);";
           html += "document.documentElement.style.visibility='';";
-          html +=
-            "if(document.documentElement.getAttribute('style')==='')document.documentElement.removeAttribute('style');";
-          html += \`</script><script class=marko-vite-preload\${this.___viteInjectAttrs}>document.documentElement.style.visibility='hidden'</script>\`;
+          html += "if(document.documentElement.getAttribute('style')==='')document.documentElement.removeAttribute('style');";
+          html += "document.querySelectorAll('[marko-vite-preload]').forEach((el) => el.remove());";
+          html += \`</script><script marko-vite-preload\${this.___viteInjectAttrs}>document.documentElement.style.visibility='hidden'</script>\`;
         }
       }`}
 
@@ -904,16 +906,31 @@ function markoPlugin(opts = {}) {
         if (linked) {
           baseConfig.markoViteLinked = linked;
         }
+        const getCJSInteropBabelConfig = () => ({
+          ...baseConfig.babelConfig,
+          plugins: (baseConfig.babelConfig.plugins || []).concat(
+            plugin({
+              filter: isBuild || isTest ? void 0 : (path7) => !/^\./.test(path7)
+            })
+          )
+        });
         ssrConfig = {
           ...baseConfig,
           resolveVirtualDependency,
           output: "html"
         };
+        ssrCjsConfig = {
+          ...ssrConfig,
+          babelConfig: getCJSInteropBabelConfig()
+        };
         domConfig = {
           ...baseConfig,
           resolveVirtualDependency,
           output: "dom"
         };
+        if (isTest) {
+          domConfig.babelConfig = getCJSInteropBabelConfig();
+        }
         hydrateConfig = {
           ...baseConfig,
           resolveVirtualDependency,
@@ -1037,17 +1054,6 @@ function markoPlugin(opts = {}) {
       },
       configResolved(config) {
         basePath = config.base;
-        ssrCjsConfig = {
-          ...ssrConfig,
-          babelConfig: {
-            ...ssrConfig.babelConfig,
-            plugins: (ssrConfig.babelConfig.plugins || []).concat(
-              plugin({
-                filter: isBuild ? void 0 : (path7) => !/^\./.test(path7)
-              })
-            )
-          }
-        };
         getMarkoAssetFns = void 0;
         for (const plugin2 of config.plugins) {
           const fn = plugin2.api?.getMarkoAssetCodeForEntry;
@@ -1061,7 +1067,7 @@ function markoPlugin(opts = {}) {
         }
       },
       configureServer(_server) {
-        ssrConfig.hot = domConfig.hot = true;
+        ssrConfig.hot = ssrCjsConfig.hot = domConfig.hot = true;
         devServer = _server;
         devServer.watcher.on("all", (type, originalFileName) => {
           const fileName = normalizePath(originalFileName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/vite",
-  "version": "5.1.2",
+  "version": "5.1.4",
   "description": "A Marko plugin for Vite",
   "keywords": [
     "loader",