@decocms/blocks 7.3.1 → 7.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/blocks",
-  "version": "7.3.1",
+  "version": "7.5.0",
   "type": "module",
   "description": "Deco framework-agnostic core: CMS block resolution, section registry, matchers, portable SDK utilities",
   "repository": {

package/src/hooks/Picture.tsx

@@ -1,3 +1,15 @@
+"use client";
+
+// `"use client"` added by @decocms/nextjs's next-smoke fixture build
+// (Picture is reachable from `DecoRootLayout`/`SectionRenderer` via the
+// `hooks/index.ts` barrel, so it is part of the react-server module graph
+// on any Next.js Server Component page even when a given page never
+// renders it): `createContext`/`useContext` are unavailable under React's
+// react-server condition, and Next statically flags any reachable module
+// that imports them without this directive ("You're importing a component
+// that needs createContext...") — same class of fix, same precedent, as
+// `SectionErrorFallback.tsx`'s `"use client"` (class component /
+// componentDidCatch, also client-only).
 import {
 	type ComponentPropsWithoutRef,
 	type Context,
@@ -14,15 +26,10 @@ import { type FitOptions, getOptimizedMediaUrl, getSrcSet } from "./Image";
 // so each source can inject its own <link rel="preload"> with the correct
 // media query for responsive art direction.
 //
-// Created LAZILY (first render), not at module scope: this file has no
-// "use client" directive, so in a react-server graph (a Server Component
-// page, or ANY Next.js route handler — which ignores "use client"
-// entirely) the module evaluates against React's react-server build, where
-// `createContext` does not exist. A module-scope call crashes the whole
-// graph at import time ("createContext is not a function") even if
-// Picture/Source never render. Deferring to render time is safe: renders
-// only ever happen under a full React build (client or SSR), and both
-// components resolve the same memoized context object.
+// Still created LAZILY (first render, not module scope) even under
+// `"use client"`: this keeps a single memoized context object regardless of
+// how many client bundle chunks end up importing this module, rather than
+// relying on module-instance identity across chunks.
 // -------------------------------------------------------------------------
 
 interface PreloadContextValue {

package/src/sdk/env.test.ts

@@ -0,0 +1,33 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+// isDevMode() memoises its result in module-level state after the first
+// call, so each case below resets modules and re-imports fresh to get an
+// unmemoised read for the NODE_ENV value it's stubbing.
+describe("isDevMode", () => {
+  afterEach(() => {
+    vi.unstubAllEnvs();
+  });
+
+  it("is false when NODE_ENV is production", async () => {
+    vi.stubEnv("NODE_ENV", "production");
+    vi.stubEnv("DECO_PREVIEW", "");
+    vi.resetModules();
+    const { isDevMode } = await import("./env");
+    expect(isDevMode()).toBe(false);
+  });
+
+  it("is true when NODE_ENV is development", async () => {
+    vi.stubEnv("NODE_ENV", "development");
+    vi.resetModules();
+    const { isDevMode } = await import("./env");
+    expect(isDevMode()).toBe(true);
+  });
+
+  it("is true when DECO_PREVIEW=true even if NODE_ENV is production", async () => {
+    vi.stubEnv("NODE_ENV", "production");
+    vi.stubEnv("DECO_PREVIEW", "true");
+    vi.resetModules();
+    const { isDevMode } = await import("./env");
+    expect(isDevMode()).toBe(true);
+  });
+});

package/src/sdk/env.ts

@@ -7,12 +7,37 @@
 
 let _isDev: boolean | null = null;
 
+/**
+ * Reads `process.env.NODE_ENV` defensively.
+ *
+ * Wrapped in try/catch so the bare `process` reference can't throw in runtimes
+ * without a `process` global (workerd without `nodejs_compat`). Bundlers that
+ * statically define `process.env.NODE_ENV` (Vite/esbuild in Workers builds —
+ * the same role the old `import.meta.env.DEV` signal served) replace this
+ * expression with a string constant at build time, so no runtime `process`
+ * global is needed in that path at all.
+ */
+function readNodeEnv(): string | undefined {
+  try {
+    return process.env.NODE_ENV;
+  } catch {
+    return undefined;
+  }
+}
+
 /**
  * Returns `true` when running in a development environment.
  *
  * Detection order:
- *  1. `import.meta.env.DEV`  — Vite build-time constant (reliable in Workers/Miniflare)
- *  2. `NODE_ENV=development` — standard Node/Vite convention
+ *  1. `readNodeEnv() === "development"` — bundler-define-friendly read of
+ *     `process.env.NODE_ENV` (see `readNodeEnv` above). This replaces the
+ *     previous `import.meta.env.DEV` signal: `import.meta` is ESM-only syntax
+ *     and is a hard syntax error when CJS consumers (ts-jest) compile this
+ *     raw-TS package, and `env.ts` is reachable via the `@decocms/blocks/sdk`
+ *     barrel, so any such consumer importing the barrel would fail to compile.
+ *  2. `NODE_ENV=development` read off `globalThis.process.env` — standard
+ *     Node/Vite convention, for runtimes where `process` is a real global.
+ *  3. `DECO_PREVIEW=true` — explicit preview-mode override.
  *
  * The result is memoised after the first evaluation.
  */
@@ -21,11 +46,9 @@ export function isDevMode(): boolean {
 
   const env = typeof globalThis.process !== "undefined" ? globalThis.process.env : undefined;
 
-  // Vite statically replaces import.meta.env.DEV at build time (true in dev, false in prod).
-  // In Miniflare/Workers, process.env is unavailable, so this is the reliable signal.
-  const vitaDev = !!(import.meta as unknown as { env?: { DEV?: boolean } }).env?.DEV;
+  const nodeEnvDev = readNodeEnv() === "development";
 
-  _isDev = vitaDev || env?.NODE_ENV === "development" || env?.DECO_PREVIEW === "true";
+  _isDev = nodeEnvDev || env?.NODE_ENV === "development" || env?.DECO_PREVIEW === "true";
 
   return _isDev;
 }

package/src/setup.ts

@@ -35,7 +35,8 @@ export interface SiteSetupOptions {
 
 	/**
 	 * Generated blocks object — import and pass directly:
-	 * `import { blocks } from "./server/cms/blocks.gen";`
+	 * `import { blocks } from "../.deco/blocks.gen";` (`.deco/blocks.gen.ts`
+	 * is `generate-blocks.ts`'s default output location).
 	 */
 	blocks: Record<string, unknown>;