@marko/vite 5.3.0 → 5.3.2

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

@@ -717,12 +717,13 @@ var render_assets_transform_default = (tag, t3) => {
 };
 function renderAssetsCall(t3, slot) {
   return t3.markoPlaceholder(
-    t3.callExpression(
+    t3.optionalCallExpression(
       t3.memberExpression(
         t3.identifier("$global"),
         t3.identifier("___viteRenderAssets")
       ),
-      [t3.stringLiteral(slot)]
+      [t3.stringLiteral(slot)],
+      true
     ),
     false
   );
@@ -831,6 +832,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();
@@ -878,6 +880,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;
         }
@@ -1168,7 +1173,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;

package/package.json

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