@marko/vite 2.0.2 → 2.0.3

package/dist/index.js

@@ -1,56 +1,42 @@
+"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) => {
-  __markAsModule(target);
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && 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 __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
-__export(exports, {
+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
 });
-var import_os = __toModule(require("os"));
-var import_fs = __toModule(require("fs"));
-var import_path = __toModule(require("path"));
-var import_crypto = __toModule(require("crypto"));
-var import_url = __toModule(require("url"));
-var import_anymatch = __toModule(require("anymatch"));
-var import_server_entry_template = __toModule(require("./server-entry-template"));
-var import_manifest_generator = __toModule(require("./manifest-generator"));
+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"));
 const import_meta = {};
-const virtualFiles = new Map();
+const normalizePath = import_path.default.sep === "\\" ? (id) => id.replace(/\\/g, "/") : (id) => id;
+const virtualFiles = /* @__PURE__ */ new Map();
 const queryReg = /\?marko-.+$/;
 const browserEntryQuery = "?marko-browser-entry";
 const serverEntryQuery = "?marko-server-entry";
@@ -58,106 +44,124 @@ const virtualFileQuery = "?marko-virtual";
 const markoExt = ".marko";
 const htmlExt = ".html";
 const resolveOpts = { skipSelf: true };
+const cache = /* @__PURE__ */ new Map();
+const thisFile = typeof __filename === "string" ? __filename : (0, import_url.fileURLToPath)(import_meta.url);
 let tempDir;
 function markoPlugin(opts = {}) {
   var _a;
   let compiler;
   const { runtimeId, linked = true } = opts;
   const baseConfig = {
+    cache,
     runtimeId,
     sourceMaps: true,
     writeVersionComment: false,
-    cache: new Map(),
-    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 ssrConfig = __spreadProps(__spreadValues({}, baseConfig), {
-    output: "html"
-  });
-  const domConfig = __spreadProps(__spreadValues({}, baseConfig), {
-    resolveVirtualDependency(from, dep) {
-      const query = `${virtualFileQuery}&id=${dep.virtualPath}`;
-      const id = from + query;
-      if (devServer) {
-        const prev = virtualFiles.get(id);
-        if (prev && prev.code !== dep.code) {
-          devServer.moduleGraph.invalidateModule(devServer.moduleGraph.getModuleById(id));
-        }
+  const resolveViteVirtualDep = (from, dep) => {
+    const query = `${virtualFileQuery}&id=${normalizePath(dep.virtualPath)}`;
+    const id = normalizePath(from) + query;
+    if (devServer) {
+      const prev = virtualFiles.get(id);
+      if (prev && prev.code !== dep.code) {
+        devServer.moduleGraph.invalidateModule(devServer.moduleGraph.getModuleById(id));
       }
-      virtualFiles.set(id, dep);
-      return `./${import_path.default.basename(from) + query}`;
-    },
+    }
+    virtualFiles.set(id, dep);
+    return `./${import_path.default.basename(from) + query}`;
+  };
+  const ssrConfig = {
+    ...baseConfig,
+    resolveVirtualDependency: resolveViteVirtualDep,
+    output: "html"
+  };
+  const domConfig = {
+    ...baseConfig,
+    resolveVirtualDependency: resolveViteVirtualDep,
     output: "dom"
-  });
-  const hydrateConfig = __spreadProps(__spreadValues({}, domConfig), {
+  };
+  const hydrateConfig = {
+    ...baseConfig,
+    resolveVirtualDependency: resolveViteVirtualDep,
     output: "hydrate"
-  });
+  };
   let root;
+  let devEntryFile;
   let isBuild = false;
   let isSSRBuild = false;
   let devServer;
   let registeredTag = false;
   let serverManifest;
-  const transformWatchFiles = new Map();
-  const transformOptionalFiles = new Map();
+  const transformWatchFiles = /* @__PURE__ */ new Map();
+  const transformOptionalFiles = /* @__PURE__ */ new Map();
   return [
     {
       name: "marko-vite:pre",
       enforce: "pre",
       async config(config, env) {
-        var _a2, _b, _c, _d, _e;
-        compiler != null ? compiler : compiler = await Promise.resolve().then(() => __toModule(require(opts.compiler || "@marko/compiler")));
-        root = config.root || process.cwd();
+        var _a2, _b, _c;
+        compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
+        root = normalizePath(config.root || process.cwd());
+        devEntryFile = import_path.default.join(root, "index.html");
         isBuild = env.command === "build";
         isSSRBuild = isBuild && linked && Boolean(config.build.ssr);
-        if (!registeredTag) {
-          const transformer = import_path.default.resolve(__filename, "../render-assets-transform");
-          registeredTag = import_path.default.resolve(__filename, "../components", isBuild ? "vite.marko" : "vite-watch.marko");
+        if (linked && !registeredTag) {
+          const transformer = import_path.default.resolve(thisFile, "../render-assets-transform");
+          registeredTag = normalizePath(import_path.default.resolve(thisFile, "../components", "vite.marko"));
           compiler.taglib.register("@marko/vite", {
             "<_vite>": { template: registeredTag },
             "<head>": { transformer },
             "<body>": { transformer }
           });
         }
-        if (!isBuild) {
-          const lookup = compiler.taglib.buildLookup(root);
-          const domRuntimeDeps = compiler.getRuntimeEntryFiles("dom", opts.translator);
-          const htmlRuntimeDeps = compiler.getRuntimeEntryFiles("html", opts.translator);
-          const taglibDeps = [];
-          for (const name in lookup.taglibsById) {
-            const taglib = lookup.taglibsById[name];
-            if (/[\\/]node_modules[\\/](?!@marko[\\/])/.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[\\/]/, ""));
-                }
+        const lookup = compiler.taglib.buildLookup(root);
+        const taglibDeps = [];
+        for (const name in lookup.taglibsById) {
+          const taglib = lookup.taglibsById[name];
+          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((0, import_relative_import_path.relativeImportPath)(devEntryFile, entry));
               }
             }
           }
-          const domDeps = Array.from(new Set(domRuntimeDeps.concat(taglibDeps)));
-          const serverDeps = Array.from(new Set(htmlRuntimeDeps.concat(taglibDeps)));
-          const optimizeDeps = (_a2 = config.optimizeDeps) != null ? _a2 : config.optimizeDeps = {};
-          (_b = optimizeDeps.include) != null ? _b : optimizeDeps.include = [];
-          optimizeDeps.include = optimizeDeps.include.concat(domDeps.filter((dep) => import_path.default.extname(dep) !== markoExt));
-          (_c = optimizeDeps.exclude) != null ? _c : optimizeDeps.exclude = [];
-          optimizeDeps.exclude = optimizeDeps.exclude.concat(domDeps.filter((dep) => import_path.default.extname(dep) === markoExt));
-          const ssr = (_d = config.ssr) != null ? _d : config.ssr = {};
-          (_e = ssr.external) != null ? _e : ssr.external = [];
-          ssr.external = ssr.external.concat(serverDeps);
-          (await Promise.resolve().then(() => __toModule(require("@marko/compiler/register")))).default(__spreadProps(__spreadValues({}, ssrConfig), {
-            sourceMaps: "inline",
-            modules: "cjs"
-          }));
         }
+        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),
+          ...taglibDeps
+        ]));
+        const ssr = config.ssr ?? (config.ssr = {});
+        if (ssr.noExternal !== true) {
+          ssr.noExternal = Array.from(new Set(taglibDeps.concat(ssr.noExternal || [])));
+        }
+        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;
@@ -197,63 +201,64 @@ function markoPlugin(opts = {}) {
           }
         }
       },
