@tokenoftrust/storefront-runner 2.0.46 → 2.0.47

package/apps/storefront/dev-plugins/tenant-hot-reload.mjs

@@ -15,7 +15,6 @@ import { readFile } from "node:fs/promises";
 // normalized to match Vite's ctx.file (Vite always reports posix-style paths).
 const REPO_ROOT = fileURLToPath(new URL("../../..", import.meta.url));
 const TENANTS_DIR = join(REPO_ROOT, "tenants").replace(/\\/g, "/");
-const PUBLIC_TENANTS_DEST = fileURLToPath(new URL("../public/tenants", import.meta.url));
 
 /** Per-file finding signatures, so an unchanged warning is not reprinted on every
  *  keystroke-save. Lives for the dev server's lifetime. */
@@ -58,12 +57,13 @@ async function loadTsModule(server, url) {
  * @param {string} file
  * @returns {{ id: string, rest: string } | null}
  */
-export function classifyTenantFile(file) {
+export function classifyTenantFile(file, tenantsDir = TENANTS_DIR) {
   const f = String(file).replace(/\\/g, "/");
-  if (!f.startsWith(TENANTS_DIR + "/")) return null;
+  const normalizedTenantsDir = String(tenantsDir).replace(/\\/g, "/");
+  if (!f.startsWith(normalizedTenantsDir + "/")) return null;
   // "<id>/<...>" for a real tenant, "e2e/<id>/<...>" for a platform test tenant —
   // consume the nesting segment so `id` is always the tenant's own id.
-  let rel = f.slice(TENANTS_DIR.length + 1);
+  let rel = f.slice(normalizedTenantsDir.length + 1);
   if (rel.startsWith(E2E_TENANT_DIR + "/")) rel = rel.slice(E2E_TENANT_DIR.length + 1);
   const slash = rel.indexOf("/");
   if (slash < 0) return null;
@@ -102,23 +102,31 @@ export function stripThemeMeta(parsed) {
  * save mirroring into public/tenants/<id>/.
  * @param {string} id
  */
-export function isVersionedTenant(id) {
+export function isVersionedTenant(id, root = REPO_ROOT) {
   const envList = (process.env.TENANT_ASSETS_VERSIONED ?? "")
     .split(",")
     .map((s) => s.trim())
     .filter(Boolean);
   if (envList.includes(id)) return true;
-  return existsSync(join(REPO_ROOT, ...tenantDirSegments(id), ".tot", "assets-versioned"));
+  return existsSync(join(root, ...tenantDirSegments(id), ".tot", "assets-versioned"));
 }
 
 /**
  * Re-mirror one changed/added public asset into public/tenants/<id>/ (skip R2-versioned).
  * @param {string} id @param {string} rest @param {string} sourceFile
  */
-async function mirrorPublicAsset(id, rest, sourceFile) {
-  if (isVersionedTenant(id)) return;
+async function mirrorPublicAsset(
+  id,
+  rest,
+  sourceFile,
+  {
+    root = REPO_ROOT,
+    publicTenantsDest = join(root, "apps", "storefront", "public", "tenants"),
+  } = {},
+) {
+  if (isVersionedTenant(id, root)) return;
   const { cp, mkdir } = await import("node:fs/promises");
-  const target = join(PUBLIC_TENANTS_DEST, id, rest.slice("public/".length));
+  const target = join(publicTenantsDest, id, rest.slice("public/".length));
   try {
     await mkdir(dirname(target), { recursive: true });
     await cp(sourceFile, target);
@@ -131,10 +139,17 @@ async function mirrorPublicAsset(id, rest, sourceFile) {
  * Remove the stale mirrored copy under public/tenants/<id>/ when a public asset is deleted.
  * @param {string} id @param {string} rest
  */
-async function unmirrorPublicAsset(id, rest) {
-  if (isVersionedTenant(id)) return;
+async function unmirrorPublicAsset(
+  id,
+  rest,
+  {
+    root = REPO_ROOT,
+    publicTenantsDest = join(root, "apps", "storefront", "public", "tenants"),
+  } = {},
+) {
+  if (isVersionedTenant(id, root)) return;
   const { rm } = await import("node:fs/promises");
-  const target = join(PUBLIC_TENANTS_DEST, id, rest.slice("public/".length));
+  const target = join(publicTenantsDest, id, rest.slice("public/".length));
   try {
     await rm(target, { force: true });
   } catch {
@@ -194,7 +209,11 @@ export function seedKnown(root, known) {
 // the worker teardown, same as the change path). Public assets are NOT in any
 // graph, so Vite ignores their add/unlink entirely — we mirror (add) / un-mirror
 // (unlink) and reload ourselves. loopState.lastEvent then reflects add/unlink.
-export function tenantHotReload() {
+export function tenantHotReload({
+  root = REPO_ROOT,
+  publicTenantsDest = join(root, "apps", "storefront", "public", "tenants"),
+} = {}) {
+  const tenantsDir = join(root, "tenants").replace(/\\/g, "/");
   // Typed `any`: `vite` isn't a direct dependency of this package (it's pulled in
   // transitively via astro), so `import('vite').Plugin` can't be resolved here and
   // importing from "vite" would even fail at runtime. `any` keeps the hook params
@@ -205,7 +224,7 @@ export function tenantHotReload() {
     apply: "serve",
     /** @param {any} server */
     configureServer(server) {
-      server.watcher.add(TENANTS_DIR);
+      server.watcher.add(tenantsDir);
 
       // Tell the hosted /dev panel the store is UP the moment the dev server is
       // listening — completes Step 1 ("Get running") before any edit. Best-effort,
@@ -218,12 +237,12 @@ export function tenantHotReload() {
       // really added/removed so the guard stays accurate for the session.
       /** @type {Set<string>} */
       const known = new Set();
-      seedKnown(TENANTS_DIR, known);
+      seedKnown(tenantsDir, known);
 
       /** @param {"add"|"unlink"} event @param {string} rawPath */
       const onAddUnlink = async (event, rawPath) => {
         const file = String(rawPath).replace(/\\/g, "/");
-        const c = classifyTenantFile(file);
+        const c = classifyTenantFile(file, tenantsDir);
         if (!c) return;
         const { id, rest } = c;
 
@@ -244,8 +263,11 @@ export function tenantHotReload() {
         // Public assets: Vite doesn't react (not in the module graph). Maintain the
         // mirror ourselves, then reload (server.ws.send is timestamped by the Monitor).
         if (rest.startsWith("public/")) {
-          if (event === "add") await mirrorPublicAsset(id, rest, file);
-          else await unmirrorPublicAsset(id, rest);
+          if (event === "add") {
+            await mirrorPublicAsset(id, rest, file, { root, publicTenantsDest });
+          } else {
+            await unmirrorPublicAsset(id, rest, { root, publicTenantsDest });
+          }
           server.ws.send({ type: "full-reload" });
           return;
         }
@@ -259,7 +281,7 @@ export function tenantHotReload() {
     },
     /** @param {any} ctx */
     async handleHotUpdate(ctx) {
-      const c = classifyTenantFile(ctx.file);
+      const c = classifyTenantFile(ctx.file, tenantsDir);
       if (!c) return undefined;
       const { id, rest } = c;
 
@@ -276,7 +298,7 @@ export function tenantHotReload() {
       // terminal a beat later. Putting this in the reload path would tax every
       // save to report something that is almost always empty.
       void validateSavedFile({
-        tenantDir: join(REPO_ROOT, tenantDirRelative(id)),
+        tenantDir: join(root, tenantDirRelative(id)),
         tenantId: id,
         rest,
         memo: savedFileFindings,
@@ -301,7 +323,10 @@ export function tenantHotReload() {
       // Unlike content HTML this reloads no worker, so there's no teardown race to
       // fire ahead of. Skip R2-versioned tenants, like copy-tenant-assets.mjs.
       if (rest.startsWith("public/")) {
-        await mirrorPublicAsset(id, rest, ctx.file.replace(/\\/g, "/"));
+        await mirrorPublicAsset(id, rest, ctx.file.replace(/\\/g, "/"), {
+          root,
+          publicTenantsDest,
+        });
         ctx.server.ws.send({ type: "full-reload" });
         return [];
       }

package/apps/storefront/integrations/materialize-guard.mjs

@@ -19,7 +19,7 @@ import {
  *   STATIC publish (materialize-tenant.mjs) sets this to the single tenant it renders,
  *   so a sibling tenant can never block it. Unset ⇒ framework-only Worker build.
  */
-export function materializeGuard() {
+export function materializeGuard({ root } = {}) {
   return {
     name: "materialize-guard",
     hooks: {
@@ -40,7 +40,7 @@ export function materializeGuard() {
           // set (not "all tenants", which `null` would mean), so a sibling
           // tenant that is present-but-stale can never block this build.
           const frameworkOnlyTenants = [];
-          const { problems } = checkPinned(undefined, { expectRef, allowUnpinned, onlyTenants: frameworkOnlyTenants });
+          const { problems } = checkPinned(root, { expectRef, allowUnpinned, onlyTenants: frameworkOnlyTenants });
           const absent = problems.filter((p) => p.reason === "absent");
           const real = problems.filter((p) => p.reason !== "absent");
           if (absent.length) {
@@ -49,11 +49,11 @@ export function materializeGuard() {
             else console.log(msg);
           }
           if (real.length) {
-            assertPinnedMaterialized({ expectRef, allowUnpinned, onlyTenants: frameworkOnlyTenants });
+            assertPinnedMaterialized({ root, expectRef, allowUnpinned, onlyTenants: frameworkOnlyTenants });
           }
           return;
         }
-        assertPinnedMaterialized({ expectRef, allowUnpinned, onlyTenants });
+        assertPinnedMaterialized({ root, expectRef, allowUnpinned, onlyTenants });
       },
     },
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "2.0.46",
+  "version": "2.0.47",
   "license": "SEE LICENSE IN LICENSE",
   "description": "World-shareable storefront runner: multi-tenant renderer on Astro/Cloudflare. No control plane.",
   "packageManager": "pnpm@11.9.0",