@marko/vite 5.4.1 → 5.4.3

package/dist/index.mjs

@@ -750,7 +750,9 @@ import path5 from "path";
 var server_entry_template_default = async (opts) => {
   const fileNameStr = JSON.stringify(`./${path5.basename(opts.fileName)}`);
   if (opts.tagsAPI) {
-    return `import Template from ${fileNameStr};
+    return `
+<!-- use tags -->
+import Template from ${fileNameStr};
 export * from ${fileNameStr};
 import { addAssets, getPrepend, getAppend } from "${renderAssetsRuntimeId}";
 static function flush($global, html) {
@@ -765,17 +767,19 @@ static function setFlush($global) {
 -- $!{writeSync && getAppend($global)}
 `;
   }
-  return `import template from ${fileNameStr};
+  return `
+<!-- use class -->
+import Template from ${fileNameStr};
 export * from ${fileNameStr};
 import { addAssets, getPrepend, getAppend } from "${renderAssetsRuntimeId}";
 <if(addAssets($global, [${opts.entryData.join(",")}]))>
   $!{getPrepend($global)}
-  <\${template} ...input/>
+  <Template ...input/>
   $!{getAppend($global)}
 </>
 <else>
   <__flush_here_and_after__>$!{getPrepend($global)}</>
-  <\${template} ...input/>
+  <Template ...input/>
   <init-components/>
   <await-reorderer/>
   <__flush_here_and_after__>$!{getAppend($global)}</>
@@ -792,6 +796,7 @@ var virtualFiles = /* @__PURE__ */ new Map();
 var extReg = /\.[^.]+$/;
 var queryReg = /\?marko-[^?]+$/;
 var importTagReg2 = /^<([^>]+)>$/;
+var optionalWatchFileReg = /[\\/](?:([^\\/]+)\.)?(?:marko-tag.json|(?:style|component|component-browser)\.\w+)$/;
 var noClientAssetsRuntimeId = "\0no_client_bundles.mjs";
 var browserEntryQuery = "?marko-browser-entry";
 var serverEntryQuery = "?marko-server-entry";
@@ -857,29 +862,31 @@ function markoPlugin(opts = {}) {
   const entryIds = /* @__PURE__ */ new Set();
   const cachedSources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
-  const transformOptionalFiles = /* @__PURE__ */ new Map();
   const store = new ReadOncePersistedStore(
     `vite-marko${runtimeId ? `-${runtimeId}` : ""}`
   );
   const isTagsApi = /* @__PURE__ */ (() => {
-    let tagsAPI;
-    return () => {
-      if (tagsAPI === void 0) {
+    let defaultIsTagsAPI;
+    return (api) => {
+      if (api) {
+        return api === "tags";
+      }
+      if (defaultIsTagsAPI === void 0) {
         const translatorPackage = opts.translator || compiler2.globalConfig?.translator || "marko/translator";
         if (/^@marko\/translator-(?:default|interop-class-tags)$/.test(
           translatorPackage
         )) {
-          tagsAPI = false;
+          defaultIsTagsAPI = false;
         } else {
           try {
             const require2 = createRequire(import.meta.url);
-            tagsAPI = require2(translatorPackage).preferAPI !== "class";
+            defaultIsTagsAPI = require2(translatorPackage).preferAPI !== "class";
           } catch {
-            tagsAPI = true;
+            defaultIsTagsAPI = true;
           }
         }
       }
-      return tagsAPI;
+      return defaultIsTagsAPI;
     };
   })();
   return [
@@ -1163,17 +1170,18 @@ function markoPlugin(opts = {}) {
           if (type === "unlink") {
             entryIds.delete(fileName);
             transformWatchFiles.delete(fileName);
-            transformOptionalFiles.delete(fileName);
           }
           for (const [id, files] of transformWatchFiles) {
             if (anyMatch(files, fileName)) {
               devServer.watcher.emit("change", id);
             }
           }
-          if (type === "add" || type === "unlink") {
-            for (const [id, files] of transformOptionalFiles) {
-              if (anyMatch(files, fileName)) {
-                devServer.watcher.emit("change", id);
+          if (type === "unlink" || type === "add") {
+            const optionalMatch = optionalWatchFileReg.exec(fileName);
+            if (optionalMatch) {
+              const markoFile = fileName.slice(0, optionalMatch.index + 1) + (optionalMatch[1] || "index") + ".marko";
+              if (transformWatchFiles.has(markoFile)) {
+                devServer.watcher.emit("change", markoFile);
               }
             }
           }
@@ -1320,7 +1328,7 @@ function markoPlugin(opts = {}) {
               return cachedSources.get(id.slice(0, -query.length)) || null;
             }
             default:
-              return virtualFiles.get(id) || cacheDir && fs4.promises.readFile(
+              return virtualFiles.get(id) || cachedSources.get(id) || cacheDir && fs4.promises.readFile(
                 virtualPathToCacheFile(id, root, cacheDir),
                 "utf8"
               ).then((code) => {
@@ -1331,7 +1339,7 @@ function markoPlugin(opts = {}) {
               });
           }
         }
-        return virtualFiles.get(id) || null;
+        return virtualFiles.get(id) || cachedSources.get(id) || null;
       },
       async transform(source, rawId, ssr) {
         let id = stripViteQueries(rawId);
@@ -1385,7 +1393,9 @@ function markoPlugin(opts = {}) {
               entryData,
               runtimeId,
               basePathVar: isBuild ? basePathVar : void 0,
-              tagsAPI: isTagsApi()
+              tagsAPI: isTagsApi(
+                ("transformRequest" in this.environment ? (await this.environment.transformRequest(fileName), this.getModuleInfo(fileName)) : await this.load({ id: fileName }))?.meta.markoAPI
+              )
             });
           }
         }
@@ -1426,7 +1436,11 @@ function markoPlugin(opts = {}) {
               return {
                 code: code2,
                 map: stripSourceRoot(map),
-                meta: { arcSourceCode: source, arcScanIds: meta2.analyzedTags }
+                meta: {
+                  markoAPI: meta2.api,
+                  arcSourceCode: source,
+                  arcScanIds: meta2.analyzedTags
+                }
               };
             }
           }
@@ -1441,28 +1455,25 @@ function markoPlugin(opts = {}) {
         );
         const { meta } = compiled;
         let { code } = compiled;
-        if (!isTest && query !== browserEntryQuery && devServer && !isTagsApi()) {
+        if (!isTest && query !== browserEntryQuery && devServer && !isTagsApi(meta.api)) {
           code += `
 if (import.meta.hot) import.meta.hot.accept(() => {});`;
         }
         if (devServer) {
-          const templateName = getPosixBasenameWithoutExt(id);
-          const optionalFilePrefix = path6.dirname(id) + path6.sep + (templateName === "index" ? "" : `${templateName}.`);
+          transformWatchFiles.set(id, meta.watchFiles);
+        } else {
           for (const file of meta.watchFiles) {
             this.addWatchFile(file);
           }
-          transformOptionalFiles.set(id, [
-            `${optionalFilePrefix}style.*`,
-            `${optionalFilePrefix}component.*`,
-            `${optionalFilePrefix}component-browser.*`,
-            `${optionalFilePrefix}marko-tag.json`
-          ]);
-          transformWatchFiles.set(id, meta.watchFiles);
         }
         return {
           code,
           map: stripSourceRoot(compiled.map),
-          meta: isBuild ? { arcSourceCode: source, arcScanIds: meta.analyzedTags } : void 0
+          meta: isBuild ? {
+            markoAPI: meta.api,
+            arcSourceCode: source,
+            arcScanIds: meta.analyzedTags
+          } : { markoAPI: meta.api }
         };
       }
     },
@@ -1600,11 +1611,6 @@ function virtualPathToCacheFile(virtualPath, root, cacheDir) {
     normalizePath(path6.relative(root, virtualPath)).replace(/[\\/]+/g, "_")
   );
 }
-function getPosixBasenameWithoutExt(file) {
-  const baseStart = file.lastIndexOf(POSIX_SEP) + 1;
-  const extStart = file.indexOf(".", baseStart + 1);
-  return file.slice(baseStart, extStart);
-}
 function createDeferredPromise() {
   let resolve;
   let reject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/vite",
-  "version": "5.4.1",
+  "version": "5.4.3",
   "description": "A Marko plugin for Vite",
   "keywords": [
     "loader",
@@ -41,53 +41,53 @@
     "version": "changeset version && npm i --package-lock-only"
   },
   "dependencies": {
-    "@chialab/cjs-to-esm": "^0.18.0",
+    "@chialab/cjs-to-esm": "^0.19.0",
     "anymatch": "^3.1.3",
     "domelementtype": "^2.3.0",
     "domhandler": "^5.0.3",
     "fast-glob": "^3.3.3",
     "htmlparser2": "^10.0.0",
     "relative-import-path": "^1.0.0",
-    "resolve": "^1.22.10",
+    "resolve": "^1.22.11",
     "resolve.exports": "^2.0.3"
   },
   "devDependencies": {
-    "@changesets/changelog-github": "^0.5.1",
-    "@changesets/cli": "^2.29.5",
-    "@eslint/js": "^9.31.0",
-    "@marko/compiler": "^5.39.29",
+    "@changesets/changelog-github": "^0.5.2",
+    "@changesets/cli": "^2.29.8",
+    "@eslint/js": "^9.39.1",
+    "@marko/compiler": "^5.39.45",
     "@marko/fixture-snapshots": "^2.2.1",
-    "@marko/testing-library": "^6.3.1",
+    "@marko/testing-library": "^6.4.1",
     "@types/babel__core": "^7.20.5",
     "@types/diff": "^8.0.0",
-    "@types/jsdom": "^21.1.7",
+    "@types/jsdom": "^27.0.0",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^24.0.14",
+    "@types/node": "^25.0.1",
     "@types/resolve": "^1.20.6",
     "@types/serve-handler": "^6.1.4",
-    "cross-env": "^7.0.3",
+    "cross-env": "^10.1.0",
     "diff": "^8.0.2",
-    "esbuild": "^0.25.6",
-    "eslint": "^9.31.0",
-    "eslint-formatter-unix": "^8.40.0",
+    "esbuild": "^0.27.1",
+    "eslint": "^9.39.1",
+    "eslint-formatter-unix": "^9.0.1",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "globals": "^16.3.0",
+    "globals": "^16.5.0",
     "husky": "^9.1.7",
-    "jsdom": "^26.1.0",
-    "less": "^4.3.0",
-    "lint-staged": "^16.1.2",
-    "marko": "^5.37.41",
-    "mocha": "^11.7.1",
-    "mocha-snap": "^5.0.0",
+    "jsdom": "^27.3.0",
+    "less": "^4.4.2",
+    "lint-staged": "^16.2.7",
+    "marko": "^5.38.2",
+    "mocha": "^11.7.5",
+    "mocha-snap": "^5.0.1",
     "nyc": "^17.1.0",
-    "playwright": "^1.54.1",
-    "prettier": "^3.6.2",
-    "prettier-plugin-packagejson": "^2.5.18",
+    "playwright": "^1.57.0",
+    "prettier": "^3.7.4",
+    "prettier-plugin-packagejson": "^2.5.20",
     "serve-handler": "^6.1.6",
-    "tsx": "^4.20.3",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.37.0",
-    "vite": "^7.1.10"
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.49.0",
+    "vite": "^7.2.7"
   },
   "peerDependencies": {
     "@marko/compiler": "^5",