@decocms/tanstack 7.71.4 → 7.71.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/tanstack",
-  "version": "7.71.4",
+  "version": "7.71.6",
   "type": "module",
   "description": "Deco framework binding for TanStack Start + Cloudflare Workers",
   "repository": {
@@ -27,9 +27,9 @@
     "lint:unused": "knip"
   },
   "dependencies": {
-    "@decocms/blocks": "7.71.4",
-    "@decocms/blocks-admin": "7.71.4",
-    "@decocms/blocks-cli": "7.71.4",
+    "@decocms/blocks": "7.71.6",
+    "@decocms/blocks-admin": "7.71.6",
+    "@decocms/blocks-cli": "7.71.6",
     "@deco-cx/warp-node": "^0.3.16",
     "fast-json-patch": "^3.1.0",
     "ws": "^8.18.0"

package/src/vite/plugin.js

@@ -247,9 +247,25 @@ export function decoVitePlugin({ fastDeploy = "auto" } = {}) {
       // of who loaded it — it would try to JSON.parse that JS and fail the
       // build ("Failed to parse JSON file").
       if (options?.ssr && importer && id.endsWith("meta.gen.json")) {
-        const file = path.isAbsolute(id) ? id : path.resolve(path.dirname(importer), id);
-        if (existsSync(file)) return metaGenSsrId(file);
-        // Absent (pre-generate-schema) — let Vite report it normally.
+        if (id.startsWith(".") || path.isAbsolute(id)) {
+          const file = path.resolve(path.dirname(importer), id);
+          if (existsSync(file)) return metaGenSsrId(file);
+          // Absent (pre-generate-schema) — let Vite report it normally.
+          return undefined;
+        }
+        // Alias / bare specifier (`~/.deco/meta.gen.json`, tsconfig paths…):
+        // let the rest of the pipeline resolve it, then wrap — otherwise it
+        // falls through to vite:json and loses the JSON.parse optimization.
+        if (typeof this?.resolve === "function") {
+          return this.resolve(id, importer, { ...options, skipSelf: true }).then(
+            (r) =>
+              r && !r.external && r.id.endsWith("meta.gen.json") && existsSync(r.id)
+                ? metaGenSsrId(r.id)
+                : undefined,
+            // A resolver in the chain threw — let Vite's normal resolution report it.
+            () => undefined,
+          );
+        }
       }
       // Server builds keep the real modules.
       if (options?.ssr) return undefined;

package/src/vite/plugin.test.js

@@ -175,6 +175,51 @@ describe("decoVitePlugin meta.gen.json on SSR (regression: vite:json double-pars
     }
   });
 
+  it("wraps aliased imports after the rest of the pipeline resolves them", async () => {
+    const p = getPlugin();
+    const file = path.join(dir, ".deco", "meta.gen.json");
+    const seen = [];
+    const ctx = {
+      resolve: async (spec, imp, opts) => {
+        seen.push([spec, opts.skipSelf]);
+        return { id: file };
+      },
+    };
+    const id = await p.resolveId.call(
+      ctx,
+      "~/.deco/meta.gen.json",
+      path.join(dir, "src", "setup.ts"),
+      {
+        ssr: true,
+      },
+    );
+    expect(id.endsWith(".json")).toBe(false);
+    expect(seen).toEqual([["~/.deco/meta.gen.json", true]]);
+    expect(p.load.call({}, id, { ssr: true })).toContain("JSON.parse(");
+  });
+
+  it("leaves an aliased import alone when it doesn't resolve to an existing file", async () => {
+    const p = getPlugin();
+    const ctx = { resolve: async () => null };
+    const id = await p.resolveId.call(ctx, "~/missing/meta.gen.json", path.join(dir, "x.ts"), {
+      ssr: true,
+    });
+    expect(id).toBeUndefined();
+  });
+
+  it("falls through when a resolver in the chain throws for the alias", async () => {
+    const p = getPlugin();
+    const ctx = {
+      resolve: async () => {
+        throw new Error("exports map error");
+      },
+    };
+    const id = await p.resolveId.call(ctx, "~/x/meta.gen.json", path.join(dir, "x.ts"), {
+      ssr: true,
+    });
+    expect(id).toBeUndefined();
+  });
+
   it("falls through to Vite when meta.gen.json does not exist yet", () => {
     const p = getPlugin();
     const importer = path.join(dir, "src", "setup.ts");