@marko/vite 2.4.0 → 2.4.2

package/dist/{chunk-U7T7RXXE.mjs → chunk-6IJ5UJ3N.mjs}

@@ -9,7 +9,11 @@ ${opts.basePathVar ? `
 static if (typeof ${opts.basePathVar} !== "string") throw new Error("${opts.basePathVar} must be defined when using basePathVar.");
 static if (!${opts.basePathVar}.endsWith("/")) throw new Error("${opts.basePathVar} must end with a '/' when using basePathVar.");
 ` : ""}${opts.runtimeId ? `$ out.global.runtimeId = ${JSON.stringify(opts.runtimeId)};
-` : ""}$ (out.global.___viteEntries || (out.global.___viteEntries = [])).push(${opts.entryData});
+$ out.global.___viteBaseVar = ${JSON.stringify(
+    "$mbp_" + opts.runtimeId
+  )};
+` : `$ out.global.___viteBaseVar = "$mbp";
+`}$ (out.global.___viteEntries || (out.global.___viteEntries = [])).push(${opts.entryData});
 <_vite${base} slot="head-prepend"/>
 <_vite${base} slot="head"/>
 <_vite${base} slot="body-prepend"/>

package/dist/{chunk-SELVH7LO.mjs → chunk-BV667Z5U.mjs}

@@ -39,8 +39,8 @@ function serialize(basePath, nodes, parts) {
             curString = "";
             break;
           case "link":
-            if (tag.attribs.rel === "stylesheet") {
-              urlAttr = "href";
+            urlAttr = "href";
+            if (tag.attribs.rel === "stylesheet" || tag.attribs.rel === "modulepreload" || tag.attribs.as === "style" || tag.attribs.as === "script") {
               parts.push(curString, 0 /* AssetAttrs */);
               curString = "";
             }

package/dist/{chunk-FHYNYHDA.mjs → chunk-ZCKVZIQN.mjs}

@@ -1,6 +1,6 @@
 import {
   serialize
-} from "./chunk-SELVH7LO.mjs";
+} from "./chunk-BV667Z5U.mjs";
 
 // src/manifest-generator.ts
 import { Parser } from "htmlparser2";

package/dist/components/vite.marko

@@ -34,15 +34,13 @@ $ if (!out.global.___viteRenderAssets) {
     ? ` nonce="${out.global.cspNonce.replace(/"/g, "'")}"`
     : "";
   out.global.___viteRenderAssets = renderAssets;
-
-  if (input.base) {
-    out.global.___viteBasePath = input.base;
-    out.script(`$mbp${out.global.runtimeId ? `_${out.global.runtimeId}` : ""}=${JSON.stringify(input.base)}`);
-  } else {
-    out.global.___viteBasePath = import.meta.env.BASE_URL;
-  }
+  out.global.___viteBasePath = input.base || import.meta.env.BASE_URL;
 }
 
 <__flush_here_and_after__>
+  <if(input.base && !out.global.___flushedMBP)>
+    $ out.global.___flushedMBP = true;
+    $!{`<script${out.global.___viteInjectAttrs}>${out.global.___viteBaseVar}=${JSON.stringify(input.base)}</script>`}
+  </if>
   $!{out.global.___viteRenderAssets(input.slot)}
 </__flush_here_and_after__>

package/dist/index.js