-      async resolveId(importee, importer, _importOpts, ssr) {
-        const importeeIsAbsolute = import_path.default.isAbsolute(importee);
-        if (!importeeIsAbsolute || importee.startsWith(root)) {
-          let importeeQuery = getMarkoQuery(importee);
-          if (importeeQuery) {
-            importee = importee.slice(0, -importeeQuery.length);
-          } else if (ssr && linked && importer && isMarkoFile(importee) && !isMarkoFile(importer.replace(queryReg, ""))) {
-            importeeQuery = serverEntryQuery;
-          } else if (virtualFiles.has(importee)) {
-            return importee;
-          }
-          if (importeeQuery) {
-            const resolved = importeeIsAbsolute ? { id: importee } : importee[0] === "." ? {
-              id: importer ? import_path.default.resolve(importer, "..", importee) : import_path.default.resolve(root, importee)
-            } : await this.resolve(importee, importer, resolveOpts);
-            if (resolved) {
-              resolved.id += importeeQuery;
-            }
-            return resolved;
+      async resolveId(importee, importer, importOpts, ssr = importOpts.ssr) {
+        var _a2;
+        if (virtualFiles.has(importee)) {
+          return importee;
+        }
+        let importeeQuery = getMarkoQuery(importee);
+        if (importeeQuery) {
+          importee = importee.slice(0, -importeeQuery.length);
+        } else if (ssr && linked && importer && importer !== devEntryFile && isMarkoFile(importee) && !isMarkoFile(importer.replace(queryReg, ""))) {
+          importeeQuery = serverEntryQuery;
+        } else if (!ssr && isBuild && importer && isMarkoFile(importee) && ((_a2 = this.getModuleInfo(importer)) == null ? void 0 : _a2.isEntry)) {
+          importeeQuery = browserEntryQuery;
+        }
+        if (importeeQuery) {
+          const resolved = importee[0] === "." ? {
+            id: normalizePath(importer ? import_path.default.resolve(importer, "..", importee) : import_path.default.resolve(root, importee))
+          } : await this.resolve(importee, importer, resolveOpts);
+          if (resolved) {
+            resolved.id += importeeQuery;
           }
+          return resolved;
         }
         return null;
       },
       async load(id) {
-        const query = getMarkoQuery(id);
-        if (query) {
-          if (!id.startsWith(root)) {
-            id = import_path.default.join(root, id);
-          }
-          switch (query) {
-            case serverEntryQuery: {
-              const fileName = id.slice(0, -serverEntryQuery.length);
-              let entryData;
-              if (isBuild) {
-                const relativeFileName = import_path.default.relative(root, fileName);
-                const entryId = toEntryId(relativeFileName);
-                serverManifest != null ? serverManifest : serverManifest = {
-                  entries: {},
-                  chunksNeedingAssets: []
-                };
-                serverManifest.entries[entryId] = relativeFileName;
-                entryData = JSON.stringify(entryId);
-              } else {
-                entryData = JSON.stringify(await (0, import_manifest_generator.generateDocManifest)(await devServer.transformIndexHtml("/", (0, import_manifest_generator.generateInputDoc)(fileNameToURL(fileName, root) + browserEntryQuery))));
-              }
-              return (0, import_server_entry_template.default)({
-                fileName,
-                entryData,
-                runtimeId
+        switch (getMarkoQuery(id)) {
+          case serverEntryQuery: {
+            const fileName = id.slice(0, -serverEntryQuery.length);
+            let entryData;
+            if (isBuild) {
+              const relativeFileName = import_path.default.posix.relative(root, fileName);
+              const entryId = toEntryId(relativeFileName);
+              serverManifest ?? (serverManifest = {
+                entries: {},
+                chunksNeedingAssets: []
               });
+              serverManifest.entries[entryId] = relativeFileName;
+              entryData = JSON.stringify(entryId);
+            } else {
+              entryData = JSON.stringify(await (0, import_manifest_generator.generateDocManifest)(await devServer.transformIndexHtml("/", (0, import_manifest_generator.generateInputDoc)(fileNameToURL(fileName, root)))));
             }
-            case browserEntryQuery:
-              return import_fs.default.promises.readFile(id.slice(0, -browserEntryQuery.length), "utf-8");
+            return (0, import_server_entry_template.default)({
+              fileName,
+              entryData,
+              runtimeId
+            });
           }
+          case browserEntryQuery:
+            return import_fs.default.promises.readFile(id.slice(0, -browserEntryQuery.length), "utf-8");
         }
         return virtualFiles.get(id) || null;
       },
+      async transformIndexHtml(html) {
+        if (isBuild) {
+          return html;
+        }
+        return html.replace(/(src\s*=\s*(['"])(?:(?!\2).)*\.marko)(?:\?((?:(?!\2).)*))?\2/gim, (_, prefix, quote, query) => prefix + browserEntryQuery + (query ? "&" + query : "") + quote);
+      },
       async transform(source, id, ssr) {
         const query = getMarkoQuery(id);
         if (query && !query.startsWith(virtualFileQuery)) {
@@ -265,7 +270,7 @@ function markoPlugin(opts = {}) {
         if (!isMarkoFile(id)) {
           return null;
         }
-        const compiled = await compiler.compile(source, id, ssr ? ssrConfig : query === browserEntryQuery ? hydrateConfig : domConfig);
+        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;
         if (query !== browserEntryQuery && devServer) {
@@ -321,8 +326,12 @@ if (import.meta.hot) import.meta.hot.accept();`;
           const browserManifest = {};
           for (const entryId in serverManifest.entries) {
             const fileName = serverManifest.entries[entryId];
-            const chunkId = fileName + htmlExt;
-            const chunk = bundle[chunkId];
+            let chunkId = fileName + htmlExt;
+            let chunk = bundle[chunkId];
+            if (!chunk) {
+              chunkId = chunkId.replace(/\//g, "\\");
+              chunk = bundle[chunkId];
+            }
             if ((chunk == null ? void 0 : chunk.type) === "asset") {
               browserManifest[entryId] = await (0, import_manifest_generator.generateDocManifest)(chunk.source.toString());
               delete bundle[chunkId];
@@ -350,10 +359,10 @@ function isMarkoFile(id) {
 function toHTMLEntries(root, serverEntries) {
   const result = [];
   for (const id in serverEntries) {
-    const markoFile = import_path.default.join(root, serverEntries[id]);
+    const markoFile = import_path.default.posix.join(root, serverEntries[id]);
     const htmlFile = markoFile + htmlExt;
     virtualFiles.set(htmlFile, {
-      code: (0, import_manifest_generator.generateInputDoc)(markoFile + browserEntryQuery)
+      code: (0, import_manifest_generator.generateInputDoc)(markoFile)
     });
     result.push(htmlFile);
   }