@marko/vite 3.1.5 → 4.0.0

package/dist/manifest-generator.d.ts

@@ -1,7 +1,7 @@
 import serialize from "./serializer";
 type SerializedOrNull = null | ReturnType<typeof serialize>;
 export interface DocManifest {
-    entries: string[];
+    preload: string[];
     "head-prepend": SerializedOrNull;
     head: SerializedOrNull;
     "body-prepend": SerializedOrNull;

package/dist/read-once-persisted-store.d.ts

@@ -0,0 +1,6 @@
+export declare class ReadOncePersistedStore<T> {
+    private uid;
+    constructor(uid: string);
+    write(value: T): void;
+    read(): Promise<T>;
+}

package/dist/render-assets-runtime.d.ts

@@ -0,0 +1,6 @@
+export declare const renderAssetsRuntimeId = "\0marko-render-assets.mjs";
+export declare function getRenderAssetsRuntime(opts: {
+    isBuild: boolean;
+    runtimeId?: string;
+    basePathVar?: string;
+}): string;

package/dist/serializer.d.ts

@@ -3,5 +3,5 @@ declare enum InjectType {
     AssetAttrs = 0,
     PublicPath = 1
 }
-export default function serialize(basePath: string, nodes: Node[], entries: string[], parts?: (string | InjectType)[]): (string | InjectType)[];
+export default function serialize(basePath: string, nodes: Node[], preload: string[], parts?: (string | InjectType)[]): (string | InjectType)[];
 export {};

package/dist/server-entry-template.d.ts

@@ -1,6 +1,6 @@
 declare const _default: (opts: {
     fileName: string;
-    entryData: string;
+    entryData: string[];
     runtimeId?: string;
     basePathVar?: string;
 }) => Promise<string>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "3.1.5",
+  "version": "4.0.0",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {
@@ -15,44 +15,35 @@
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.8",
     "@changesets/cli": "^2.26.2",
-    "@marko/compiler": "^5.33.2",
+    "@marko/compiler": "^5.33.7",
     "@marko/fixture-snapshots": "^2.2.1",
     "@marko/testing-library": "^6.1.4",
-    "@types/babel__core": "^7.20.3",
-    "@types/jsdom": "^21.1.3",
-    "@types/mocha": "^10.0.2",
-    "@types/node": "^20.8.2",
-    "@types/resolve": "^1.20.4",
-    "@types/serve-handler": "^6.1.2",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^6.7.4",
+    "@types/babel__core": "^7.20.4",
+    "@types/jsdom": "^21.1.5",
+    "@types/mocha": "^10.0.4",
+    "@types/node": "^20.9.0",
+    "@types/resolve": "^1.20.5",
+    "@types/serve-handler": "^6.1.4",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.19.4",
-    "eslint": "^8.50.0",
+    "esbuild": "^0.19.5",
+    "eslint": "^8.53.0",
     "eslint-config-prettier": "^9.0.0",
-    "fast-glob": "^3.3.1",
     "fixpack": "^4.0.0",
     "husky": "^8.0.3",
     "jsdom": "^22.1.0",
-    "lint-staged": "^14.0.1",
-    "marko": "^5.31.11",
+    "lint-staged": "^15.0.2",
+    "marko": "^5.31.17",
     "mocha": "^10.2.0",
     "mocha-snap": "^5.0.0",
     "nyc": "^15.1.0",
-    "playwright": "^1.38.1",
-    "prettier": "^2.8.8",
+    "playwright": "^1.39.0",
+    "prettier": "^3.0.3",
     "serve-handler": "^6.1.5",
-    "tsx": "^3.14.0",
+    "tsx": "^4.1.0",
     "typescript": "^5.2.2",
-    "vite": "^4.4.11"
-  },
-  "exports": {
-    ".": {
-      "import": "./dist/index.mjs",
-      "default": "./dist/index.js"
-    },
-    "./dist/components/vite.marko": "./dist/components/vite.marko",
-    "./dist/components/vite-watch.marko": "./dist/components/vite-watch.marko"
+    "vite": "^5.0.0-beta.17"
   },
   "files": [
     "dist",
@@ -68,11 +59,10 @@
     "vite"
   ],
   "license": "MIT",
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "./dist/index.mjs",
   "peerDependencies": {
     "@marko/compiler": "^5",
-    "vite": "^2 || ^3 || ^4 || ^5"
+    "vite": "4 - 5"
   },
   "repository": {
     "type": "git",

package/dist/babel-plugin-cjs-interop.js

@@ -1,117 +0,0 @@
-"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 __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-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 to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var babel_plugin_cjs_interop_exports = {};
-__export(babel_plugin_cjs_interop_exports, {
-  default: () => plugin
-});
-module.exports = __toCommonJS(babel_plugin_cjs_interop_exports);
-var t = __toESM(require("@babel/types"));
-var import_resolve = require("./resolve");
-function plugin(options) {
-  return {
-    name: "marko-import-interop",
-    visitor: {
-      ImportDeclaration(path) {
-        if (!path.node.specifiers.length || /\.(?:mjs|marko)$|\?/.test(path.node.source.value)) {
-          return;
-        }
-        try {
-          const resolved = (0, import_resolve.resolve)(
-            path.node.source.value,
-            path.hub.file.opts.filename,
-            options.extensions,
-            options.conditions
-          );
-          if (!/\.c?js$/.test(resolved) || !(0, import_resolve.isCJSModule)(resolved)) {
-            return;
-          }
-        } catch (_) {
-          return;
-        }
-        let namespaceId;
-        let defaultImportId;
-        let imports;
-        for (const s of path.node.specifiers) {
-          if (t.isImportSpecifier(s)) {
-            (imports || (imports = [])).push({
-              name: t.isStringLiteral(s.imported) ? s.imported.value : s.imported.name,
-              alias: s.local.name
-            });
-          } else if (t.isImportDefaultSpecifier(s)) {
-            defaultImportId = s.local;
-          } else if (t.isImportNamespaceSpecifier(s)) {
-            namespaceId = s.local;
-          }
-        }
-        namespaceId || (namespaceId = path.scope.generateUidIdentifier(
-          (defaultImportId == null ? void 0 : defaultImportId.name) || path.node.source.value
-        ));
-        path.node.specifiers = [t.importDefaultSpecifier(namespaceId)];
-        if (defaultImportId) {
-          path.insertAfter(
-            t.variableDeclaration("const", [
-              t.variableDeclarator(
-                defaultImportId,
-                t.conditionalExpression(
-                  t.optionalMemberExpression(
-                    namespaceId,
-                    t.identifier("__esModule"),
-                    false,
-                    true
-                  ),
-                  t.memberExpression(namespaceId, t.identifier("default")),
-                  namespaceId
-                )
-              )
-            ])
-          );
-        }
-        if (imports) {
-          path.insertAfter(
-            t.variableDeclaration("const", [
-              t.variableDeclarator(
-                t.objectPattern(
-                  imports.map(
-                    ({ name, alias }) => t.objectProperty(
-                      t.identifier(name),
-                      t.identifier(alias),
-                      false,
-                      name === alias
-                    )
-                  )
-                ),
-                namespaceId
-              )
-            ])
-          );
-        }
-      }
-    }
-  };
-}

package/dist/babel-plugin-cjs-interop.mjs

@@ -1,7 +0,0 @@
-import {
-  plugin
-} from "./chunk-4NVOXZG5.mjs";
-import "./chunk-XYEU3RSG.mjs";
-export {
-  plugin as default
-};

package/dist/chunk-2E5QX7AF.mjs

@@ -1,83 +0,0 @@
-import {
-  serialize
-} from "./chunk-NTHVNXFC.mjs";
-
-// src/manifest-generator.ts
-import { Parser } from "htmlparser2";
-import { ElementType } from "domelementtype";
-import { DomHandler } from "domhandler";
-var MARKER_COMMENT = "MARKO_VITE";
-function generateDocManifest(basePath, rawHtml) {
-  return new Promise((resolve, reject) => {
-    const parser = new Parser(
-      new DomHandler(function(err, dom) {
-        if (err) {
-          return reject(err);
-        }
-        const htmlChildren = dom.find(isElement).childNodes;
-        const entries = [];
-        const headPrepend = [];
-        const head = [];
-        const bodyPrepend = [];
-        const body = [];
-        splitNodesByMarker(
-          htmlChildren.find(
-            (node) => isElement(node) && node.tagName === "head"
-          ).childNodes,
-          headPrepend,
-          head
-        );
-        splitNodesByMarker(
-          htmlChildren.find(
-            (node) => isElement(node) && node.tagName === "body"
-          ).childNodes,
-          bodyPrepend,
-          body
-        );
-        resolve({
-          entries,
-          "head-prepend": serializeOrNull(basePath, headPrepend, entries),
-          head: serializeOrNull(basePath, head, entries),
-          "body-prepend": serializeOrNull(basePath, bodyPrepend, entries),
-          body: serializeOrNull(basePath, body, entries)
-        });
-      })
-    );
-    parser.write(rawHtml);
-    parser.end();
-  });
-}
-function generateInputDoc(entry) {
-  return `<!DOCTYPE html><html><head><!--${MARKER_COMMENT}--></head><body><!--${MARKER_COMMENT}--><script async type="module" src=${JSON.stringify(
-    entry
-  )}></script></body></html>`;
-}
-function serializeOrNull(basePath, nodes, entries) {
-  const result = serialize(basePath, nodes, entries);
-  if (result.length) {
-    return result;
-  }
-  return null;
-}
-function splitNodesByMarker(nodes, before, after) {
-  for (let i = 0; i < nodes.length; i++) {
-    let node = nodes[i];
-    if (node.data === MARKER_COMMENT) {
-      i++;
-      for (; i < nodes.length; i++) {
-        node = nodes[i];
-        after.push(node);
-      }
-      break;
-    }
-    before.push(node);
-  }
-}
-function isElement(node) {
-  return node.type === ElementType.Tag;
-}
-
-export {
-  generateDocManifest,
-  generateInputDoc
-};

package/dist/chunk-4NVOXZG5.mjs

@@ -1,93 +0,0 @@
-import {
-  isCJSModule,
-  resolve
-} from "./chunk-XYEU3RSG.mjs";
-
-// src/babel-plugin-cjs-interop.ts
-import * as t from "@babel/types";
-function plugin(options) {
-  return {
-    name: "marko-import-interop",
-    visitor: {
-      ImportDeclaration(path) {
-        if (!path.node.specifiers.length || /\.(?:mjs|marko)$|\?/.test(path.node.source.value)) {
-          return;
-        }
-        try {
-          const resolved = resolve(
-            path.node.source.value,
-            path.hub.file.opts.filename,
-            options.extensions,
-            options.conditions
-          );
-          if (!/\.c?js$/.test(resolved) || !isCJSModule(resolved)) {
-            return;
-          }
-        } catch (_) {
-          return;
-        }
-        let namespaceId;
-        let defaultImportId;
-        let imports;
-        for (const s of path.node.specifiers) {
-          if (t.isImportSpecifier(s)) {
-            (imports || (imports = [])).push({
-              name: t.isStringLiteral(s.imported) ? s.imported.value : s.imported.name,
-              alias: s.local.name
-            });
-          } else if (t.isImportDefaultSpecifier(s)) {
-            defaultImportId = s.local;
-          } else if (t.isImportNamespaceSpecifier(s)) {
-            namespaceId = s.local;
-          }
-        }
-        namespaceId || (namespaceId = path.scope.generateUidIdentifier(
-          (defaultImportId == null ? void 0 : defaultImportId.name) || path.node.source.value
-        ));
-        path.node.specifiers = [t.importDefaultSpecifier(namespaceId)];
-        if (defaultImportId) {
-          path.insertAfter(
-            t.variableDeclaration("const", [
-              t.variableDeclarator(
-                defaultImportId,
-                t.conditionalExpression(
-                  t.optionalMemberExpression(
-                    namespaceId,
-                    t.identifier("__esModule"),
-                    false,
-                    true
-                  ),
-                  t.memberExpression(namespaceId, t.identifier("default")),
-                  namespaceId
-                )
-              )
-            ])
-          );
-        }
-        if (imports) {
-          path.insertAfter(
-            t.variableDeclaration("const", [
-              t.variableDeclarator(
-                t.objectPattern(
-                  imports.map(
-                    ({ name, alias }) => t.objectProperty(
-                      t.identifier(name),
-                      t.identifier(alias),
-                      false,
-                      name === alias
-                    )
-                  )
-                ),
-                namespaceId
-              )
-            ])
-          );
-        }
-      }
-    }
-  };
-}
-
-export {
-  plugin
-};

package/dist/chunk-6IJ5UJ3N.mjs

@@ -1,29 +0,0 @@
-// src/server-entry-template.ts
-import path from "path";
-var server_entry_template_default = async (opts) => {
-  const fileNameStr = JSON.stringify(`./${path.basename(opts.fileName)}`);
-  const base = opts.basePathVar ? ` base=${opts.basePathVar}` : "";
-  return `import template from ${fileNameStr};
-export * from ${fileNameStr};
-${opts.basePathVar ? `
-static if (typeof ${opts.basePathVar} !== "string") throw new Error("${opts.basePathVar} must be defined when using basePathVar.");
-static if (!${opts.basePathVar}.endsWith("/")) throw new Error("${opts.basePathVar} must end with a '/' when using basePathVar.");
-` : ""}${opts.runtimeId ? `$ out.global.runtimeId = ${JSON.stringify(opts.runtimeId)};
-$ out.global.___viteBaseVar = ${JSON.stringify(
-    "$mbp_" + opts.runtimeId
-  )};
-` : `$ out.global.___viteBaseVar = "$mbp";
-`}$ (out.global.___viteEntries || (out.global.___viteEntries = [])).push(${opts.entryData});
-<_vite${base} slot="head-prepend"/>
-<_vite${base} slot="head"/>
-<_vite${base} slot="body-prepend"/>
-<\${template} ...input/>
-<init-components/>
-<await-reorderer/>
-<_vite${base} slot="body"/>
-`;
-};
-
-export {
-  server_entry_template_default
-};

package/dist/chunk-DCBMHGK4.mjs

@@ -1,20 +0,0 @@
-// src/store/memory-store.ts
-var MemoryStore = class {
-  _store;
-  constructor() {
-    this._store = /* @__PURE__ */ new Map();
-  }
-  async has(key) {
-    return Promise.resolve(this._store.has(key));
-  }
-  async get(key) {
-    return Promise.resolve(this._store.get(key));
-  }
-  async set(key, value) {
-    this._store.set(key, value);
-  }
-};
-
-export {
-  MemoryStore
-};

package/dist/chunk-FCWFM7VD.mjs

@@ -1,63 +0,0 @@
-// src/store/file-store.ts
-import path from "path";
-import fs from "fs";
-import os from "os";
-var FileStore = class {
-  _id;
-  _temp;
-  _cache;
-  constructor(id) {
-    this._id = id;
-    this._cache = /* @__PURE__ */ new Map();
-  }
-  async _getKeyPath(key) {
-    this._temp ?? (this._temp = getTempDir(this._id));
-    return path.join(await this._temp, key);
-  }
-  async has(key) {
-    if (!this._cache.has(key)) {
-      const path2 = await this._getKeyPath(key);
-      try {
-        await fs.promises.access(path2);
-      } catch (e) {
-        return false;
-      }
-    }
-    return true;
-  }
-  async get(key) {
-    let value = this._cache.get(key);
-    if (value === void 0) {
-      const path2 = await this._getKeyPath(key);
-      try {
-        value = await fs.promises.readFile(path2, "utf-8");
-      } catch (e) {
-        return void 0;
-      }
-      this._cache.set(key, value);
-    }
-    return value;
-  }
-  async set(key, value) {
-    this._cache.set(key, value);
-    const path2 = await this._getKeyPath(key);
-    await fs.promises.writeFile(path2, value, "utf-8");
-  }
-};
-async function getTempDir(id) {
-  const dir = path.join(os.tmpdir(), id);
-  try {
-    const stat = await fs.promises.stat(dir);
-    if (stat.isDirectory()) {
-      return dir;
-    }
-  } catch {
-    await fs.promises.mkdir(dir);
-    return dir;
-  }
-  throw new Error("Unable to create temp directory");
-}
-
-export {
-  FileStore
-};

package/dist/chunk-HR4PYNIR.mjs

@@ -1,85 +0,0 @@
-// src/esbuild-plugin.ts
-import fs from "fs";
-import path from "path";
-var markoErrorRegExp = /^(.+?)(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
-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: isScan ? "hydrate" : platform === "browser" ? "dom" : "html",
-        resolveVirtualDependency(from, dep) {
-          virtualFiles.set(path.join(from, "..", dep.virtualPath), dep);
-          return dep.virtualPath;
-        }
-      };
-      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(
-            args.path,
-            finalConfig
-          );
-          return {
-            loader: "js",
-            contents: code,
-            watchFiles: meta.watchFiles,
-            resolveDir: path.dirname(args.path)
-          };
-        } catch (e) {
-          const text = e.message;
-          const errors = [];
-          let match;
-          let lines;
-          while (match = markoErrorRegExp.exec(text)) {
-            const [, file, rawLine, rawCol, text2] = match;
-            const line = parseInt(rawLine, 10) || 1;
-            const column = parseInt(rawCol, 10) || 1;
-            lines || (lines = (await fs.promises.readFile(args.path, "utf-8")).split(
-              /\n/g
-            ));
-            errors.push({
-              text: text2,
-              location: {
-                file,
-                line,
-                column,
-                lineText: ` ${lines[line - 1]}`
-              }
-            });
-          }
-          if (!errors.length) {
-            errors.push({ text });
-          }
-          return {
-            errors
-          };
-        }
-      });
-    }
-  };
-}
-
-export {
-  esbuildPlugin
-};