@decocms/nextjs 7.71.6 → 8.0.0-next.0

package/README.md

@@ -359,9 +359,7 @@ implementation file) can opt into these, each read as a literal
 
 ## Verifying your setup
 
-`examples/nextjs-smoke` in this monorepo is a minimal, real Next.js App
-Router build exercising all four surfaces end to end — `withDeco` rewrites,
-the catch-all route, the RSC preview page, `createNextSetup`, and a resolved
-page render. Its preview fixture is a real interactive Client Component, so
-the build also guards the server/client boundary described above. Use it as
-a working reference if any of the above doesn't compose the way you expect.
+No example app in this monorepo exercises these surfaces any more:
+`examples/nextjs-smoke` now follows the next-major Next.js guide, which uses
+`@decocms/blocks` alone. The surfaces above are covered by this package's unit
+tests.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/nextjs",
-  "version": "7.71.6",
+  "version": "8.0.0-next.0",
   "type": "module",
   "engines": {
     "node": ">=24"
@@ -29,8 +29,8 @@
     "lint:unused": "knip"
   },
   "dependencies": {
-    "@decocms/blocks": "7.71.6",
-    "@decocms/blocks-admin": "7.71.6"
+    "@decocms/blocks": "8.0.0-next.0",
+    "@decocms/blocks-admin": "8.0.0-next.0"
   },
   "peerDependencies": {
     "next": ">=15.0.0",

package/src/__conformance__/observability.test.ts

@@ -0,0 +1,66 @@
+// @vitest-environment node
+/**
+ * Conformance: the Next.js half of caching.mdx ("Upstream data": requests go
+ * through Next's data cache, no cache of the binding's own) and of
+ * telemetry.mdx ("What's sent": the bindings add no measurements of their own;
+ * inbound requests come from Next's own OpenTelemetry setup).
+ */
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { createInstrumentedFetch } from "@decocms/blocks/fetch";
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+const SRC = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+
+function sources(): { file: string; text: string }[] {
+  const out: { file: string; text: string }[] = [];
+  const walk = (dir: string) => {
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+      const full = path.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        if (entry.name !== "__conformance__" && entry.name !== "__tests__") walk(full);
+      } else if (/\.(ts|tsx|cjs|js)$/.test(entry.name) && !/\.test\./.test(entry.name)) {
+        out.push({ file: path.relative(SRC, full), text: fs.readFileSync(full, "utf8") });
+      }
+    }
+  };
+  walk(SRC);
+  return out;
+}
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+});
+
+describe("upstream data on Next.js (caching.mdx)", () => {
+  it("cache-04: the instrumented fetch goes through the fetch Next patches, with Next's cache options intact", async () => {
+    const instrumented = createInstrumentedFetch({ provider: "acme-search" });
+    // Next replaces globalThis.fetch after modules load; the instrumented fetch must use it.
+    const nextFetch = vi.fn(async () => new Response("{}"));
+    vi.stubGlobal("fetch", nextFetch);
+    await instrumented("https://search.example/q", {
+      operation: "search",
+      next: { revalidate: 60, tags: ["search"] },
+    } as RequestInit & { operation: string });
+    expect(nextFetch).toHaveBeenCalledTimes(1);
+    const init = (nextFetch.mock.calls[0] as unknown as [unknown, Record<string, unknown>])[1];
+    expect(init.next).toEqual({ revalidate: 60, tags: ["search"] });
+  });
+
+  it("cache-04: @decocms/nextjs has no upstream cache of its own", () => {
+    const own = sources().filter(({ text }) =>
+      /caches\.default|caches\.open|createFetchCache|fetchWithCache/.test(text),
+    );
+    expect(own.map((s) => s.file)).toEqual([]);
+  });
+});
+
+describe("what the binding adds (telemetry.mdx › What's sent)", () => {
+  it("tel-09: @decocms/nextjs adds no measurements of its own (no inbound or page-cache metrics)", () => {
+    const reporters = sources().filter(({ text }) =>
+      /http\.server\.request\.duration|decocms\.blocks\.telemetry/.test(text),
+    );
+    expect(reporters.map((s) => s.file)).toEqual([]);
+  });
+});