@marko/vite 2.3.3 → 2.3.6

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 eBay Inc. and contributors
+Copyright (c) 2022 eBay Inc. and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/{chunk-LBJFIET7.mjs → chunk-Z64RCGRQ.mjs}

@@ -1,8 +1,3 @@
-import {
-  __spreadProps,
-  __spreadValues
-} from "./chunk-SOEV5HRE.mjs";
-
 // src/esbuild-plugin.ts
 import fs from "fs";
 import path from "path";
@@ -13,13 +8,14 @@ function esbuildPlugin(compiler, config) {
     async setup(build) {
       const { platform = "browser" } = build.initialOptions;
       const virtualFiles = /* @__PURE__ */ new Map();
-      const finalConfig = __spreadProps(__spreadValues({}, config), {
+      const finalConfig = {
+        ...config,
         output: 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 {

package/dist/components/vite.marko

@@ -5,27 +5,30 @@ static function renderAssets(slot) {
   if (entries) {
     const slotWrittenEntriesKey = `___viteWrittenEntries-${slot}`;
     const lastWrittenEntry = this[slotWrittenEntriesKey] || 0;
-    const writtenEntries = this[slotWrittenEntriesKey] = entries.length;
-  
+    const writtenEntries = (this[slotWrittenEntriesKey] = entries.length);
+
     for (let i = lastWrittenEntry; i < writtenEntries; i++) {
-      const manifest = __MARKO_MANIFEST__[entries[i]];
-      const slotHtml = manifest && manifest[slot] && manifest[slot].join(this.___viteInjectAttrs);
+      const entry = entries[i];
+      const parts = typeof __MARKO_MANIFEST__ === "object"
+        ? __MARKO_MANIFEST__[entry]?.[slot]
+        : entry[slot];
 
-      if (slotHtml) {
-        html += slotHtml;
+      if (parts) {
+        html += parts.join(this.___viteInjectAttrs);
       }
     }
   }
 
   return html;
 }
-
 $ const $global = out.global;
 $ if (!$global.___viteRenderAssets) {
-  $global.___viteInjectAttrs = $global.cspNonce ? ` nonce="${$global.cspNonce.replace(/"/g, "&#39;")}"` : "";
+  $global.___viteInjectAttrs = $global.cspNonce
+    ? ` nonce="${$global.cspNonce.replace(/"/g, "&#39;")}"`
+    : "";
   $global.___viteRenderAssets = renderAssets;
 }
 
 <__flush_here_and_after__>
   $!{$global.___viteRenderAssets(input.slot)}
-</>
+</__flush_here_and_after__>

package/dist/esbuild-plugin.js

@@ -1,51 +1,29 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, copyDefault, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toESM = (module2, isNodeMode) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
-var __toCommonJS = /* @__PURE__ */ ((cache) => {
-  return (module2, temp) => {
-    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
-  };
-})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var esbuild_plugin_exports = {};
 __export(esbuild_plugin_exports, {
   default: () => esbuildPlugin
 });
+module.exports = __toCommonJS(esbuild_plugin_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 const markoErrorRegExp = /^(.+?)(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
@@ -55,13 +33,14 @@ function esbuildPlugin(compiler, config) {
     async setup(build) {
       const { platform = "browser" } = build.initialOptions;
       const virtualFiles = /* @__PURE__ */ new Map();
-      const finalConfig = __spreadProps(__spreadValues({}, config), {
+      const finalConfig = {
+        ...config,
         output: 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 {
@@ -114,6 +93,5 @@ function esbuildPlugin(compiler, config) {
     }
   };
 }
-module.exports = __toCommonJS(esbuild_plugin_exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/esbuild-plugin.mjs

@@ -1,7 +1,6 @@
 import {
   esbuildPlugin
-} from "./chunk-LBJFIET7.mjs";
-import "./chunk-SOEV5HRE.mjs";
+} from "./chunk-Z64RCGRQ.mjs";
 export {
   esbuildPlugin as default
 };

package/dist/index.js

@@ -1,57 +1,36 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, copyDefault, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
-};
-var __toESM = (module2, isNodeMode) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
+  return to;
 };
-var __toCommonJS = /* @__PURE__ */ ((cache2) => {
-  return (module2, temp) => {
-    return cache2 && cache2.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache2 && cache2.set(module2, temp), temp);
-  };
-})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
   default: () => markoPlugin
 });
+module.exports = __toCommonJS(src_exports);
 var import_os = __toESM(require("os"));
 var import_fs = __toESM(require("fs"));
 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"));
@@ -77,15 +56,17 @@ function markoPlugin(opts = {}) {
     runtimeId,
     sourceMaps: true,
     writeVersionComment: false,
-    babelConfig: __spreadProps(__spreadValues({}, opts.babelConfig), {
-      caller: __spreadValues({
+    babelConfig: {
+      ...opts.babelConfig,
+      caller: {
         name: "@marko/vite",
         supportsStaticESM: true,
         supportsDynamicImport: true,
         supportsTopLevelAwait: true,
-        supportsExportNamespaceFrom: true
-      }, (_a = opts.babelConfig) == null ? void 0 : _a.caller)
-    })
+        supportsExportNamespaceFrom: true,
+        ...(_a = opts.babelConfig) == null ? void 0 : _a.caller
+      }
+    }
   };
   const resolveViteVirtualDep = (from, dep) => {
     const query = `${virtualFileQuery}&id=${normalizePath(dep.virtualPath)}`;
@@ -99,18 +80,21 @@ function markoPlugin(opts = {}) {
     virtualFiles.set(id, dep);
     return `./${import_path.default.basename(from) + query}`;
   };
-  const ssrConfig = __spreadProps(__spreadValues({}, baseConfig), {
+  const ssrConfig = {
+    ...baseConfig,
     resolveVirtualDependency: resolveViteVirtualDep,
     output: "html"
-  });
-  const domConfig = __spreadProps(__spreadValues({}, baseConfig), {
+  };
+  const domConfig = {
+    ...baseConfig,
     resolveVirtualDependency: resolveViteVirtualDep,
     output: "dom"
-  });
-  const hydrateConfig = __spreadProps(__spreadValues({}, baseConfig), {
+  };
+  const hydrateConfig = {
+    ...baseConfig,
     resolveVirtualDependency: resolveViteVirtualDep,
     output: "hydrate"
-  });
+  };
   let root;
   let devEntryFile;
   let isBuild = false;
@@ -118,6 +102,7 @@ function markoPlugin(opts = {}) {
   let devServer;
   let registeredTag = false;
   let serverManifest;
+  const devEntryFileSources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
   const transformOptionalFiles = /* @__PURE__ */ new Map();
   return [
@@ -131,9 +116,9 @@ function markoPlugin(opts = {}) {
         devEntryFile = import_path.default.join(root, "index.html");
         isBuild = env.command === "build";
         isSSRBuild = isBuild && linked && Boolean(config.build.ssr);
-        if (!registeredTag) {
+        if (linked && !registeredTag) {
           const transformer = import_path.default.resolve(thisFile, "../render-assets-transform");
-          registeredTag = normalizePath(import_path.default.resolve(thisFile, "../components", isBuild ? "vite.marko" : "vite-watch.marko"));
+          registeredTag = normalizePath(import_path.default.resolve(thisFile, "../components", "vite.marko"));
           compiler.taglib.register("@marko/vite", {
             "<_vite>": { template: registeredTag },
             "<head>": { transformer },
@@ -144,45 +129,48 @@ function markoPlugin(opts = {}) {
         const taglibDeps = [];
         for (const name in lookup.taglibsById) {
           const taglib = lookup.taglibsById[name];
-          if (/[\\/]node_modules[\\/](?!@marko[\\/])/.test(taglib.dirname)) {
+          if (!/^marko-(.+-)?core$/.test(taglib.id) && /[\\/]node_modules[\\/]/.test(taglib.dirname)) {
             for (const tagName in taglib.tags) {
               const tag = taglib.tags[tagName];
               const entry = tag.template || tag.renderer;
               if (entry) {
-                taglibDeps.push(entry.replace(/^.*?[\\/]node_modules[\\/]/, ""));
+                taglibDeps.push((0, import_relative_import_path.relativeImportPath)(devEntryFile, entry));
               }
             }
           }
         }
-        const domDeps = Array.from(new Set(compiler.getRuntimeEntryFiles("dom", opts.translator).concat(taglibDeps)));
         const optimizeDeps = config.optimizeDeps ?? (config.optimizeDeps = {});
-        optimizeDeps.include ?? (optimizeDeps.include = []);
-        optimizeDeps.include = optimizeDeps.include.concat(domDeps);
-        if (!isBuild) {
-          const serverDeps = Array.from(new Set(compiler.getRuntimeEntryFiles("html", opts.translator)));
-          const ssr = config.ssr ?? (config.ssr = {});
-          ssr.external ?? (ssr.external = []);
-          ssr.external = ssr.external.concat(serverDeps);
+        optimizeDeps.include = Array.from(/* @__PURE__ */ new Set([
+          ...optimizeDeps.include || [],
+          ...compiler.getRuntimeEntryFiles("dom", opts.translator),
+          ...compiler.getRuntimeEntryFiles("html", opts.translator),
+          ...taglibDeps
+        ]));
+        const ssr = config.ssr ?? (config.ssr = {});
+        if (ssr.noExternal !== true) {
+          ssr.noExternal = Array.from(new Set(taglibDeps.concat(ssr.noExternal || [])));
         }
-        return __spreadProps(__spreadValues({}, config), {
-          optimizeDeps: __spreadProps(__spreadValues({}, config.optimizeDeps), {
-            extensions: [
-              ".marko",
-              ...((_a2 = config.optimizeDeps) == null ? void 0 : _a2.extensions) || []
-            ],
+        return {
+          ...config,
+          optimizeDeps: {
+            ...config.optimizeDeps,
+            extensions: [".marko", ...((_a2 = config.optimizeDeps) == null ? void 0 : _a2.extensions) || []],
             esbuildOptions: {
               plugins: [
                 (0, import_esbuild_plugin.default)(compiler, baseConfig),
                 ...((_c = (_b = config.optimizeDeps) == null ? void 0 : _b.esbuildOptions) == null ? void 0 : _c.plugins) || []
               ]
             }
-          })
-        });
+          }
+        };
       },
       configureServer(_server) {
         ssrConfig.hot = domConfig.hot = true;
         devServer = _server;
         devServer.watcher.on("all", (type, filename) => {
+          if (type === "unlink") {
+            devEntryFileSources.delete(filename);
+          }
           for (const [id, files] of transformWatchFiles) {
             if ((0, import_anymatch.default)(files, filename)) {
               devServer.watcher.emit("change", id);
@@ -256,6 +244,7 @@ function markoPlugin(opts = {}) {
               serverManifest.entries[entryId] = relativeFileName;
               entryData = JSON.stringify(entryId);
             } else {
+              devEntryFileSources.set(fileName, "");
               entryData = JSON.stringify(await (0, import_manifest_generator.generateDocManifest)(await devServer.transformIndexHtml("/", (0, import_manifest_generator.generateInputDoc)(fileNameToURL(fileName, root)))));
             }
             return (0, import_server_entry_template.default)({
@@ -264,8 +253,19 @@ function markoPlugin(opts = {}) {
               runtimeId
             });
           }
-          case browserEntryQuery:
-            return import_fs.default.promises.readFile(id.slice(0, -browserEntryQuery.length), "utf-8");
+          case browserEntryQuery: {
+            const realId = id.slice(0, -browserEntryQuery.length);
+            if (isBuild) {
+              const {
+                meta: { source }
+              } = await this.load({
+                id: realId,
+                resolveDependencies: false
+              });
+              return source;
+            }
+            return devEntryFileSources.get(realId);
+          }
         }
         return virtualFiles.get(id) || null;
       },
@@ -286,6 +286,9 @@ function markoPlugin(opts = {}) {
         if (!isMarkoFile(id)) {
           return null;
         }
+        if (ssr && !isBuild && devEntryFileSources.has(id)) {
+          devEntryFileSources.set(id, source);
+        }
         const compiled = await compiler.compile(source, id, (typeof ssr === "object" ? ssr.ssr : ssr) ? ssrConfig : query === browserEntryQuery ? hydrateConfig : domConfig);
         const { map, meta } = compiled;
         let { code } = compiled;
@@ -307,7 +310,7 @@ if (import.meta.hot) import.meta.hot.accept();`;
           ]);
           transformWatchFiles.set(id, meta.watchFiles);
         }
-        return { code, map };
+        return { code, map, meta: isBuild ? { source } : void 0 };
       }
     },
     {
@@ -428,6 +431,5 @@ function isEmpty(obj) {
   }
   return true;
 }
-module.exports = __toCommonJS(src_exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import {
   esbuildPlugin
-} from "./chunk-LBJFIET7.mjs";
+} from "./chunk-Z64RCGRQ.mjs";
 import {
   generateDocManifest,
   generateInputDoc
@@ -9,10 +9,6 @@ import "./chunk-VL2HLMVE.mjs";
 import {
   server_entry_template_default
 } from "./chunk-HWRQJHCN.mjs";
-import {
-  __spreadProps,
-  __spreadValues
-} from "./chunk-SOEV5HRE.mjs";
 
 // src/index.ts
 import os from "os";
@@ -21,6 +17,7 @@ import path from "path";
 import crypto from "crypto";
 import anyMatch from "anymatch";
 import { pathToFileURL, fileURLToPath } from "url";
+import { relativeImportPath } from "relative-import-path";
 var normalizePath = path.sep === "\\" ? (id) => id.replace(/\\/g, "/") : (id) => id;
 var virtualFiles = /* @__PURE__ */ new Map();
 var queryReg = /\?marko-.+$/;
@@ -42,15 +39,17 @@ function markoPlugin(opts = {}) {
     runtimeId,
     sourceMaps: true,
     writeVersionComment: false,
-    babelConfig: __spreadProps(__spreadValues({}, opts.babelConfig), {
-      caller: __spreadValues({
+    babelConfig: {
+      ...opts.babelConfig,
+      caller: {
         name: "@marko/vite",
         supportsStaticESM: true,
         supportsDynamicImport: true,
         supportsTopLevelAwait: true,
-        supportsExportNamespaceFrom: true
-      }, (_a = opts.babelConfig) == null ? void 0 : _a.caller)
-    })
+        supportsExportNamespaceFrom: true,
+        ...(_a = opts.babelConfig) == null ? void 0 : _a.caller
+      }
+    }
   };
   const resolveViteVirtualDep = (from, dep) => {
     const query = `${virtualFileQuery}&id=${normalizePath(dep.virtualPath)}`;
@@ -64,18 +63,21 @@ function markoPlugin(opts = {}) {
     virtualFiles.set(id, dep);
     return `./${path.basename(from) + query}`;
   };
-  const ssrConfig = __spreadProps(__spreadValues({}, baseConfig), {
+  const ssrConfig = {
+    ...baseConfig,
     resolveVirtualDependency: resolveViteVirtualDep,
     output: "html"
-  });
-  const domConfig = __spreadProps(__spreadValues({}, baseConfig), {
+  };
+  const domConfig = {
+    ...baseConfig,
     resolveVirtualDependency: resolveViteVirtualDep,
     output: "dom"
-  });
-  const hydrateConfig = __spreadProps(__spreadValues({}, baseConfig), {
+  };
+  const hydrateConfig = {
+    ...baseConfig,
     resolveVirtualDependency: resolveViteVirtualDep,
     output: "hydrate"
-  });
+  };
   let root;
   let devEntryFile;
   let isBuild = false;
@@ -83,6 +85,7 @@ function markoPlugin(opts = {}) {
   let devServer;
   let registeredTag = false;
   let serverManifest;
+  const devEntryFileSources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
   const transformOptionalFiles = /* @__PURE__ */ new Map();
   return [
@@ -96,9 +99,9 @@ function markoPlugin(opts = {}) {
         devEntryFile = path.join(root, "index.html");
         isBuild = env.command === "build";
         isSSRBuild = isBuild && linked && Boolean(config.build.ssr);
-        if (!registeredTag) {
+        if (linked && !registeredTag) {
           const transformer = path.resolve(thisFile, "../render-assets-transform");
-          registeredTag = normalizePath(path.resolve(thisFile, "../components", isBuild ? "vite.marko" : "vite-watch.marko"));
+          registeredTag = normalizePath(path.resolve(thisFile, "../components", "vite.marko"));
           compiler.taglib.register("@marko/vite", {
             "<_vite>": { template: registeredTag },
             "<head>": { transformer },
@@ -109,45 +112,48 @@ function markoPlugin(opts = {}) {
         const taglibDeps = [];
         for (const name in lookup.taglibsById) {
           const taglib = lookup.taglibsById[name];
-          if (/[\\/]node_modules[\\/](?!@marko[\\/])/.test(taglib.dirname)) {
+          if (!/^marko-(.+-)?core$/.test(taglib.id) && /[\\/]node_modules[\\/]/.test(taglib.dirname)) {
             for (const tagName in taglib.tags) {
               const tag = taglib.tags[tagName];
               const entry = tag.template || tag.renderer;
               if (entry) {
-                taglibDeps.push(entry.replace(/^.*?[\\/]node_modules[\\/]/, ""));
+                taglibDeps.push(relativeImportPath(devEntryFile, entry));
               }
             }
           }
         }
-        const domDeps = Array.from(new Set(compiler.getRuntimeEntryFiles("dom", opts.translator).concat(taglibDeps)));
         const optimizeDeps = config.optimizeDeps ?? (config.optimizeDeps = {});
-        optimizeDeps.include ?? (optimizeDeps.include = []);
-        optimizeDeps.include = optimizeDeps.include.concat(domDeps);
-        if (!isBuild) {
-          const serverDeps = Array.from(new Set(compiler.getRuntimeEntryFiles("html", opts.translator)));
-          const ssr = config.ssr ?? (config.ssr = {});
-          ssr.external ?? (ssr.external = []);
-          ssr.external = ssr.external.concat(serverDeps);
+        optimizeDeps.include = Array.from(/* @__PURE__ */ new Set([
+          ...optimizeDeps.include || [],
+          ...compiler.getRuntimeEntryFiles("dom", opts.translator),
+          ...compiler.getRuntimeEntryFiles("html", opts.translator),
+          ...taglibDeps
+        ]));
+        const ssr = config.ssr ?? (config.ssr = {});
+        if (ssr.noExternal !== true) {
+          ssr.noExternal = Array.from(new Set(taglibDeps.concat(ssr.noExternal || [])));
         }
-        return __spreadProps(__spreadValues({}, config), {
-          optimizeDeps: __spreadProps(__spreadValues({}, config.optimizeDeps), {
-            extensions: [
-              ".marko",
-              ...((_a2 = config.optimizeDeps) == null ? void 0 : _a2.extensions) || []
-            ],
+        return {
+          ...config,
+          optimizeDeps: {
+            ...config.optimizeDeps,
+            extensions: [".marko", ...((_a2 = config.optimizeDeps) == null ? void 0 : _a2.extensions) || []],
             esbuildOptions: {
               plugins: [
                 esbuildPlugin(compiler, baseConfig),
                 ...((_c = (_b = config.optimizeDeps) == null ? void 0 : _b.esbuildOptions) == null ? void 0 : _c.plugins) || []
               ]
             }
-          })
-        });
+          }
+        };
       },
       configureServer(_server) {
         ssrConfig.hot = domConfig.hot = true;
         devServer = _server;
         devServer.watcher.on("all", (type, filename) => {
+          if (type === "unlink") {
+            devEntryFileSources.delete(filename);
+          }
           for (const [id, files] of transformWatchFiles) {
             if (anyMatch(files, filename)) {
               devServer.watcher.emit("change", id);
@@ -221,6 +227,7 @@ function markoPlugin(opts = {}) {
               serverManifest.entries[entryId] = relativeFileName;
               entryData = JSON.stringify(entryId);
             } else {
+              devEntryFileSources.set(fileName, "");
               entryData = JSON.stringify(await generateDocManifest(await devServer.transformIndexHtml("/", generateInputDoc(fileNameToURL(fileName, root)))));
             }
             return server_entry_template_default({
@@ -229,8 +236,19 @@ function markoPlugin(opts = {}) {
               runtimeId
             });
           }
-          case browserEntryQuery:
-            return fs.promises.readFile(id.slice(0, -browserEntryQuery.length), "utf-8");
+          case browserEntryQuery: {
+            const realId = id.slice(0, -browserEntryQuery.length);
+            if (isBuild) {
+              const {
+                meta: { source }
+              } = await this.load({
+                id: realId,
+                resolveDependencies: false
+              });
+              return source;
+            }
+            return devEntryFileSources.get(realId);
+          }
         }
         return virtualFiles.get(id) || null;
       },
@@ -251,6 +269,9 @@ function markoPlugin(opts = {}) {
         if (!isMarkoFile(id)) {
           return null;
         }
+        if (ssr && !isBuild && devEntryFileSources.has(id)) {
+          devEntryFileSources.set(id, source);
+        }
         const compiled = await compiler.compile(source, id, (typeof ssr === "object" ? ssr.ssr : ssr) ? ssrConfig : query === browserEntryQuery ? hydrateConfig : domConfig);
         const { map, meta } = compiled;
         let { code } = compiled;
@@ -272,7 +293,7 @@ if (import.meta.hot) import.meta.hot.accept();`;
           ]);
           transformWatchFiles.set(id, meta.watchFiles);
         }
-        return { code, map };
+        return { code, map, meta: isBuild ? { source } : void 0 };
       }
     },
     {

package/dist/manifest-generator.js

@@ -1,35 +1,30 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, copyDefault, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toESM = (module2, isNodeMode) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
-var __toCommonJS = /* @__PURE__ */ ((cache) => {
-  return (module2, temp) => {
-    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
-  };
-})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var manifest_generator_exports = {};
 __export(manifest_generator_exports, {
   generateDocManifest: () => generateDocManifest,
   generateInputDoc: () => generateInputDoc
 });
+module.exports = __toCommonJS(manifest_generator_exports);
 var import_htmlparser2 = require("htmlparser2");
 var import_domelementtype = require("domelementtype");
 var import_domhandler = require("domhandler");
@@ -86,7 +81,6 @@ function splitNodesByMarker(nodes, before, after) {
 function isElement(node) {
   return node.type === import_domelementtype.ElementType.Tag;
 }
-module.exports = __toCommonJS(manifest_generator_exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   generateDocManifest,

package/dist/manifest-generator.mjs

@@ -3,7 +3,6 @@ import {
   generateInputDoc
 } from "./chunk-MPTD6LHF.mjs";
 import "./chunk-VL2HLMVE.mjs";
-import "./chunk-SOEV5HRE.mjs";
 export {
   generateDocManifest,
   generateInputDoc

package/dist/render-assets-transform.js

@@ -1,29 +1,26 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, copyDefault, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toCommonJS = /* @__PURE__ */ ((cache) => {
-  return (module2, temp) => {
-    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
-  };
-})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var render_assets_transform_exports = {};
 __export(render_assets_transform_exports, {
   default: () => render_assets_transform_default
 });
+module.exports = __toCommonJS(render_assets_transform_exports);
 var render_assets_transform_default = (tag, t) => {
   const body = tag.get("body");
   const tagName = tag.get("name").node.value;
@@ -33,6 +30,5 @@ var render_assets_transform_default = (tag, t) => {
 function renderAssetsCall(t, slot) {
   return t.markoPlaceholder(t.callExpression(t.memberExpression(t.memberExpression(t.identifier("out"), t.identifier("global")), t.identifier("___viteRenderAssets")), [t.stringLiteral(slot)]), false);
 }
-module.exports = __toCommonJS(render_assets_transform_exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/render-assets-transform.mjs

@@ -1,5 +1,3 @@
-import "./chunk-SOEV5HRE.mjs";
-
 // src/render-assets-transform.ts
 var render_assets_transform_default = (tag, t) => {
   const body = tag.get("body");

package/dist/serializer.js

@@ -1,29 +1,26 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, copyDefault, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toCommonJS = /* @__PURE__ */ ((cache) => {
-  return (module2, temp) => {
-    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
-  };
-})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var serializer_exports = {};
 __export(serializer_exports, {
   default: () => serialize
 });
+module.exports = __toCommonJS(serializer_exports);
 var import_domelementtype = require("domelementtype");
 const voidElements = /* @__PURE__ */ new Set([
   "area",
@@ -99,6 +96,5 @@ function serialize(nodes, parts) {
   }
   return parts;
 }
-module.exports = __toCommonJS(serializer_exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/serializer.mjs

@@ -1,7 +1,6 @@
 import {
   serialize
 } from "./chunk-VL2HLMVE.mjs";
-import "./chunk-SOEV5HRE.mjs";
 export {
   serialize as default
 };

package/dist/server-entry-template.js

@@ -1,34 +1,29 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, copyDefault, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toESM = (module2, isNodeMode) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
-var __toCommonJS = /* @__PURE__ */ ((cache) => {
-  return (module2, temp) => {
-    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
-  };
-})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var server_entry_template_exports = {};
 __export(server_entry_template_exports, {
   default: () => server_entry_template_default
 });
+module.exports = __toCommonJS(server_entry_template_exports);
 var import_path = __toESM(require("path"));
 var server_entry_template_default = async (opts) => {
   const fileNameStr = JSON.stringify(`./${import_path.default.basename(opts.fileName)}`);
@@ -46,6 +41,5 @@ ${opts.runtimeId ? `$ $global.runtimeId = ${JSON.stringify(opts.runtimeId)};
 <_vite slot="body"/>
 `;
 };
-module.exports = __toCommonJS(server_entry_template_exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/server-entry-template.mjs

@@ -1,7 +1,6 @@
 import {
   server_entry_template_default
 } from "./chunk-HWRQJHCN.mjs";
-import "./chunk-SOEV5HRE.mjs";
 export {
   server_entry_template_default as default
 };

package/package.json

@@ -1,47 +1,47 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "2.3.3",
+  "version": "2.3.6",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {
     "anymatch": "^3.1.2",
-    "domelementtype": "^2.2.0",
-    "domhandler": "^4.3.0",
-    "htmlparser2": "^7.2.0"
+    "domelementtype": "^2.3.0",
+    "domhandler": "^5.0.3",
+    "htmlparser2": "^8.0.1",
+    "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^16.2.1",
-    "@commitlint/config-conventional": "^16.2.1",
-    "@marko/compiler": "^5.19.1",
-    "@marko/fixture-snapshots": "^2.1.6",
-    "@marko/testing-library": "^6.0.0",
+    "@changesets/changelog-github": "^0.4.5",
+    "@changesets/cli": "^2.23.1",
+    "@marko/compiler": "^5.21.6",
+    "@marko/fixture-snapshots": "^2.1.7",
+    "@marko/testing-library": "^6.1.2",
     "@types/jsdom": "^16.2.14",
-    "@types/mocha": "^9.1.0",
-    "@types/node": "^17.0.21",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^18.0.3",
     "@types/serve-handler": "^6.1.1",
-    "@typescript-eslint/eslint-plugin": "^5.14.0",
-    "@typescript-eslint/parser": "^5.14.0",
+    "@typescript-eslint/eslint-plugin": "^5.30.6",
+    "@typescript-eslint/parser": "^5.30.6",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.14.25",
-    "esbuild-register": "^3.3.2",
-    "eslint": "^8.10.0",
+    "esbuild": "^0.14.49",
+    "eslint": "^8.19.0",
     "eslint-config-prettier": "^8.5.0",
     "fast-glob": "^3.2.11",
     "fixpack": "^4.0.0",
-    "husky": "^7.0.4",
+    "husky": "^8.0.1",
     "jsdom": "^19.0.0",
-    "lint-staged": "^12.3.5",
-    "marko": "^5.19.0",
-    "mocha": "^9.2.1",
+    "lint-staged": "^13.0.3",
+    "marko": "^5.21.2",
+    "mocha": "^10.0.0",
     "mocha-snap": "^4.3.0",
     "nyc": "^15.1.0",
-    "playwright": "^1.19.2",
-    "prettier": "^2.5.1",
-    "semantic-release": "^19.0.2",
+    "playwright": "^1.23.2",
+    "prettier": "^2.7.1",
     "serve-handler": "^6.1.3",
-    "typescript": "^4.6.2",
-    "vite": "^2.8.6"
+    "tsx": "^3.7.1",
+    "typescript": "^4.7.4",
+    "vite": "3.0.0-beta.10"
   },
   "exports": {
     ".": {
@@ -69,27 +69,27 @@
   "module": "./dist/index.mjs",
   "peerDependencies": {
     "@marko/compiler": "^5",
-    "vite": "^2"
+    "vite": "^2 || ^3"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/marko-js/vite"
   },
   "scripts": {
-    "build": "tsc -b && node -r esbuild-register build",
-    "ci:test": "nyc npm run mocha -- --forbid-pending --forbid-only",
+    "build": "tsc -b && tsx build.mts",
+    "change": "changeset add",
+    "ci:test": "nyc npm test -- --forbid-only",
     "format": "npm run lint:eslint -- --fix && npm run lint:prettier -- --write && (fixpack || true)",
     "lint": "tsc -b && npm run lint:eslint && npm run lint:prettier -- -l && fixpack",
     "lint:eslint": "eslint -f visualstudio .",
     "lint:prettier": "prettier \"./**/*{.ts,.js,.json,.md,.yml,rc}\"",
-    "mocha": "cross-env NODE_ENV=test mocha \"./src/**/__tests__/*.test.ts\"",
     "prepare": "husky install",
-    "prepublishOnly": "npm run build",
-    "release": "semantic-release",
+    "release": "npm run build && changeset publish",
     "report": "open ./coverage/lcov-report/index.html",
-    "test": "npm run mocha -- --watch",
+    "test": "cross-env NODE_ENV=test mocha \"./src/**/__tests__/*.test.ts\"",
     "test:inspect": "npm test -- --inspect",
-    "test:update": "npm run mocha -- --update"
+    "test:update": "npm test -- --update",
+    "version": "changeset version && npm i --package-lock-only"
   },
   "types": "dist/index.d.ts"
 }

package/dist/chunk-SOEV5HRE.mjs

@@ -1,24 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-
-export {
-  __spreadValues,
-  __spreadProps
-};

package/dist/components/vite-watch.marko

@@ -1,31 +0,0 @@
-static function renderAssets(slot) {
-  const entries = this.___viteEntries;
-  let html = "";
-
-  if (entries) {
-    const slotWrittenEntriesKey = `___viteWrittenEntries-${slot}`;
-    const lastWrittenEntry = this[slotWrittenEntriesKey] || 0;
-    const writtenEntries = this[slotWrittenEntriesKey] = entries.length;
-  
-    for (let i = lastWrittenEntry; i < writtenEntries; i++) {
-      const slotParts = entries[i][slot];
-      const slotHtml = slotParts && slotParts.join(this.___viteInjectAttrs);
-
-      if (slotHtml) {
-        html += slotHtml;
-      }
-    }
-  }
-
-  return html;
-}
-
-$ const $global = out.global;
-$ if (!$global.___viteRenderAssets) {
-  $global.___viteInjectAttrs = $global.cspNonce ? ` nonce="${$global.cspNonce.replace(/"/g, "&#39;")}"` : "";
-  $global.___viteRenderAssets = renderAssets;
-}
-
-<__flush_here_and_after__>
-  $!{$global.___viteRenderAssets(input.slot)}
-</>