@gusnips/react 0.4.3 → 0.4.5

package/dist/hydrate.d.ts

@@ -30,6 +30,16 @@ export { PRERENDERED_ROUTE_ATTR, SHELL_ROUTE } from "./prerender-contract.ts";
  * serves `/pt/pricing` from a file rendered for `/pricing`, with the locale carried in the
  * router's `basename` — so the address and the route are different strings, and only the caller
  * knows which one the build wrote.
+ *
+ * **A trailing slash is not a different page.** The router renders `/precos/` and `/precos` alike,
+ * and which one is in the address bar is the host's call: a host serving `precos/index.html`
+ * redirects `/precos` to `/precos/` by default (Firebase Hosting does). Compared exactly, that was
+ * false on every page of one adopter: every prerendered body was thrown away and drawn again, on a
+ * page that looks the same either way.
+ *
+ * **`null` means nothing the build wrote can be this reader's page.** The case is a site that
+ * prerenders one language and detects the reader's at runtime: Portuguese markup hydrated with
+ * Spanish strings is the wrong-page mismatch again, spread across every string on the page.
  */
-export declare function hydrateOrMount(rootEl: Element, tree: ReactNode, route: string): void;
+export declare function hydrateOrMount(rootEl: Element, tree: ReactNode, route: string | null): void;
 //# sourceMappingURL=hydrate.d.ts.map

