@marko/vite 5.2.1 → 5.3.1

package/dist/index.d.ts

@@ -9,5 +9,6 @@ export interface Options {
     translator?: string;
     basePathVar?: string;
     babelConfig?: compiler.Config["babelConfig"];
+    isEntry?: (importee: string, importer: string) => boolean;
 }
 export default function markoPlugin(opts?: Options): vite.Plugin[];

package/dist/index.mjs

@@ -775,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";
@@ -830,6 +831,7 @@ function markoPlugin(opts = {}) {
   let serverManifest;
   let basePath = "/";
   let getMarkoAssetFns;
+  let checkIsEntry = () => true;
   const entryIds = /* @__PURE__ */ new Set();
   const cachedSources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
@@ -877,6 +879,9 @@ function markoPlugin(opts = {}) {
         }
         runtimeId = opts.runtimeId;
         basePathVar = opts.basePathVar;
+        if (opts.isEntry) {
+          checkIsEntry = opts.isEntry;
+        }
         if ("BASE_URL" in process.env && config.base == null) {
           config.base = process.env.BASE_URL;
         }
@@ -1106,22 +1111,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.");
           }
         }
       },
@@ -1139,8 +1157,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];
@@ -1154,7 +1172,10 @@ function markoPlugin(opts = {}) {
           importee = importee.slice(0, -importeeQuery.length);
         } else if (!importOpts.scan) {
           if (ssr && linked && importer && importer[0] !== "\0" && (importer !== devEntryFile || normalizePath(importer) !== devEntryFilePosix) && // Vite tries to resolve against an `index.html` in some cases, we ignore it here.
-          isMarkoFile(importee) && !isMarkoFile(importer.replace(queryReg, ""))) {
+          isMarkoFile(importee) && !queryReg.test(importer) && !isMarkoFile(importer) && checkIsEntry(
+            normalizePath(path6.resolve(importer, "..", importee)),
+            importer
+          )) {
             importeeQuery = serverEntryQuery;
           } else if (!ssr && isBuild && importer && isMarkoFile(importee) && this.getModuleInfo(importer)?.isEntry) {
             importeeQuery = browserEntryQuery;
@@ -1193,6 +1214,9 @@ function markoPlugin(opts = {}) {
         if (id === renderAssetsRuntimeId) {
           return renderAssetsRuntimeCode;
         }
+        if (id === noClientAssetsRuntimeId) {
+          return "NO_CLIENT_ASSETS";
+        }
         const query = getMarkoQuery(id);
         switch (query) {
           case serverEntryQuery: {
@@ -1228,12 +1252,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);
@@ -1366,11 +1384,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) {
@@ -1397,32 +1410,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.1",
+  "version": "5.3.1",
   "description": "A Marko plugin for Vite",
   "keywords": [
     "loader",