@@ -112,13 +112,14 @@ function markoPlugin(opts = {}) {
   let root;
   let devEntryFile;
   let devEntryFilePosix;
+  let isTest = false;
   let isBuild = false;
   let isSSRBuild = false;
   let devServer;
   let registeredTag = false;
   let serverManifest;
   let store;
-  let cjsImports;
+  let CJSTemplates;
   let basePath = "/";
   const entrySources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
@@ -134,6 +135,7 @@ function markoPlugin(opts = {}) {
         root = normalizePath(config.root || process.cwd());
         devEntryFile = import_path.default.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
+        isTest = env.mode === "test";
         isBuild = env.command === "build";
         isSSRBuild = isBuild && linked && Boolean(config.build.ssr);
         store = opts.store || new import_store.FileStore(
@@ -166,12 +168,10 @@ function markoPlugin(opts = {}) {
               if (entry) {
                 const relativePath = (0, import_relative_import_path.relativeImportPath)(devEntryFile, entry);
                 taglibDeps.push(relativePath);
-                if (isBuild || (isEsm ?? (isEsm = getModuleType(taglib.path) === "esm"))) {
+                if (isTest || isBuild || (isEsm ?? (isEsm = getModuleType(taglib.path) === "esm"))) {
                   optimizeTaglibDeps.push(relativePath);
                 } else {
-                  (cjsImports ?? (cjsImports = /* @__PURE__ */ new Map())).set(normalizePath(entry), {
-                    template: tag.template
-                  });
+                  (CJSTemplates ?? (CJSTemplates = /* @__PURE__ */ new Set())).add(normalizePath(entry));
                 }
               }
             }
@@ -320,22 +320,6 @@ function markoPlugin(opts = {}) {
         return null;
       },
       async load(id) {
-        if (cjsImports == null ? void 0 : cjsImports.has(id)) {
-          const tag = cjsImports.get(id);
-          if (!tag.esmWrapper) {
-            const { ast } = await compiler.compileFile(tag.template, {
-              output: "source",
-              ast: true,
-              sourceMaps: false,
-              code: false
-            });
-            tag.esmWrapper = await createEsmWrapper(
-              id,
-              getExportIdentifiers(ast)
-            );
-          }
-          return tag.esmWrapper;
-        }
         switch (getMarkoQuery(id)) {
           case serverEntryQuery: {
             const fileName = id.slice(0, -serverEntryQuery.length);
@@ -385,6 +369,7 @@ function markoPlugin(opts = {}) {
         );
       },
       async transform(source, id, ssr) {
+        const isSSR = typeof ssr === "object" ? ssr.ssr : ssr;
         const query = getMarkoQuery(id);
         if (query && !query.startsWith(virtualFileQuery)) {
           id = id.slice(0, -query.length);
@@ -392,10 +377,24 @@ function markoPlugin(opts = {}) {
             id = `${id.slice(0, -markoExt.length)}.entry.marko`;
           }
         }
-        if (!isMarkoFile(id) || (cjsImports == null ? void 0 : cjsImports.has(id))) {
+        if (!isMarkoFile(id)) {
           return null;
         }
-        if (ssr && entrySources.has(id)) {
+        if (CJSTemplates == null ? void 0 : CJSTemplates.has(id)) {
+          return createEsmWrapper(
+            id,
+            getExportIdentifiers(
+              (await compiler.compile(source, id, {
+                cache,
+                ast: true,
+                code: false,
+                output: "source",
+                sourceMaps: false
+              })).ast
+            )
+          );
+        }
+        if (isSSR && linked && entrySources.has(id)) {
           entrySources.set(id, source);
           if (serverManifest) {
             serverManifest.entrySources[import_path.default.posix.relative(root, id)] = source;
@@ -404,7 +403,7 @@ function markoPlugin(opts = {}) {
         const compiled = await compiler.compile(
           source,
           id,
-          (typeof ssr === "object" ? ssr.ssr : ssr) ? ssrConfig : query === browserEntryQuery ? hydrateConfig : domConfig
+          isSSR ? ssrConfig : query === browserEntryQuery ? hydrateConfig : domConfig
         );
         const { map, meta } = compiled;
         let { code } = compiled;

package/dist/index.mjs

@@ -4,11 +4,11 @@ import {
 import {
   generateDocManifest,
   generateInputDoc
-} from "./chunk-FHYNYHDA.mjs";
-import "./chunk-SELVH7LO.mjs";
+} from "./chunk-ZCKVZIQN.mjs";
+import "./chunk-BV667Z5U.mjs";
 import {
   server_entry_template_default
-} from "./chunk-U7T7RXXE.mjs";
+} from "./chunk-6IJ5UJ3N.mjs";
 import "./chunk-KIYHBIE6.mjs";
 import {
   MemoryStore
@@ -92,13 +92,14 @@ function markoPlugin(opts = {}) {
   let root;
   let devEntryFile;
   let devEntryFilePosix;
+  let isTest = false;
   let isBuild = false;
   let isSSRBuild = false;
   let devServer;
   let registeredTag = false;
   let serverManifest;
   let store;
-  let cjsImports;
+  let CJSTemplates;
   let basePath = "/";
   const entrySources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
@@ -114,6 +115,7 @@ function markoPlugin(opts = {}) {
         root = normalizePath(config.root || process.cwd());
         devEntryFile = path.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
+        isTest = env.mode === "test";
         isBuild = env.command === "build";
         isSSRBuild = isBuild && linked && Boolean(config.build.ssr);
         store = opts.store || new FileStore(
@@ -146,12 +148,10 @@ function markoPlugin(opts = {}) {
               if (entry) {
                 const relativePath = relativeImportPath(devEntryFile, entry);
                 taglibDeps.push(relativePath);
-                if (isBuild || (isEsm ?? (isEsm = getModuleType(taglib.path) === "esm"))) {
+                if (isTest || isBuild || (isEsm ?? (isEsm = getModuleType(taglib.path) === "esm"))) {
                   optimizeTaglibDeps.push(relativePath);
                 } else {
-                  (cjsImports ?? (cjsImports = /* @__PURE__ */ new Map())).set(normalizePath(entry), {
-                    template: tag.template
-                  });
+                  (CJSTemplates ?? (CJSTemplates = /* @__PURE__ */ new Set())).add(normalizePath(entry));
                 }
               }
             }
@@ -300,22 +300,6 @@ function markoPlugin(opts = {}) {
         return null;
       },
       async load(id) {
-        if (cjsImports == null ? void 0 : cjsImports.has(id)) {
-          const tag = cjsImports.get(id);
-          if (!tag.esmWrapper) {
-            const { ast } = await compiler.compileFile(tag.template, {
-              output: "source",
-              ast: true,
-              sourceMaps: false,
-              code: false
-            });
-            tag.esmWrapper = await createEsmWrapper(
-              id,
-              getExportIdentifiers(ast)
-            );
-          }
-          return tag.esmWrapper;
-        }
         switch (getMarkoQuery(id)) {
           case serverEntryQuery: {
             const fileName = id.slice(0, -serverEntryQuery.length);
@@ -365,6 +349,7 @@ function markoPlugin(opts = {}) {
         );
       },
       async transform(source, id, ssr) {
+        const isSSR = typeof ssr === "object" ? ssr.ssr : ssr;
         const query = getMarkoQuery(id);
         if (query && !query.startsWith(virtualFileQuery)) {
           id = id.slice(0, -query.length);
@@ -372,10 +357,24 @@ function markoPlugin(opts = {}) {
             id = `${id.slice(0, -markoExt.length)}.entry.marko`;
           }
         }
-        if (!isMarkoFile(id) || (cjsImports == null ? void 0 : cjsImports.has(id))) {
+        if (!isMarkoFile(id)) {
           return null;
         }
-        if (ssr && entrySources.has(id)) {
+        if (CJSTemplates == null ? void 0 : CJSTemplates.has(id)) {
+          return createEsmWrapper(
+            id,
+            getExportIdentifiers(
+              (await compiler.compile(source, id, {
+                cache,
+                ast: true,
+                code: false,
+                output: "source",
+                sourceMaps: false
+              })).ast
+            )
+          );
+        }
+        if (isSSR && linked && entrySources.has(id)) {
           entrySources.set(id, source);
           if (serverManifest) {
             serverManifest.entrySources[path.posix.relative(root, id)] = source;
@@ -384,7 +383,7 @@ function markoPlugin(opts = {}) {
         const compiled = await compiler.compile(
           source,
           id,
-          (typeof ssr === "object" ? ssr.ssr : ssr) ? ssrConfig : query === browserEntryQuery ? hydrateConfig : domConfig
+          isSSR ? ssrConfig : query === browserEntryQuery ? hydrateConfig : domConfig
         );
         const { map, meta } = compiled;
         let { code } = compiled;

package/dist/manifest-generator.mjs

@@ -1,8 +1,8 @@
 import {
   generateDocManifest,
   generateInputDoc
-} from "./chunk-FHYNYHDA.mjs";
-import "./chunk-SELVH7LO.mjs";
+} from "./chunk-ZCKVZIQN.mjs";
+import "./chunk-BV667Z5U.mjs";
 export {
   generateDocManifest,
   generateInputDoc

package/dist/serializer.js

@@ -66,8 +66,8 @@ function serialize(basePath, nodes, parts) {
             curString = "";
             break;
           case "link":
-            if (tag.attribs.rel === "stylesheet") {
-              urlAttr = "href";
+            urlAttr = "href";
+            if (tag.attribs.rel === "stylesheet" || tag.attribs.rel === "modulepreload" || tag.attribs.as === "style" || tag.attribs.as === "script") {
               parts.push(curString, 0 /* AssetAttrs */);
               curString = "";
             }

package/dist/serializer.mjs

@@ -1,6 +1,6 @@
 import {
   serialize
-} from "./chunk-SELVH7LO.mjs";
+} from "./chunk-BV667Z5U.mjs";
 export {
   serialize as default
 };

package/dist/server-entry-template.js

@@ -41,7 +41,11 @@ ${opts.basePathVar ? `
 static if (typeof ${opts.basePathVar} !== "string") throw new Error("${opts.basePathVar} must be defined when using basePathVar.");
 static if (!${opts.basePathVar}.endsWith("/")) throw new Error("${opts.basePathVar} must end with a '/' when using basePathVar.");
 ` : ""}${opts.runtimeId ? `$ out.global.runtimeId = ${JSON.stringify(opts.runtimeId)};
-` : ""}$ (out.global.___viteEntries || (out.global.___viteEntries = [])).push(${opts.entryData});
+$ out.global.___viteBaseVar = ${JSON.stringify(
+    "$mbp_" + opts.runtimeId
+  )};
+` : `$ out.global.___viteBaseVar = "$mbp";
+`}$ (out.global.___viteEntries || (out.global.___viteEntries = [])).push(${opts.entryData});
 <_vite${base} slot="head-prepend"/>
 <_vite${base} slot="head"/>
 <_vite${base} slot="body-prepend"/>

package/dist/server-entry-template.mjs

@@ -1,6 +1,6 @@
 import {
   server_entry_template_default
-} from "./chunk-U7T7RXXE.mjs";
+} from "./chunk-6IJ5UJ3N.mjs";
 export {
   server_entry_template_default as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {
@@ -34,7 +34,7 @@
     "lint-staged": "^13.1.0",
     "marko": "^5.22.0",
     "mocha": "^10.2.0",
-    "mocha-snap": "^4.3.0",
+    "mocha-snap": "^5.0.0",
     "nyc": "^15.1.0",
     "playwright": "^1.29.1",
     "prettier": "^2.8.1",