@marko/vite 3.0.0 → 3.1.0

package/dist/{chunk-KRSZ5IRT.mjs → chunk-HR4PYNIR.mjs}

@@ -6,31 +6,34 @@ function esbuildPlugin(compiler, config) {
   return {
     name: "marko",
     async setup(build) {
+      var _a;
       const { platform = "browser" } = build.initialOptions;
+      const isScan = (_a = build.initialOptions.plugins) == null ? void 0 : _a.some(
+        (v) => v.name === "vite:dep-scan"
+      );
       const virtualFiles = /* @__PURE__ */ new Map();
       const finalConfig = {
         ...config,
-        output: platform === "browser" ? "dom" : "html",
+        output: isScan ? "hydrate" : platform === "browser" ? "dom" : "html",
         resolveVirtualDependency(from, dep) {
           virtualFiles.set(path.join(from, "..", dep.virtualPath), dep);
           return dep.virtualPath;
         }
       };
-      if (platform === "browser") {
-        build.onResolve({ filter: /\.marko\./ }, (args) => {
-          return {
-            namespace: "marko:virtual",
-            path: path.resolve(args.resolveDir, args.path)
-          };
-        });
-        build.onLoad(
-          { filter: /\.marko\./, namespace: "marko:virtual" },
-          (args) => ({
-            contents: virtualFiles.get(args.path).code,
-            loader: path.extname(args.path).slice(1)
-          })
-        );
-      }
+      build.onResolve({ filter: /\.marko\./ }, (args) => {
+        return {
+          namespace: "marko:virtual",
+          path: path.resolve(args.resolveDir, args.path)
+        };
+      });
+      build.onLoad(
+        { filter: /\.marko\./, namespace: "marko:virtual" },
+        (args) => ({
+          contents: virtualFiles.get(args.path).code,
+          loader: path.extname(args.path).slice(1),
+          external: isScan
+        })
+      );
       build.onLoad({ filter: /\.marko$/ }, async (args) => {
         try {
           const { code, meta } = await compiler.compileFile(

package/dist/esbuild-plugin.d.ts

@@ -1,3 +1,6 @@
-import type * as esbuild from "esbuild";
+import type * as vite from "vite";
 import type * as Compiler from "@marko/compiler";
-export default function esbuildPlugin(compiler: typeof Compiler, config: Compiler.Config): esbuild.Plugin;
+type ESBuildOptions = Exclude<vite.DepOptimizationConfig["esbuildOptions"], undefined>;
+type ESBuildPlugin = Exclude<ESBuildOptions["plugins"], undefined>[number];
+export default function esbuildPlugin(compiler: typeof Compiler, config: Compiler.Config): ESBuildPlugin;
+export {};

package/dist/esbuild-plugin.js

@@ -38,31 +38,34 @@ function esbuildPlugin(compiler, config) {
   return {
     name: "marko",
     async setup(build) {
+      var _a;
       const { platform = "browser" } = build.initialOptions;
+      const isScan = (_a = build.initialOptions.plugins) == null ? void 0 : _a.some(
+        (v) => v.name === "vite:dep-scan"
+      );
       const virtualFiles = /* @__PURE__ */ new Map();
       const finalConfig = {
         ...config,
-        output: platform === "browser" ? "dom" : "html",
+        output: isScan ? "hydrate" : platform === "browser" ? "dom" : "html",
         resolveVirtualDependency(from, dep) {
           virtualFiles.set(import_path.default.join(from, "..", dep.virtualPath), dep);
           return dep.virtualPath;
         }
       };
-      if (platform === "browser") {
-        build.onResolve({ filter: /\.marko\./ }, (args) => {
-          return {
-            namespace: "marko:virtual",
-            path: import_path.default.resolve(args.resolveDir, args.path)
-          };
-        });
-        build.onLoad(
-          { filter: /\.marko\./, namespace: "marko:virtual" },
-          (args) => ({
-            contents: virtualFiles.get(args.path).code,
-            loader: import_path.default.extname(args.path).slice(1)
-          })
-        );
-      }
+      build.onResolve({ filter: /\.marko\./ }, (args) => {
+        return {
+          namespace: "marko:virtual",
+          path: import_path.default.resolve(args.resolveDir, args.path)
+        };
+      });
+      build.onLoad(
+        { filter: /\.marko\./, namespace: "marko:virtual" },
+        (args) => ({
+          contents: virtualFiles.get(args.path).code,
+          loader: import_path.default.extname(args.path).slice(1),
+          external: isScan
+        })
+      );
       build.onLoad({ filter: /\.marko$/ }, async (args) => {
         try {
           const { code, meta } = await compiler.compileFile(
@@ -108,5 +111,3 @@ function esbuildPlugin(compiler, config) {
     }
   };
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/esbuild-plugin.mjs

@@ -1,6 +1,6 @@
 import {
   esbuildPlugin
-} from "./chunk-KRSZ5IRT.mjs";
+} from "./chunk-HR4PYNIR.mjs";
 export {
   esbuildPlugin as default
 };

package/dist/index.d.ts

@@ -1,19 +1,8 @@
 import type * as vite from "vite";
 import type * as Compiler from "@marko/compiler";
-import { BuildStore } from "./store";
+import { type BuildStore } from "./store";
 export * from "./store";
 export type { BuildStore } from "./store";
-declare module "@marko/babel-utils" {
-    interface Taglib {
-        id: string;
-        dirname: string;
-        path: string;
-        tags: TagDefinition[];
-    }
-    interface TaglibLookup {
-        taglibsById: Record<string, Taglib>;
-    }
-}
 export interface Options {
     linked?: boolean;
     compiler?: string;

package/dist/index.js

@@ -37,7 +37,6 @@ var import_path = __toESM(require("path"));
 var import_crypto = __toESM(require("crypto"));
 var import_anymatch = __toESM(require("anymatch"));
 var import_url = require("url");
-var import_relative_import_path = require("relative-import-path");
 var import_server_entry_template = __toESM(require("./server-entry-template"));
 var import_manifest_generator = require("./manifest-generator");
 var import_esbuild_plugin = __toESM(require("./esbuild-plugin"));
@@ -66,6 +65,7 @@ const babelCaller = {
   supportsTopLevelAwait: true,
   supportsExportNamespaceFrom: true
 };
+let registeredTag = false;
 function markoPlugin(opts = {}) {
   let compiler;
   let { linked = true } = opts;
@@ -97,10 +97,8 @@ function markoPlugin(opts = {}) {
   let isBuild = false;
   let isSSRBuild = false;
   let devServer;
-  let registeredTag = false;
   let serverManifest;
   let store;
-  let CJSTemplates;
   let basePath = "/";
   const entryIds = /* @__PURE__ */ new Set();
   const cachedSources = /* @__PURE__ */ new Map();
@@ -112,7 +110,7 @@ function markoPlugin(opts = {}) {
       enforce: "pre",
       // Must be pre to allow us to resolve assets before vite.
       async config(config, env) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
         runtimeId = opts.runtimeId;
         basePathVar = opts.basePathVar;
@@ -165,8 +163,15 @@ function markoPlugin(opts = {}) {
         );
         if (isTest) {
           linked = false;
+          if ((_b = (_a = config.test) == null ? void 0 : _a.environment) == null ? void 0 : _b.includes(
+            "dom"
+          )) {
+            config.resolve ?? (config.resolve = {});
+            (_c = config.resolve).conditions ?? (_c.conditions = []);
+            config.resolve.conditions.push("browser");
+          }
         }
-        if (linked && !registeredTag) {
+        if (!registeredTag) {
           const transformer = import_path.default.resolve(
             thisFile,
             "../render-assets-transform"
@@ -180,49 +185,33 @@ function markoPlugin(opts = {}) {
             "<body>": { transformer }
           });
         }
-        const lookup = compiler.taglib.buildLookup(root);
-        const taglibDeps = [];
-        const optimizeTaglibDeps = [];
-        for (const name in lookup.taglibsById) {
-          const taglib = lookup.taglibsById[name];
-          if (!/^marko-(.+-)?core$/.test(taglib.id) && /[\\/]node_modules[\\/]/.test(taglib.dirname)) {
-            let isEsm;
-            for (const tagName in taglib.tags) {
-              const tag = taglib.tags[tagName];
-              const entry = tag.template || tag.renderer;
-              if (entry) {
-                const relativePath = (0, import_relative_import_path.relativeImportPath)(devEntryFile, entry);
-                taglibDeps.push(relativePath);
-                if (isTest || isBuild || (isEsm ?? (isEsm = getModuleType(taglib.path) === "esm"))) {
-                  optimizeTaglibDeps.push(relativePath);
-                } else {
-                  (CJSTemplates ?? (CJSTemplates = /* @__PURE__ */ new Set())).add(normalizePath(entry));
-                }
-              }
-            }
-          }
-        }
         const optimizeDeps = config.optimizeDeps ?? (config.optimizeDeps = {});
-        optimizeDeps.include = Array.from(
-          /* @__PURE__ */ new Set([
-            ...optimizeDeps.include || [],
-            ...compiler.getRuntimeEntryFiles("dom", opts.translator),
-            ...compiler.getRuntimeEntryFiles("html", opts.translator),
-            ...optimizeTaglibDeps
-          ])
-        );
+        optimizeDeps.entries ?? (optimizeDeps.entries = [
+          "**/*.marko",
+          "!**/__snapshots__/**",
+          `!**/__tests__/**`,
+          `!**/coverage/**`
+        ]);
+        const domDeps = compiler.getRuntimeEntryFiles("dom", opts.translator);
+        optimizeDeps.include = optimizeDeps.include ? [...optimizeDeps.include, ...domDeps] : domDeps;
         const optimizeExtensions = optimizeDeps.extensions ?? (optimizeDeps.extensions = []);
         optimizeExtensions.push(".marko");
         const esbuildOptions = optimizeDeps.esbuildOptions ?? (optimizeDeps.esbuildOptions = {});
         const esbuildPlugins = esbuildOptions.plugins ?? (esbuildOptions.plugins = []);
         esbuildPlugins.push((0, import_esbuild_plugin.default)(compiler, baseConfig));
         const ssr = config.ssr ?? (config.ssr = {});
-        if (ssr.noExternal !== true) {
-          ssr.noExternal = Array.from(
-            new Set(
-              taglibDeps.concat(ssr.noExternal || [])
-            )
-          );
+        let { noExternal } = ssr;
+        if (noExternal !== true) {
+          const noExternalReg = /\.marko$/;
+          if (noExternal) {
+            if (Array.isArray(noExternal)) {
+              noExternal.push(noExternalReg);
+            } else {
+              noExternal = [noExternal, noExternalReg];
+            }
+          } else {
+            noExternal = noExternalReg;
+          }
         }
         if (basePathVar) {
           config.experimental ?? (config.experimental = {});
@@ -231,7 +220,7 @@ function markoPlugin(opts = {}) {
               "Cannot use @marko/vite `basePathVar` with Vite's `renderBuiltUrl` option."
             );
           }
-          const assetsDir = ((_b = (_a = config.build) == null ? void 0 : _a.assetsDir) == null ? void 0 : _b.replace(/[/\\]$/, "")) ?? "assets";
+          const assetsDir = ((_e = (_d = config.build) == null ? void 0 : _d.assetsDir) == null ? void 0 : _e.replace(/[/\\]$/, "")) ?? "assets";
           const assetsDirLen = assetsDir.length;
           const assetsDirEnd = assetsDirLen + 1;
           const trimAssertsDir = (fileName) => {
@@ -324,13 +313,15 @@ function markoPlugin(opts = {}) {
         let importeeQuery = getMarkoQuery(importee);
         if (importeeQuery) {
           importee = importee.slice(0, -importeeQuery.length);
-        } else if (ssr && linked && importer && (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, ""))) {
-          importeeQuery = serverEntryQuery;
-        } else if (!ssr && isBuild && importer && isMarkoFile(importee) && ((_a = this.getModuleInfo(importer)) == null ? void 0 : _a.isEntry)) {
-          importeeQuery = browserEntryQuery;
-        } else if (linked && !ssr && !importeeQuery && isMarkoFile(importee)) {
-          importeeQuery = browserQuery;
+        } else if (!importOpts.scan) {
+          if (ssr && linked && importer && (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, ""))) {
+            importeeQuery = serverEntryQuery;
+          } else if (!ssr && isBuild && importer && isMarkoFile(importee) && ((_a = this.getModuleInfo(importer)) == null ? void 0 : _a.isEntry)) {
+            importeeQuery = browserEntryQuery;
+          } else if (linked && !ssr && !importeeQuery && isMarkoFile(importee)) {
+            importeeQuery = browserQuery;
+          }
         }
         if (importeeQuery) {
           const resolved = importee[0] === "." ? {
@@ -359,7 +350,8 @@ function markoPlugin(opts = {}) {
         }
         return null;
       },
-      async load(id) {
+      async load(rawId) {
+        const id = stripVersionAndTimeStamp(rawId);
         const query = getMarkoQuery(id);
         switch (query) {
           case serverEntryQuery: {
@@ -373,7 +365,8 @@ function markoPlugin(opts = {}) {
         }
         return virtualFiles.get(id) || null;
       },
-      async transform(source, id, ssr) {
+      async transform(source, rawId, ssr) {
+        let id = stripVersionAndTimeStamp(rawId);
         const isSSR = typeof ssr === "object" ? ssr.ssr : ssr;
         const query = getMarkoQuery(id);
         if (query && !query.startsWith(virtualFileQuery)) {
@@ -422,19 +415,71 @@ function markoPlugin(opts = {}) {
           if (linked) {
             cachedSources.set(id, source);
           }
-          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 (!query) {
+            if (/[\\/]node_modules[\\/]/.test(id) && getModuleType(id) === "cjs") {
+              const { ast } = await compiler.compile(source, id, {
+                cache,
+                ast: true,
+                code: false,
+                output: "source",
+                sourceMaps: false
+              });
+              let namedExports = "";
+              let code2 = `import { createRequire } from "module";
+`;
+              code2 += `import "@marko/compiler/register.js";
+`;
+              code2 += `const mod = createRequire(import.meta.url)(${JSON.stringify(
+                id
+              )});
+`;
+              for (const child of ast.program.body) {
+                switch (child.type) {
+                  case "ExportAllDeclaration":
+                    code2 += `export * from ${JSON.stringify(
+                      child.source.value
+                    )};
+`;
+                    break;
+                  case "ExportNamedDeclaration":
+                    if (child.specifiers) {
+                      for (const specifier of child.specifiers) {
+                        if (specifier.exported.type === "Identifier") {
+                          namedExports += `${specifier.exported.name},`;
+                        } else {
+                          namedExports += `mod[${JSON.stringify(
+                            specifier.exported.value
+                          )}] as ${specifier.exported.value},`;
+                        }
+                      }
+                    }
+                    if (child.declaration) {
+                      if ("id" in child.declaration && child.declaration.id) {
+                        if (child.declaration.id.type === "Identifier") {
+                          namedExports += `${child.declaration.id.name},`;
+                        } else {
+                          namedExports += `mod[${JSON.stringify(
+                            child.declaration.id.value
+                          )}] as ${child.declaration.id.value},`;
+                        }
+                      }
+                      if ("declarations" in child.declaration) {
+                        for (const declaration of child.declaration.declarations) {
+                          if (declaration.id.type === "Identifier") {
+                            namedExports += `${declaration.id.name},`;
+                          }
+                        }
+                      }
+                    }
+                    break;
+                }
+              }
+              code2 += `export const { ${namedExports} } = mod;
+`;
+              code2 += `export default mod.default;
+`;
+              return code2;
+            }
           }
         }
         const compiled = await compiler.compile(
@@ -630,58 +675,17 @@ function getModuleType(file) {
   }
   return "esm";
 }
-let requireHookInstalled = false;
-async function createEsmWrapper(url, exports) {
-  if (!requireHookInstalled) {
-    await import("@marko/compiler/register.js");
-    requireHookInstalled = true;
-  }
-  let code = `import { createRequire } from 'module';
-const mod = createRequire(import.meta.url)('${url}');
-`;
-  let namedExports;
-  for (const name of exports) {
-    if (name === "default") {
-      code += "export default mod.default;\n";
-    } else if (namedExports) {
-      namedExports += `, ${name}`;
-    } else {
-      namedExports = name;
-    }
-  }
-  if (namedExports) {
-    code += `export const { ${namedExports} } = mod;
-`;
-  }
-  return code;
-}
-function getExportIdentifiers(ast) {
-  const exports = /* @__PURE__ */ new Set();
-  for (const node of ast.program.body) {
-    switch (node.type) {
-      case "ExportDefaultDeclaration":
-      case "MarkoTag":
-        exports.add("default");
-        break;
-      case "ExportNamedDeclaration":
-        if (node.declaration) {
-          for (const declarator of node.declaration.declarations) {
-            exports.add(declarator.id.name);
-          }
-        }
-        for (const specifier of node.specifiers) {
-          if (specifier.type !== "ExportSpecifier") {
-            exports.add(specifier.exported.name);
-          }
-        }
-        break;
-      case "ExportAllDeclaration":
-        throw new Error(
-          'Re-exporting using `export * from "..."` is not supported.'
-        );
-    }
-  }
-  return exports;
+function stripVersionAndTimeStamp(id) {
+  const queryStart = id.indexOf("?");
+  if (queryStart === -1)
+    return id;
+  const url = id.slice(0, queryStart);
+  const query = id.slice(queryStart + 1).replace(/(?:^|[&])[vt]=[^&]/g, "");
+  if (query)
+    return `${url}?${query}`;
+  return url;
 }
 // Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+0 && (module.exports = {
+  ...require("./store")
+});

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import {
   esbuildPlugin
-} from "./chunk-KRSZ5IRT.mjs";
+} from "./chunk-HR4PYNIR.mjs";
 import {
   generateDocManifest,
   generateInputDoc
@@ -23,7 +23,6 @@ import path from "path";
 import crypto from "crypto";
 import anyMatch from "anymatch";
 import { pathToFileURL, fileURLToPath } from "url";
-import { relativeImportPath } from "relative-import-path";
 var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
 var normalizePath = path.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
@@ -46,6 +45,7 @@ var babelCaller = {
   supportsTopLevelAwait: true,
   supportsExportNamespaceFrom: true
 };
+var registeredTag = false;
 function markoPlugin(opts = {}) {
   let compiler;
   let { linked = true } = opts;
@@ -77,10 +77,8 @@ function markoPlugin(opts = {}) {
   let isBuild = false;
   let isSSRBuild = false;
   let devServer;
-  let registeredTag = false;
   let serverManifest;
   let store;
-  let CJSTemplates;
   let basePath = "/";
   const entryIds = /* @__PURE__ */ new Set();
   const cachedSources = /* @__PURE__ */ new Map();
@@ -92,7 +90,7 @@ function markoPlugin(opts = {}) {
       enforce: "pre",
       // Must be pre to allow us to resolve assets before vite.
       async config(config, env) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
         runtimeId = opts.runtimeId;
         basePathVar = opts.basePathVar;
@@ -145,8 +143,15 @@ function markoPlugin(opts = {}) {
         );
         if (isTest) {
           linked = false;
+          if ((_b = (_a = config.test) == null ? void 0 : _a.environment) == null ? void 0 : _b.includes(
+            "dom"
+          )) {
+            config.resolve ?? (config.resolve = {});
+            (_c = config.resolve).conditions ?? (_c.conditions = []);
+            config.resolve.conditions.push("browser");
+          }
         }
-        if (linked && !registeredTag) {
+        if (!registeredTag) {
           const transformer = path.resolve(
             thisFile,
             "../render-assets-transform"
@@ -160,49 +165,33 @@ function markoPlugin(opts = {}) {
             "<body>": { transformer }
           });
         }
-        const lookup = compiler.taglib.buildLookup(root);
-        const taglibDeps = [];
-        const optimizeTaglibDeps = [];
-        for (const name in lookup.taglibsById) {
-          const taglib = lookup.taglibsById[name];
-          if (!/^marko-(.+-)?core$/.test(taglib.id) && /[\\/]node_modules[\\/]/.test(taglib.dirname)) {
-            let isEsm;
-            for (const tagName in taglib.tags) {
-              const tag = taglib.tags[tagName];
-              const entry = tag.template || tag.renderer;
-              if (entry) {
-                const relativePath = relativeImportPath(devEntryFile, entry);
-                taglibDeps.push(relativePath);
-                if (isTest || isBuild || (isEsm ?? (isEsm = getModuleType(taglib.path) === "esm"))) {
-                  optimizeTaglibDeps.push(relativePath);
-                } else {
-                  (CJSTemplates ?? (CJSTemplates = /* @__PURE__ */ new Set())).add(normalizePath(entry));
-                }
-              }
-            }
-          }
-        }
         const optimizeDeps = config.optimizeDeps ?? (config.optimizeDeps = {});
-        optimizeDeps.include = Array.from(
-          /* @__PURE__ */ new Set([
-            ...optimizeDeps.include || [],
-            ...compiler.getRuntimeEntryFiles("dom", opts.translator),
-            ...compiler.getRuntimeEntryFiles("html", opts.translator),
-            ...optimizeTaglibDeps
-          ])
-        );
+        optimizeDeps.entries ?? (optimizeDeps.entries = [
+          "**/*.marko",
+          "!**/__snapshots__/**",
+          `!**/__tests__/**`,
+          `!**/coverage/**`
+        ]);
+        const domDeps = compiler.getRuntimeEntryFiles("dom", opts.translator);
+        optimizeDeps.include = optimizeDeps.include ? [...optimizeDeps.include, ...domDeps] : domDeps;
         const optimizeExtensions = optimizeDeps.extensions ?? (optimizeDeps.extensions = []);
         optimizeExtensions.push(".marko");
         const esbuildOptions = optimizeDeps.esbuildOptions ?? (optimizeDeps.esbuildOptions = {});
         const esbuildPlugins = esbuildOptions.plugins ?? (esbuildOptions.plugins = []);
         esbuildPlugins.push(esbuildPlugin(compiler, baseConfig));
         const ssr = config.ssr ?? (config.ssr = {});
-        if (ssr.noExternal !== true) {
-          ssr.noExternal = Array.from(
-            new Set(
-              taglibDeps.concat(ssr.noExternal || [])
-            )
-          );
+        let { noExternal } = ssr;
+        if (noExternal !== true) {
+          const noExternalReg = /\.marko$/;
+          if (noExternal) {
+            if (Array.isArray(noExternal)) {
+              noExternal.push(noExternalReg);
+            } else {
+              noExternal = [noExternal, noExternalReg];
+            }
+          } else {
+            noExternal = noExternalReg;
+          }
         }
         if (basePathVar) {
           config.experimental ?? (config.experimental = {});
@@ -211,7 +200,7 @@ function markoPlugin(opts = {}) {
               "Cannot use @marko/vite `basePathVar` with Vite's `renderBuiltUrl` option."
             );
           }
-          const assetsDir = ((_b = (_a = config.build) == null ? void 0 : _a.assetsDir) == null ? void 0 : _b.replace(/[/\\]$/, "")) ?? "assets";
+          const assetsDir = ((_e = (_d = config.build) == null ? void 0 : _d.assetsDir) == null ? void 0 : _e.replace(/[/\\]$/, "")) ?? "assets";
           const assetsDirLen = assetsDir.length;
           const assetsDirEnd = assetsDirLen + 1;
           const trimAssertsDir = (fileName) => {
@@ -304,13 +293,15 @@ function markoPlugin(opts = {}) {
         let importeeQuery = getMarkoQuery(importee);
         if (importeeQuery) {
           importee = importee.slice(0, -importeeQuery.length);
-        } else if (ssr && linked && importer && (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, ""))) {
-          importeeQuery = serverEntryQuery;
-        } else if (!ssr && isBuild && importer && isMarkoFile(importee) && ((_a = this.getModuleInfo(importer)) == null ? void 0 : _a.isEntry)) {
-          importeeQuery = browserEntryQuery;
-        } else if (linked && !ssr && !importeeQuery && isMarkoFile(importee)) {
-          importeeQuery = browserQuery;
+        } else if (!importOpts.scan) {
+          if (ssr && linked && importer && (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, ""))) {
+            importeeQuery = serverEntryQuery;
+          } else if (!ssr && isBuild && importer && isMarkoFile(importee) && ((_a = this.getModuleInfo(importer)) == null ? void 0 : _a.isEntry)) {
+            importeeQuery = browserEntryQuery;
+          } else if (linked && !ssr && !importeeQuery && isMarkoFile(importee)) {
+            importeeQuery = browserQuery;
+          }
         }
         if (importeeQuery) {
           const resolved = importee[0] === "." ? {
@@ -339,7 +330,8 @@ function markoPlugin(opts = {}) {
         }
         return null;
       },
-      async load(id) {
+      async load(rawId) {
+        const id = stripVersionAndTimeStamp(rawId);
         const query = getMarkoQuery(id);
         switch (query) {
           case serverEntryQuery: {
@@ -353,7 +345,8 @@ function markoPlugin(opts = {}) {
         }
         return virtualFiles.get(id) || null;
       },
-      async transform(source, id, ssr) {
+      async transform(source, rawId, ssr) {
+        let id = stripVersionAndTimeStamp(rawId);
         const isSSR = typeof ssr === "object" ? ssr.ssr : ssr;
         const query = getMarkoQuery(id);
         if (query && !query.startsWith(virtualFileQuery)) {
@@ -402,19 +395,71 @@ function markoPlugin(opts = {}) {
           if (linked) {
             cachedSources.set(id, source);
           }
-          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 (!query) {
+            if (/[\\/]node_modules[\\/]/.test(id) && getModuleType(id) === "cjs") {
+              const { ast } = await compiler.compile(source, id, {
+                cache,
+                ast: true,
+                code: false,
+                output: "source",
+                sourceMaps: false
+              });
+              let namedExports = "";
+              let code2 = `import { createRequire } from "module";
+`;
+              code2 += `import "@marko/compiler/register.js";
+`;
+              code2 += `const mod = createRequire(import.meta.url)(${JSON.stringify(
+                id
+              )});
+`;
+              for (const child of ast.program.body) {
+                switch (child.type) {
+                  case "ExportAllDeclaration":
+                    code2 += `export * from ${JSON.stringify(
+                      child.source.value
+                    )};
+`;
+                    break;
+                  case "ExportNamedDeclaration":
+                    if (child.specifiers) {
+                      for (const specifier of child.specifiers) {
+                        if (specifier.exported.type === "Identifier") {
+                          namedExports += `${specifier.exported.name},`;
+                        } else {
+                          namedExports += `mod[${JSON.stringify(
+                            specifier.exported.value
+                          )}] as ${specifier.exported.value},`;
+                        }
+                      }
+                    }
+                    if (child.declaration) {
+                      if ("id" in child.declaration && child.declaration.id) {
+                        if (child.declaration.id.type === "Identifier") {
+                          namedExports += `${child.declaration.id.name},`;
+                        } else {
+                          namedExports += `mod[${JSON.stringify(
+                            child.declaration.id.value
+                          )}] as ${child.declaration.id.value},`;
+                        }
+                      }
+                      if ("declarations" in child.declaration) {
+                        for (const declaration of child.declaration.declarations) {
+                          if (declaration.id.type === "Identifier") {
+                            namedExports += `${declaration.id.name},`;
+                          }
+                        }
+                      }
+                    }
+                    break;
+                }
+              }
+              code2 += `export const { ${namedExports} } = mod;
+`;
+              code2 += `export default mod.default;
+`;
+              return code2;
+            }
           }
         }
         const compiled = await compiler.compile(
@@ -610,58 +655,15 @@ function getModuleType(file) {
   }
   return "esm";
 }
-var requireHookInstalled = false;
-async function createEsmWrapper(url, exports) {
-  if (!requireHookInstalled) {
-    await import("@marko/compiler/register.js");
-    requireHookInstalled = true;
-  }
-  let code = `import { createRequire } from 'module';
-const mod = createRequire(import.meta.url)('${url}');
-`;
-  let namedExports;
-  for (const name of exports) {
-    if (name === "default") {
-      code += "export default mod.default;\n";
-    } else if (namedExports) {
-      namedExports += `, ${name}`;
-    } else {
-      namedExports = name;
-    }
-  }
-  if (namedExports) {
-    code += `export const { ${namedExports} } = mod;
-`;
-  }
-  return code;
-}
-function getExportIdentifiers(ast) {
-  const exports = /* @__PURE__ */ new Set();
-  for (const node of ast.program.body) {
-    switch (node.type) {
-      case "ExportDefaultDeclaration":
-      case "MarkoTag":
-        exports.add("default");
-        break;
-      case "ExportNamedDeclaration":
-        if (node.declaration) {
-          for (const declarator of node.declaration.declarations) {
-            exports.add(declarator.id.name);
-          }
-        }
-        for (const specifier of node.specifiers) {
-          if (specifier.type !== "ExportSpecifier") {
-            exports.add(specifier.exported.name);
-          }
-        }
-        break;
-      case "ExportAllDeclaration":
-        throw new Error(
-          'Re-exporting using `export * from "..."` is not supported.'
-        );
-    }
-  }
-  return exports;
+function stripVersionAndTimeStamp(id) {
+  const queryStart = id.indexOf("?");
+  if (queryStart === -1)
+    return id;
+  const url = id.slice(0, queryStart);
+  const query = id.slice(queryStart + 1).replace(/(?:^|[&])[vt]=[^&]/g, "");
+  if (query)
+    return `${url}?${query}`;
+  return url;
 }
 export {
   FileStore,

package/dist/render-assets-transform.js

@@ -39,5 +39,3 @@ function renderAssetsCall(t, slot) {
     false
   );
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/serializer.js

@@ -125,5 +125,3 @@ function stripBasePath(basePath, path) {
     return path.slice(basePath.length);
   return path;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/server-entry-template.js

@@ -55,5 +55,3 @@ $ out.global.___viteBaseVar = ${JSON.stringify(
 <_vite${base} slot="body"/>
 `;
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/store/file-store.js

@@ -89,5 +89,3 @@ async function getTempDir(id) {
   }
   throw new Error("Unable to create temp directory");
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/store/memory-store.js

@@ -36,5 +36,3 @@ class MemoryStore {
     this._store.set(key, value);
   }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/package.json

@@ -1,47 +1,46 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {
     "anymatch": "^3.1.3",
     "domelementtype": "^2.3.0",
     "domhandler": "^5.0.3",
-    "htmlparser2": "^8.0.1",
-    "relative-import-path": "^1.0.0"
+    "htmlparser2": "^9.0.0"
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.8",
-    "@changesets/cli": "^2.26.0",
-    "@marko/compiler": "^5.23.0",
-    "@marko/fixture-snapshots": "^2.1.7",
-    "@marko/testing-library": "^6.1.2",
-    "@types/jsdom": "^20.0.1",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^18.11.18",
-    "@types/serve-handler": "^6.1.1",
-    "@typescript-eslint/eslint-plugin": "^5.48.0",
-    "@typescript-eslint/parser": "^5.48.0",
+    "@changesets/cli": "^2.26.2",
+    "@marko/compiler": "^5.33.2",
+    "@marko/fixture-snapshots": "^2.2.1",
+    "@marko/testing-library": "^6.1.4",
+    "@types/jsdom": "^21.1.3",
+    "@types/mocha": "^10.0.2",
+    "@types/node": "^20.8.2",
+    "@types/serve-handler": "^6.1.2",
+    "@typescript-eslint/eslint-plugin": "^6.7.4",
+    "@typescript-eslint/parser": "^6.7.4",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.16.14",
-    "eslint": "^8.31.0",
-    "eslint-config-prettier": "^8.6.0",
-    "fast-glob": "^3.2.12",
+    "esbuild": "^0.19.4",
+    "eslint": "^8.50.0",
+    "eslint-config-prettier": "^9.0.0",
+    "fast-glob": "^3.3.1",
     "fixpack": "^4.0.0",
     "husky": "^8.0.3",
-    "jsdom": "^20.0.3",
-    "lint-staged": "^13.1.0",
-    "marko": "^5.22.0",
+    "jsdom": "^22.1.0",
+    "lint-staged": "^14.0.1",
+    "marko": "^5.31.11",
     "mocha": "^10.2.0",
     "mocha-snap": "^5.0.0",
     "nyc": "^15.1.0",
-    "playwright": "^1.29.1",
-    "prettier": "^2.8.1",
+    "playwright": "^1.38.1",
+    "prettier": "^2.8.8",
     "serve-handler": "^6.1.5",
-    "tsx": "^3.12.1",
-    "typescript": "^4.9.4",
-    "vite": "^4.0.4"
+    "tsx": "^3.13.0",
+    "typescript": "^5.2.2",
+    "vite": "^4.4.11"
   },
   "exports": {
     ".": {
@@ -69,7 +68,7 @@
   "module": "./dist/index.mjs",
   "peerDependencies": {
     "@marko/compiler": "^5",
-    "vite": "^2 || ^3 || ^4"
+    "vite": "^2 || ^3 || ^4 || ^5"
   },
   "repository": {
     "type": "git",