@marko/vite 2.3.10 → 2.3.11

package/README.md

@@ -118,6 +118,26 @@ marko({ runtimeId: "MY_MARKO_RUNTIME_ID" });
 
 Set this to `false` to opt out of [linked mode](#linked-mode). When this is false, the plugin will only handle resolving and transforming `.marko` files.
 
+### options.store
+
+Storage mechanism to preserve data between SSR and client builds when building in linked mode. Two implementations are available:
+
+- FileStore _(default)_
+
+  ```js
+  import { FileStore } from "@marko/vite";
+  const store = new FileStore();
+  ```
+
+  Reads/writes data to the file system. Use this when running the SSR and client builds in seperate processes such as when using Vite from the command line or npm scripts.
+
+- MemoryStore
+  ```js
+  import { MemoryStore } from "@marko/vite";
+  const store = new MemoryStore();
+  ```
+  Reads/writes data to memory. This option can be used when building with Vite programatically.
+
 ## Code of Conduct
 
 This project adheres to the [eBay Code of Conduct](./.github/CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.

package/dist/chunk-DCBMHGK4.mjs

@@ -0,0 +1,20 @@
+// 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

@@ -0,0 +1,63 @@
+// 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/index.d.ts

@@ -1,10 +1,14 @@
 import type * as vite from "vite";
 import type * as Compiler from "@marko/compiler";
+import { BuildStore } from "./store";
+export * from "./store";
+export type { BuildStore } from "./store";
 export interface Options {
     linked?: boolean;
     compiler?: string;
     runtimeId?: string;
     translator?: string;
     babelConfig?: Compiler.Config["babelConfig"];
+    store?: BuildStore;
 }
 export default function markoPlugin(opts?: Options): vite.Plugin[];

package/dist/index.js

@@ -17,6 +17,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 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-
@@ -31,7 +32,6 @@ __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"));
@@ -41,6 +41,8 @@ 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"));
+var import_store = require("./store");
+__reExport(src_exports, require("./store"), module.exports);
 const import_meta = {};
 const normalizePath = import_path.default.sep === "\\" ? (id) => id.replace(/\\/g, "/") : (id) => id;
 const virtualFiles = /* @__PURE__ */ new Map();
@@ -48,12 +50,12 @@ const queryReg = /\?marko-.+$/;
 const browserEntryQuery = "?marko-browser-entry";
 const serverEntryQuery = "?marko-server-entry";
 const virtualFileQuery = "?marko-virtual";
+const manifestFileName = "manifest.json";
 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;
@@ -111,6 +113,7 @@ function markoPlugin(opts = {}) {
   let devServer;
   let registeredTag = false;
   let serverManifest;
+  let store;
   const entrySources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
   const transformOptionalFiles = /* @__PURE__ */ new Map();
@@ -125,6 +128,9 @@ function markoPlugin(opts = {}) {
         devEntryFile = import_path.default.join(root, "index.html");
         isBuild = env.command === "build";
         isSSRBuild = isBuild && linked && Boolean(config.build.ssr);
+        store = opts.store || new import_store.FileStore(
+          `marko-vite-${import_crypto.default.createHash("SHA1").update(root).digest("hex")}`
+        );
         if (linked && !registeredTag) {
           const transformer = import_path.default.resolve(
             thisFile,
@@ -204,11 +210,9 @@ function markoPlugin(opts = {}) {
       },
       async buildStart(inputOptions) {
         if (isBuild && linked && !isSSRBuild) {
-          const serverMetaFile = await getServerManifestFile(root);
-          this.addWatchFile(serverMetaFile);
           try {
             serverManifest = JSON.parse(
-              await import_fs.default.promises.readFile(serverMetaFile, "utf-8")
+              await store.get(manifestFileName)
             );
             inputOptions.input = toHTMLEntries(root, serverManifest.entries);
             for (const entry in serverManifest.entrySources) {
@@ -392,10 +396,7 @@ if (import.meta.hot) import.meta.hot.accept();`;
               }
             }
           }
-          await import_fs.default.promises.writeFile(
-            await getServerManifestFile(root),
-            JSON.stringify(serverManifest)
-          );
+          await store.set(manifestFileName, JSON.stringify(serverManifest));
         } else {
           const browserManifest = {};
           for (const entryId in serverManifest.entries) {
@@ -448,27 +449,6 @@ function toHTMLEntries(root, serverEntries) {
   }
   return result;
 }
-async function getServerManifestFile(root) {
-  return import_path.default.join(await getTempDir(root), "manifest.json");
-}
-function getTempDir(root) {
-  return tempDir || (tempDir = (async () => {
-    const dir = import_path.default.join(
-      import_os.default.tmpdir(),
-      `marko-vite-${import_crypto.default.createHash("SHA1").update(root).digest("hex")}`
-    );
-    try {
-      const stat = await import_fs.default.promises.stat(dir);
-      if (stat.isDirectory()) {
-        return dir;
-      }
-    } catch {
-      await import_fs.default.promises.mkdir(dir);
-      return dir;
-    }
-    throw new Error("Unable to create temp directory");
-  })());
-}
 function toEntryId(id) {
   const lastSepIndex = id.lastIndexOf(import_path.default.sep);
   let name = id.slice(lastSepIndex + 1, id.indexOf(".", lastSepIndex));

package/dist/index.mjs

@@ -9,9 +9,15 @@ import "./chunk-VL2HLMVE.mjs";
 import {
   server_entry_template_default
 } from "./chunk-HWRQJHCN.mjs";
+import "./chunk-KIYHBIE6.mjs";
+import {
+  MemoryStore
+} from "./chunk-DCBMHGK4.mjs";
+import {
+  FileStore
+} from "./chunk-FCWFM7VD.mjs";
 
 // src/index.ts
-import os from "os";
 import fs from "fs";
 import path from "path";
 import crypto from "crypto";
@@ -24,12 +30,12 @@ var queryReg = /\?marko-.+$/;
 var browserEntryQuery = "?marko-browser-entry";
 var serverEntryQuery = "?marko-server-entry";
 var virtualFileQuery = "?marko-virtual";
+var manifestFileName = "manifest.json";
 var markoExt = ".marko";
 var htmlExt = ".html";
 var resolveOpts = { skipSelf: true };
 var cache = /* @__PURE__ */ new Map();
 var thisFile = typeof __filename === "string" ? __filename : fileURLToPath(import.meta.url);
-var tempDir;
 function markoPlugin(opts = {}) {
   var _a;
   let compiler;
@@ -87,6 +93,7 @@ function markoPlugin(opts = {}) {
   let devServer;
   let registeredTag = false;
   let serverManifest;
+  let store;
   const entrySources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
   const transformOptionalFiles = /* @__PURE__ */ new Map();
@@ -101,6 +108,9 @@ function markoPlugin(opts = {}) {
         devEntryFile = path.join(root, "index.html");
         isBuild = env.command === "build";
         isSSRBuild = isBuild && linked && Boolean(config.build.ssr);
+        store = opts.store || new FileStore(
+          `marko-vite-${crypto.createHash("SHA1").update(root).digest("hex")}`
+        );
         if (linked && !registeredTag) {
           const transformer = path.resolve(
             thisFile,
@@ -180,11 +190,9 @@ function markoPlugin(opts = {}) {
       },
       async buildStart(inputOptions) {
         if (isBuild && linked && !isSSRBuild) {
-          const serverMetaFile = await getServerManifestFile(root);
-          this.addWatchFile(serverMetaFile);
           try {
             serverManifest = JSON.parse(
-              await fs.promises.readFile(serverMetaFile, "utf-8")
+              await store.get(manifestFileName)
             );
             inputOptions.input = toHTMLEntries(root, serverManifest.entries);
             for (const entry in serverManifest.entrySources) {
@@ -368,10 +376,7 @@ if (import.meta.hot) import.meta.hot.accept();`;
               }
             }
           }
-          await fs.promises.writeFile(
-            await getServerManifestFile(root),
-            JSON.stringify(serverManifest)
-          );
+          await store.set(manifestFileName, JSON.stringify(serverManifest));
         } else {
           const browserManifest = {};
           for (const entryId in serverManifest.entries) {
@@ -424,27 +429,6 @@ function toHTMLEntries(root, serverEntries) {
   }
   return result;
 }
-async function getServerManifestFile(root) {
-  return path.join(await getTempDir(root), "manifest.json");
-}
-function getTempDir(root) {
-  return tempDir || (tempDir = (async () => {
-    const dir = path.join(
-      os.tmpdir(),
-      `marko-vite-${crypto.createHash("SHA1").update(root).digest("hex")}`
-    );
-    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");
-  })());
-}
 function toEntryId(id) {
   const lastSepIndex = id.lastIndexOf(path.sep);
   let name = id.slice(lastSepIndex + 1, id.indexOf(".", lastSepIndex));
@@ -480,5 +464,7 @@ function isEmpty(obj) {
   return true;
 }
 export {
+  FileStore,
+  MemoryStore,
   markoPlugin as default
 };

package/dist/store/file-store.d.ts

@@ -0,0 +1,11 @@
+import type { BuildStore } from "./types";
+export default class FileStore implements BuildStore {
+    _id: string;
+    _temp: Promise<string> | undefined;
+    _cache: Map<string, string>;
+    constructor(id: string);
+    _getKeyPath(key: string): Promise<string>;
+    has(key: string): Promise<boolean>;
+    get(key: string): Promise<string | undefined>;
+    set(key: string, value: string): Promise<void>;
+}

package/dist/store/file-store.js

@@ -0,0 +1,93 @@
+"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 file_store_exports = {};
+__export(file_store_exports, {
+  default: () => FileStore
+});
+module.exports = __toCommonJS(file_store_exports);
+var import_path = __toESM(require("path"));
+var import_fs = __toESM(require("fs"));
+var import_os = __toESM(require("os"));
+class FileStore {
+  _id;
+  _temp;
+  _cache;
+  constructor(id) {
+    this._id = id;
+    this._cache = /* @__PURE__ */ new Map();
+  }
+  async _getKeyPath(key) {
+    this._temp ?? (this._temp = getTempDir(this._id));
+    return import_path.default.join(await this._temp, key);
+  }
+  async has(key) {
+    if (!this._cache.has(key)) {
+      const path2 = await this._getKeyPath(key);
+      try {
+        await import_fs.default.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 import_fs.default.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 import_fs.default.promises.writeFile(path2, value, "utf-8");
+  }
+}
+async function getTempDir(id) {
+  const dir = import_path.default.join(import_os.default.tmpdir(), id);
+  try {
+    const stat = await import_fs.default.promises.stat(dir);
+    if (stat.isDirectory()) {
+      return dir;
+    }
+  } catch {
+    await import_fs.default.promises.mkdir(dir);
+    return dir;
+  }
+  throw new Error("Unable to create temp directory");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/store/file-store.mjs

@@ -0,0 +1,6 @@
+import {
+  FileStore
+} from "../chunk-FCWFM7VD.mjs";
+export {
+  FileStore as default
+};

package/dist/store/index.d.ts

@@ -0,0 +1,3 @@
+export { default as FileStore } from "./file-store";
+export { default as MemoryStore } from "./memory-store";
+export type { BuildStore } from "./types";

package/dist/store/index.js

@@ -0,0 +1,41 @@
+"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 store_exports = {};
+__export(store_exports, {
+  FileStore: () => import_file_store.default,
+  MemoryStore: () => import_memory_store.default
+});
+module.exports = __toCommonJS(store_exports);
+var import_file_store = __toESM(require("./file-store"));
+var import_memory_store = __toESM(require("./memory-store"));
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FileStore,
+  MemoryStore
+});

package/dist/store/index.mjs

@@ -0,0 +1,11 @@
+import "../chunk-KIYHBIE6.mjs";
+import {
+  MemoryStore
+} from "../chunk-DCBMHGK4.mjs";
+import {
+  FileStore
+} from "../chunk-FCWFM7VD.mjs";
+export {
+  FileStore,
+  MemoryStore
+};

package/dist/store/memory-store.d.ts

@@ -0,0 +1,8 @@
+import type { BuildStore } from "./types";
+export default class MemoryStore implements BuildStore {
+    _store: Map<string, string>;
+    constructor();
+    has(key: string): Promise<boolean>;
+    get(key: string): Promise<string | undefined>;
+    set(key: string, value: string): Promise<void>;
+}

package/dist/store/memory-store.js

@@ -0,0 +1,40 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var memory_store_exports = {};
+__export(memory_store_exports, {
+  default: () => MemoryStore
+});
+module.exports = __toCommonJS(memory_store_exports);
+class MemoryStore {
+  _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);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/store/memory-store.mjs

@@ -0,0 +1,6 @@
+import {
+  MemoryStore
+} from "../chunk-DCBMHGK4.mjs";
+export {
+  MemoryStore as default
+};

package/dist/store/types.d.ts

@@ -0,0 +1,5 @@
+export interface BuildStore {
+    has(key: string): Promise<boolean>;
+    get(key: string): Promise<string | undefined>;
+    set(key: string, value: string): Promise<void>;
+}

package/dist/store/types.js

@@ -0,0 +1,16 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "2.3.10",
+  "version": "2.3.11",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {