@marko/vite 5.0.15 → 5.1.1

package/dist/index.mjs

@@ -637,13 +637,10 @@ function renderAssets(slot) {
     const slotWrittenEntriesKey = \`___viteWrittenEntries-\${slot}\`;
     const lastWrittenEntry = this[slotWrittenEntriesKey] || 0;
     const writtenEntries = (this[slotWrittenEntriesKey] = entries.length);
-
-    if(!this.___flushedMBP && slot !== "head-prepend") {
-        this.___flushedMBP = true;
-
-        html += \`<script\${this.___viteInjectAttrs}>${opts.runtimeId ? `$mbp_${opts.runtimeId}` : "$mbp"}=\${JSON.stringify(base)}</script>\`
-    }
-
+    ${opts.basePathVar ? `if (!this.___flushedMBP && slot !== "head-prepend") {
+      this.___flushedMBP = true;
+      html += \`<script\${this.___viteInjectAttrs}>${opts.runtimeId ? `$mbp_${opts.runtimeId}` : "$mbp"}=\${JSON.stringify(base)}</script>\`
+    }` : ""}
     for (let i = lastWrittenEntry; i < writtenEntries; i++) {
       let entry = entries[i];
 
@@ -805,7 +802,7 @@ function markoPlugin(opts = {}) {
   let hydrateConfig;
   const resolveVirtualDependency = (from, dep) => {
     const normalizedFrom = normalizePath(from);
-    const query = `${virtualFileQuery}&id=${Buffer.from(dep.virtualPath).toString("base64url") + path6.extname(dep.virtualPath)}`;
+    const query = `${virtualFileQuery}&id=${encodeURIComponent(dep.virtualPath)}`;
     const id = normalizedFrom + query;
     if (devServer) {
       const prev = virtualFiles.get(id);
@@ -1101,7 +1098,7 @@ function markoPlugin(opts = {}) {
           }
         }
       },
-      async buildStart(inputOptions) {
+      async options(inputOptions) {
         if (isBuild && linked && !isSSRBuild) {
           try {
             serverManifest = await store.read();
@@ -1111,12 +1108,6 @@ function markoPlugin(opts = {}) {
               entryIds.add(id);
               cachedSources.set(id, serverManifest.entrySources[entry]);
             }
-            for (const assetId of serverManifest.ssrAssetIds) {
-              this.load({
-                id: normalizePath(path6.resolve(root, assetId)),
-                resolveDependencies: false
-              }).catch(noop2);
-            }
           } catch (err) {
             this.error(
               `You must run the "ssr" build before the "browser" build.`
@@ -1127,6 +1118,16 @@ function markoPlugin(opts = {}) {
           }
         }
       },
+      async buildStart() {
+        if (isBuild && linked && !isSSRBuild) {
+          for (const assetId of serverManifest.ssrAssetIds) {
+            this.load({
+              id: normalizePath(path6.resolve(root, assetId)),
+              resolveDependencies: false
+            }).catch(noop2);
+          }
+        }
+      },
       async resolveId(importee, importer, importOpts, ssr = importOpts.ssr) {
         if (virtualFiles.has(importee)) {
           return importee;

package/package.json

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