package/dist/hydrate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydrate.d.ts","sourceRoot":"","sources":["../src/hydrate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIvC,OAAO,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE9E;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAGpF"}
+{"version":3,"file":"hydrate.d.ts","sourceRoot":"","sources":["../src/hydrate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIvC,OAAO,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE9E;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAI3F"}

package/dist/hydrate.js

@@ -15,11 +15,27 @@ export { PRERENDERED_ROUTE_ATTR, SHELL_ROUTE } from "./prerender-contract.js";
  * serves `/pt/pricing` from a file rendered for `/pricing`, with the locale carried in the
  * router's `basename` — so the address and the route are different strings, and only the caller
  * knows which one the build wrote.
+ *
+ * **A trailing slash is not a different page.** The router renders `/precos/` and `/precos` alike,
+ * and which one is in the address bar is the host's call: a host serving `precos/index.html`
+ * redirects `/precos` to `/precos/` by default (Firebase Hosting does). Compared exactly, that was
+ * false on every page of one adopter: every prerendered body was thrown away and drawn again, on a
+ * page that looks the same either way.
+ *
+ * **`null` means nothing the build wrote can be this reader's page.** The case is a site that
+ * prerenders one language and detects the reader's at runtime: Portuguese markup hydrated with
+ * Spanish strings is the wrong-page mismatch again, spread across every string on the page.
  */
 export function hydrateOrMount(rootEl, tree, route) {
-    if (rootEl.getAttribute(PRERENDERED_ROUTE_ATTR) === route)
+    const rendered = rootEl.getAttribute(PRERENDERED_ROUTE_ATTR);
+    if (route !== null && rendered !== null && samePath(rendered, route))
         hydrateRoot(rootEl, tree);
     else
         createRoot(rootEl).render(tree);
 }
+/** `/precos/` and `/precos` are one page; `/` stays `/`. */
+function samePath(a, b) {
+    const trim = (path) => path.replace(/(.)\/+$/, "$1");
+    return trim(a) === trim(b);
+}
 //# sourceMappingURL=hydrate.js.map

package/dist/hydrate.js.map

@@ -1 +1 @@
-{"version":3,"file":"hydrate.js","sourceRoot":"","sources":["../src/hydrate.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE9E;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,cAAc,CAAC,MAAe,EAAE,IAAe,EAAE,KAAa;IAC5E,IAAI,MAAM,CAAC,YAAY,CAAC,sBAAsB,CAAC,KAAK,KAAK;QAAE,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;;QAChF,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC"}
+{"version":3,"file":"hydrate.js","sourceRoot":"","sources":["../src/hydrate.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE9E;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,cAAc,CAAC,MAAe,EAAE,IAAe,EAAE,KAAoB;IACnF,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC;IAC7D,IAAI,KAAK,KAAK,IAAI,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC;QAAE,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;;QAC3F,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC;AAED,4DAA4D;AAC5D,SAAS,QAAQ,CAAC,CAAS,EAAE,CAAS;IACpC,MAAM,IAAI,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACrE,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;AAC7B,CAAC"}

package/dist/i18n.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../src/i18n.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,eAAe;IAC9B,6CAA6C;IAC7C,WAAW,EAAE,MAAM,CAAC;IACpB,6EAA6E;IAC7E,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC;;;;;;OAMG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,aAAa,EACb,UAAU,EACV,QAAQ,GACT,EAAE,eAAe;;;;;;;;;;;;;;;;EAqBjB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAmB/E"}
+{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../src/i18n.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,eAAe;IAC9B,6CAA6C;IAC7C,WAAW,EAAE,MAAM,CAAC;IACpB,6EAA6E;IAC7E,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC;;;;;;OAMG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,aAAa,EACb,UAAU,EACV,QAAQ,GACT,EAAE,eAAe;;;;;;;;;;;;;;;;EAuBjB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAmB/E"}

package/dist/i18n.js

@@ -26,11 +26,13 @@ export function i18nInitOptions({ fallbackLng, supportedLngs, storageKey, queryK
             lookupLocalStorage: storageKey,
         },
         react: { useSuspense: false },
-        // `nonExplicitSupportedLngs` is omitted deliberately, and both donors say so in the same
-        // words. Enabling it validates the BASE subtag against `supportedLngs`, which rejects a
-        // region-coded "pt-BR" (its base "pt" is not in the list) and silently falls the whole app
-        // back to English. Detected sub-locales like "en-US" already resolve to their base through
-        // i18next's ordinary fallback hierarchy, so the flag buys nothing and breaks pt-BR.
+        // `nonExplicitSupportedLngs` is omitted deliberately. It breaks both shapes a catalog comes in.
+        // Region-coded: it validates the BASE subtag against `supportedLngs`, "pt" is not in a list
+        // that says "pt-BR", and the whole app silently renders English — both donors say so in the
+        // same words. Base codes: an "en-US" browser keeps "en-US" as `i18n.language`. Beside
+        // `currentOnly` no catalog matches it, so the reader gets the fallback language; beside
+        // `languageOnly` the copy is right and every map an app keys by the tag misses — the third
+        // migration shipped English copy as `lang="pt-BR"`. Without the flag "en-US" settles on "en".
     };
 }
 /**

package/dist/i18n.js.map

@@ -1 +1 @@
-{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../src/i18n.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AA4BH,MAAM,UAAU,eAAe,CAAC,EAC9B,WAAW,EACX,aAAa,EACb,UAAU,EACV,QAAQ,GACQ;IAChB,OAAO;QACL,WAAW;QACX,aAAa,EAAE,CAAC,GAAG,aAAa,CAAC;QACjC,IAAI,EAAE,aAAsB;QAC5B,aAAa,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,yBAAyB;QAChE,SAAS,EAAE;YACT,KAAK,EAAE,QAAQ;gBACb,CAAC,CAAC,CAAC,aAAa,EAAE,cAAc,EAAE,WAAW,CAAC;gBAC9C,CAAC,CAAC,CAAC,cAAc,EAAE,WAAW,CAAC;YACjC,MAAM,EAAE,CAAC,cAAc,CAAC;YACxB,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,kBAAkB,EAAE,UAAU;SAC/B;QACD,KAAK,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE;QAC7B,yFAAyF;QACzF,wFAAwF;QACxF,2FAA2F;QAC3F,2FAA2F;QAC3F,oFAAoF;KACrF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,cAAc,CAAI,SAAY,EAAE,IAA4B;IAC1E,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACzC,MAAM,OAAO,GAAG,IAAI,MAAM,CACxB,UAAU,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EACvF,GAAG,CACJ,CAAC;IAEF,MAAM,IAAI,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAE9F,MAAM,IAAI,GAAG,CAAC,KAAc,EAAW,EAAE;QACvC,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;YACpC,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjF,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,OAAO,IAAI,CAAC,SAAS,CAAM,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../src/i18n.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AA4BH,MAAM,UAAU,eAAe,CAAC,EAC9B,WAAW,EACX,aAAa,EACb,UAAU,EACV,QAAQ,GACQ;IAChB,OAAO;QACL,WAAW;QACX,aAAa,EAAE,CAAC,GAAG,aAAa,CAAC;QACjC,IAAI,EAAE,aAAsB;QAC5B,aAAa,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,yBAAyB;QAChE,SAAS,EAAE;YACT,KAAK,EAAE,QAAQ;gBACb,CAAC,CAAC,CAAC,aAAa,EAAE,cAAc,EAAE,WAAW,CAAC;gBAC9C,CAAC,CAAC,CAAC,cAAc,EAAE,WAAW,CAAC;YACjC,MAAM,EAAE,CAAC,cAAc,CAAC;YACxB,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,kBAAkB,EAAE,UAAU;SAC/B;QACD,KAAK,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE;QAC7B,gGAAgG;QAChG,4FAA4F;QAC5F,4FAA4F;QAC5F,sFAAsF;QACtF,wFAAwF;QACxF,2FAA2F;QAC3F,8FAA8F;KAC/F,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,cAAc,CAAI,SAAY,EAAE,IAA4B;IAC1E,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACzC,MAAM,OAAO,GAAG,IAAI,MAAM,CACxB,UAAU,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EACvF,GAAG,CACJ,CAAC;IAEF,MAAM,IAAI,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAE9F,MAAM,IAAI,GAAG,CAAC,KAAc,EAAW,EAAE;QACvC,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;YACpC,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjF,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,OAAO,IAAI,CAAC,SAAS,CAAM,CAAC;AAC9B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gusnips/react",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "The headless runtime under a Vite + React SPA: typed fetch client with single-flight refresh, auth store, query defaults, route guards, error boundary, chunk-reload recovery, i18n bootstrap.",
   "type": "module",
   "license": "MIT",

package/src/hydrate.test.ts

@@ -0,0 +1,65 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { hydrateOrMount, SHELL_ROUTE } from "./hydrate.ts";
+
+// Both roots are mocked: the question is only WHICH one the entry picks, and either choice is
+// silent in a real browser — a wrong mount looks like a hydrate and a wrong hydrate recovers.
+const roots = vi.hoisted(() => ({
+  hydrateRoot: vi.fn(),
+  createRoot: vi.fn(() => ({ render: vi.fn() })),
+}));
+vi.mock("react-dom/client", () => roots);
+
+/** A root whose file names `route` — or names nothing, for `null`. */
+const rootFor = (route: string | null): Element =>
+  ({ getAttribute: () => route }) as unknown as Element; // Only `getAttribute` is read.
+
+const picked = (): "hydrate" | "mount" => {
+  const hydrated = roots.hydrateRoot.mock.calls.length > 0;
+  const mounted = roots.createRoot.mock.calls.length > 0;
+  expect(hydrated !== mounted).toBe(true);
+  return hydrated ? "hydrate" : "mount";
+};
+
+beforeEach(() => {
+  vi.clearAllMocks();
+});
+
+describe("hydrateOrMount", () => {
+  it("hydrates the render this file is", () => {
+    hydrateOrMount(rootFor("/precos"), null, "/precos");
+    expect(picked()).toBe("hydrate");
+  });
+
+  it.each([
+    ["the address has one", "/precos", "/precos/"],
+    ["the file has one", "/precos/", "/precos"],
+  ])("ignores a trailing slash when %s", (_case, rendered, route) => {
+    hydrateOrMount(rootFor(rendered), null, route);
+    expect(picked()).toBe("hydrate");
+  });
+
+  it("keeps the front page's slash — it is the whole path", () => {
+    hydrateOrMount(rootFor("/"), null, "/");
+    expect(picked()).toBe("hydrate");
+  });
+
+  it("mounts fresh over a different page", () => {
+    hydrateOrMount(rootFor("/precos"), null, "/faq");
+    expect(picked()).toBe("mount");
+  });
+
+  it("mounts fresh over a shell, whatever the address", () => {
+    hydrateOrMount(rootFor(SHELL_ROUTE), null, "/nao-existe");
+    expect(picked()).toBe("mount");
+  });
+
+  it("mounts fresh over a file that names no route", () => {
+    hydrateOrMount(rootFor(null), null, "/precos");
+    expect(picked()).toBe("mount");
+  });
+
+  it("mounts fresh when the reader cannot be shown this file at all", () => {
+    hydrateOrMount(rootFor("/precos"), null, null);
+    expect(picked()).toBe("mount");
+  });
+});

package/src/hydrate.ts

@@ -34,8 +34,25 @@ export { PRERENDERED_ROUTE_ATTR, SHELL_ROUTE } from "./prerender-contract.ts";
  * serves `/pt/pricing` from a file rendered for `/pricing`, with the locale carried in the
  * router's `basename` — so the address and the route are different strings, and only the caller
  * knows which one the build wrote.
+ *
+ * **A trailing slash is not a different page.** The router renders `/precos/` and `/precos` alike,
+ * and which one is in the address bar is the host's call: a host serving `precos/index.html`
+ * redirects `/precos` to `/precos/` by default (Firebase Hosting does). Compared exactly, that was
+ * false on every page of one adopter: every prerendered body was thrown away and drawn again, on a
+ * page that looks the same either way.
+ *
+ * **`null` means nothing the build wrote can be this reader's page.** The case is a site that
+ * prerenders one language and detects the reader's at runtime: Portuguese markup hydrated with
+ * Spanish strings is the wrong-page mismatch again, spread across every string on the page.
  */
-export function hydrateOrMount(rootEl: Element, tree: ReactNode, route: string): void {
-  if (rootEl.getAttribute(PRERENDERED_ROUTE_ATTR) === route) hydrateRoot(rootEl, tree);
+export function hydrateOrMount(rootEl: Element, tree: ReactNode, route: string | null): void {
+  const rendered = rootEl.getAttribute(PRERENDERED_ROUTE_ATTR);
+  if (route !== null && rendered !== null && samePath(rendered, route)) hydrateRoot(rootEl, tree);
   else createRoot(rootEl).render(tree);
 }
+
+/** `/precos/` and `/precos` are one page; `/` stays `/`. */
+function samePath(a: string, b: string): boolean {
+  const trim = (path: string): string => path.replace(/(.)\/+$/, "$1");
+  return trim(a) === trim(b);
+}

package/src/i18n.test.ts

@@ -1,5 +1,6 @@
+import { createInstance } from "i18next";
 import { describe, expect, it } from "vitest";
-import { applyBrandVars, i18nInitOptions } from "./i18n.ts";
+import { applyBrandVars, i18nInitOptions, type I18nInitOptions } from "./i18n.ts";
 
 describe("applyBrandVars", () => {
   it("fills placeholders anywhere in the tree and leaves the input alone", () => {
@@ -27,17 +28,34 @@ describe("applyBrandVars", () => {
   });
 });
 
+/** For a browser saying `lng`: the app's `i18n.language`, and the catalog that answers. */
+async function settle(
+  options: Omit<I18nInitOptions, "storageKey">,
+  lng: string,
+): Promise<[language: string, catalog: string]> {
+  const i18n = createInstance();
+  const resources = Object.fromEntries(
+    options.supportedLngs.map((tag) => [tag, { translation: { tag } }]),
+  );
+  await i18n.init({ ...i18nInitOptions({ ...options, storageKey: "app.locale" }), resources, lng });
+  return [i18n.language, i18n.t("tag")];
+}
+
 describe("i18nInitOptions", () => {
-  // The comment in both donors names the bug: `nonExplicitSupportedLngs` validates the BASE
-  // subtag, which rejects "pt-BR" (its base "pt" is not listed) and silently falls the whole
-  // app back to English. Its absence is load-bearing.
-  it("does not set nonExplicitSupportedLngs", () => {
-    const options = i18nInitOptions({
-      fallbackLng: "en",
-      supportedLngs: ["en", "pt-BR"],
-      storageKey: "app.locale",
-    });
-    expect(options).not.toHaveProperty("nonExplicitSupportedLngs");
+  // `nonExplicitSupportedLngs` breaks both catalog shapes, and this pins both. Region-coded, the
+  // app renders English for a pt-BR reader — the bug both donors' comments name. Base codes, an
+  // "en-US" browser keeps "en-US" as `i18n.language`, which is what an app keys `<html lang>` and
+  // `og:locale` by: the third migration's site missed its lookup and shipped English copy as
+  // `lang="pt-BR"`.
+  it("settles a browser's regional tag on a language the catalogs have", async () => {
+    const baseCodes = { fallbackLng: "pt", supportedLngs: ["pt", "es", "en"] };
+    expect(await settle(baseCodes, "en-US")).toEqual(["en", "en"]);
+    expect(await settle(baseCodes, "es-419")).toEqual(["es", "es"]);
+    expect(await settle(baseCodes, "fr-FR")).toEqual(["pt", "pt"]);
+
+    const regionCoded = { fallbackLng: "en", supportedLngs: ["en", "pt-BR"] };
+    expect(await settle(regionCoded, "pt-BR")).toEqual(["pt-BR", "pt-BR"]);
+    expect(await settle(regionCoded, "en-GB")).toEqual(["en", "en"]);
   });
 
   // Only one donor had the query parameter, and it is the only detection source somebody chose

package/src/i18n.ts

@@ -58,11 +58,13 @@ export function i18nInitOptions({
       lookupLocalStorage: storageKey,
     },
     react: { useSuspense: false },
-    // `nonExplicitSupportedLngs` is omitted deliberately, and both donors say so in the same
-    // words. Enabling it validates the BASE subtag against `supportedLngs`, which rejects a
-    // region-coded "pt-BR" (its base "pt" is not in the list) and silently falls the whole app
-    // back to English. Detected sub-locales like "en-US" already resolve to their base through
-    // i18next's ordinary fallback hierarchy, so the flag buys nothing and breaks pt-BR.
+    // `nonExplicitSupportedLngs` is omitted deliberately. It breaks both shapes a catalog comes in.
+    // Region-coded: it validates the BASE subtag against `supportedLngs`, "pt" is not in a list
+    // that says "pt-BR", and the whole app silently renders English — both donors say so in the
+    // same words. Base codes: an "en-US" browser keeps "en-US" as `i18n.language`. Beside
+    // `currentOnly` no catalog matches it, so the reader gets the fallback language; beside
+    // `languageOnly` the copy is right and every map an app keys by the tag misses — the third
+    // migration shipped English copy as `lang="pt-BR"`. Without the flag "en-US" settles on "en".
   };
 }