@marko/vite 5.2.0 → 5.3.0

package/dist/glob-import-transform.d.ts

@@ -2,7 +2,7 @@ import { types as t } from "@marko/compiler";
 declare const _default: {
     MetaProperty(tag: t.NodePath<t.MetaProperty>): void;
     Program: {
-        exit(tag: t.NodePath<t.Program>): void;
+        exit(program: t.NodePath<t.Program>): void;
     };
 };
 export default _default;

package/dist/index.mjs

@@ -244,6 +244,7 @@ function esbuildPlugin(config) {
 import { types as t2 } from "@marko/compiler";
 import glob from "fast-glob";
 import path3 from "path";
+import { relativeImportPath } from "relative-import-path";
 var programGlobImports = /* @__PURE__ */ new WeakMap();
 var glob_import_transform_default = {
   MetaProperty(tag) {
@@ -265,18 +266,17 @@ var glob_import_transform_default = {
     }
   },
   Program: {
-    exit(tag) {
-      const globImports = programGlobImports.get(tag);
+    exit(program) {
+      const globImports = programGlobImports.get(program);
       if (!globImports) {
         return;
       }
-      const { cwd, filename } = tag.hub.file.opts;
+      const { cwd, filename } = program.hub.file.opts;
       const dir = path3.dirname(filename);
       const seen = /* @__PURE__ */ new Set();
       for (const [patterns, options] of globImports) {
-        const resolvedPatterns = Array.isArray(patterns) ? patterns.map((p) => path3.resolve(dir, p)) : path3.resolve(dir, patterns);
-        const results = glob.globSync(resolvedPatterns, {
-          cwd,
+        const results = glob.globSync(patterns, {
+          cwd: dir,
           absolute: true,
           dot: !!options.exhaustive,
           ignore: options.exhaustive ? [] : [path3.join(cwd, "**/node_modules/**")]
@@ -284,7 +284,12 @@ var glob_import_transform_default = {
         for (const file of results) {
           if (file.endsWith(".marko") && file !== filename && !seen.has(file)) {
             seen.add(file);
-            tag.node.body.push(t2.importDeclaration([], t2.stringLiteral(file)));
+            program.node.body.push(
+              t2.importDeclaration(
+                [],
+                t2.stringLiteral(relativeImportPath(filename, file))
+              )
+            );
           }
         }
       }
@@ -737,8 +742,7 @@ static function flush($global, html) {
 static function setFlush($global) {
   $global.__flush__ = flush;
 }
-static const assets = [${opts.entryData.join(",")}];
-<const/writeSync=addAssets($global, assets) || setFlush($global)/>
+<const/writeSync=addAssets($global, [${opts.entryData.join(",")}]) || setFlush($global)/>
 -- $!{writeSync && getPrepend($global)}
 <Template ...input/>
 -- $!{writeSync && getAppend($global)}
@@ -747,8 +751,7 @@ static const assets = [${opts.entryData.join(",")}];
   return `import template from ${fileNameStr};
 export * from ${fileNameStr};
 import { addAssets, getPrepend, getAppend } from "${renderAssetsRuntimeId}";
-static const assets = [${opts.entryData.join(",")}];
-<if(addAssets($global, assets))>
+<if(addAssets($global, [${opts.entryData.join(",")}]))>
   $!{getPrepend($global)}
   <\${template} ...input/>
   $!{getAppend($global)}
@@ -772,6 +775,7 @@ var virtualFiles = /* @__PURE__ */ new Map();
 var extReg = /\.[^.]+$/;
 var queryReg = /\?marko-[^?]+$/;
 var importTagReg2 = /^<([^>]+)>$/;
+var noClientAssetsRuntimeId = "\0no_client_bundles.mjs";
 var browserEntryQuery = "?marko-browser-entry";
 var serverEntryQuery = "?marko-server-entry";
 var virtualFileQuery = "?marko-virtual";
@@ -1103,22 +1107,35 @@ function markoPlugin(opts = {}) {
         }
       },
       async options(inputOptions) {
-        if (isBuild && linked && !isSSRBuild) {
-          try {
-            serverManifest = await store.read();
-            inputOptions.input = toHTMLEntries(root, serverManifest.entries);
-            for (const entry in serverManifest.entrySources) {
-              const id = normalizePath(path6.resolve(root, entry));
-              entryIds.add(id);
-              cachedSources.set(id, serverManifest.entrySources[entry]);
+        if (linked && isBuild) {
+          if (isSSRBuild) {
+            serverManifest = {
+              entries: {},
+              entrySources: {},
+              chunksNeedingAssets: [],
+              ssrAssetIds: []
+            };
+          } else {
+            try {
+              serverManifest = await store.read();
+              if (isEmpty(serverManifest.entries)) {
+                inputOptions.input = noClientAssetsRuntimeId;
+              } else {
+                inputOptions.input = toHTMLEntries(
+                  root,
+                  serverManifest.entries
+                );
+                for (const entry in serverManifest.entrySources) {
+                  const id = normalizePath(path6.resolve(root, entry));
+                  entryIds.add(id);
+                  cachedSources.set(id, serverManifest.entrySources[entry]);
+                }
+              }
+            } catch (err) {
+              this.error(
+                `You must run the "ssr" build before the "browser" build.`
+              );
             }
-          } catch (err) {
-            this.error(
-              `You must run the "ssr" build before the "browser" build.`
-            );
-          }
-          if (isEmpty(inputOptions.input)) {
-            this.error("No Marko files were found when compiling the server.");
           }
         }
       },
@@ -1136,8 +1153,8 @@ function markoPlugin(opts = {}) {
         if (virtualFiles.has(importee)) {
           return importee;
         }
-        if (importee === renderAssetsRuntimeId) {
-          return { id: renderAssetsRuntimeId };
+        if (importee === renderAssetsRuntimeId || importee === noClientAssetsRuntimeId) {
+          return { id: importee };
         }
         if (importer) {
           const tagName = importTagReg2.exec(importee)?.[1];
@@ -1190,6 +1207,9 @@ function markoPlugin(opts = {}) {
         if (id === renderAssetsRuntimeId) {
           return renderAssetsRuntimeCode;
         }
+        if (id === noClientAssetsRuntimeId) {
+          return "NO_CLIENT_ASSETS";
+        }
         const query = getMarkoQuery(id);
         switch (query) {
           case serverEntryQuery: {
@@ -1225,12 +1245,6 @@ function markoPlugin(opts = {}) {
                 path6.relative(root, fileName)
               );
               const entryId = toEntryId(relativeFileName);
-              serverManifest ??= {
-                entries: {},
-                entrySources: {},
-                chunksNeedingAssets: [],
-                ssrAssetIds: []
-              };
               serverManifest.entries[entryId] = relativeFileName;
               serverManifest.entrySources[relativeFileName] = source;
               mainEntryData = JSON.stringify(entryId);
@@ -1363,11 +1377,6 @@ if (import.meta.hot) import.meta.hot.accept(() => {});`;
             `Linked builds are currently only supported when in "write" mode.`
           );
         }
-        if (!serverManifest) {
-          this.error(
-            "No Marko files were found when bundling the server in linked mode."
-          );
-        }
         if (isSSRBuild) {
           const dir = outputOptions.dir ? path6.resolve(outputOptions.dir) : path6.resolve(outputOptions.file, "..");
           for (const fileName in bundle) {
@@ -1394,32 +1403,42 @@ if (import.meta.hot) import.meta.hot.accept(() => {});`;
           store.write(serverManifest);
         } else {
           const browserManifest = {};
-          for (const entryId in serverManifest.entries) {
-            const fileName = serverManifest.entries[entryId];
-            const chunkId = fileName + htmlExt;
-            const chunk = bundle[chunkId];
-            if (chunk?.type === "asset") {
-              browserManifest[entryId] = {
-                ...await generateDocManifest(
-                  basePath,
-                  chunk.source.toString()
-                ),
-                preload: void 0
-                // clear out preload for prod builds.
-              };
-              delete bundle[chunkId];
-            } else {
-              this.error(
-                `Marko template had unexpected output from vite, ${fileName}`
-              );
+          if (isEmpty(serverManifest.entries)) {
+            for (const chunkId in bundle) {
+              const chunk = bundle[chunkId];
+              if (chunk.type === "chunk" && chunk.facadeModuleId === noClientAssetsRuntimeId) {
+                delete bundle[chunkId];
+                delete bundle[chunkId + ".map"];
+              }
             }
-          }
-          const manifestStr = `;var __MARKO_MANIFEST__=${JSON.stringify(
-            browserManifest
-          )};
+          } else {
+            for (const entryId in serverManifest.entries) {
+              const fileName = serverManifest.entries[entryId];
+              const chunkId = fileName + htmlExt;
+              const chunk = bundle[chunkId];
+              if (chunk?.type === "asset") {
+                browserManifest[entryId] = {
+                  ...await generateDocManifest(
+                    basePath,
+                    chunk.source.toString()
+                  ),
+                  preload: void 0
+                  // clear out preload for prod builds.
+                };
+                delete bundle[chunkId];
+              } else {
+                this.error(
+                  `Marko template had unexpected output from vite, ${fileName}`
+                );
+              }
+            }
+            const manifestStr = `;var __MARKO_MANIFEST__=${JSON.stringify(
+              browserManifest
+            )};
 `;
-          for (const fileName of serverManifest.chunksNeedingAssets) {
-            await fs4.promises.appendFile(fileName, manifestStr);
+            for (const fileName of serverManifest.chunksNeedingAssets) {
+              await fs4.promises.appendFile(fileName, manifestStr);
+            }
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/vite",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "description": "A Marko plugin for Vite",
   "keywords": [
     "loader",
@@ -47,46 +47,47 @@
     "domhandler": "^5.0.3",
     "fast-glob": "^3.3.3",
     "htmlparser2": "^10.0.0",
+    "relative-import-path": "^1.0.0",
     "resolve": "^1.22.10",
     "resolve.exports": "^2.0.3"
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.1",
     "@changesets/cli": "^2.29.5",
-    "@eslint/js": "^9.29.0",
-    "@marko/compiler": "^5.39.28",
+    "@eslint/js": "^9.31.0",
+    "@marko/compiler": "^5.39.29",
     "@marko/fixture-snapshots": "^2.2.1",
-    "@marko/testing-library": "^6.2.0",
+    "@marko/testing-library": "^6.3.1",
     "@types/babel__core": "^7.20.5",
     "@types/diff": "^8.0.0",
     "@types/jsdom": "^21.1.7",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^24.0.4",
+    "@types/node": "^24.0.14",
     "@types/resolve": "^1.20.6",
     "@types/serve-handler": "^6.1.4",
     "cross-env": "^7.0.3",
     "diff": "^8.0.2",
-    "esbuild": "^0.25.5",
-    "eslint": "^9.29.0",
+    "esbuild": "^0.25.6",
+    "eslint": "^9.31.0",
     "eslint-formatter-unix": "^8.40.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "globals": "^16.2.0",
+    "globals": "^16.3.0",
     "husky": "^9.1.7",
     "jsdom": "^26.1.0",
     "less": "^4.3.0",
     "lint-staged": "^16.1.2",
-    "marko": "^5.37.40",
+    "marko": "^5.37.41",
     "mocha": "^11.7.1",
     "mocha-snap": "^5.0.0",
     "nyc": "^17.1.0",
-    "playwright": "^1.53.1",
-    "prettier": "^3.6.1",
-    "prettier-plugin-packagejson": "^2.5.15",
+    "playwright": "^1.54.1",
+    "prettier": "^3.6.2",
+    "prettier-plugin-packagejson": "^2.5.18",
     "serve-handler": "^6.1.6",
     "tsx": "^4.20.3",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.35.0",
-    "vite": "^7.0.0"
+    "typescript-eslint": "^8.37.0",
+    "vite": "^7.0.4"
   },
   "peerDependencies": {
     "@marko/compiler": "^5",