cloudflare-next-intl 0.10.6 → 0.10.8

package/dist/src/firebase_auth_check/check_firebase_auth_config.d.ts

@@ -27,3 +27,8 @@ export declare function extractFieldValue(body: string, key: string): {
 } | null;
 export declare function formatFirebaseAuthConfigMessage(issues: FirebaseAuthConfigIssue[], intlConfigPath?: string): string;
 export declare function checkFirebaseAuthConfig(options?: CheckFirebaseAuthConfigOptions): CheckFirebaseAuthConfigReport;
+export interface ValidateFirebaseAuthConfigValuesOptions {
+    firebaseAuth: Record<string, unknown> | undefined;
+    intlConfigPath?: string;
+}
+export declare function validateFirebaseAuthConfigValues(options: ValidateFirebaseAuthConfigValuesOptions): CheckFirebaseAuthConfigReport;

package/dist/src/firebase_auth_check/check_firebase_auth_config.js

@@ -337,7 +337,29 @@ function resolveSpreadBodies(mainBody, source, fromFile, cache) {
     return { bodies, hasUnresolvedSpread };
 }
 export function extractFieldValue(body, key) {
-    const keyMatch = new RegExp(`(^|[\\s{,])${key}\\s*:`).exec(maskCommentsAndStrings(body));
+    const masked = maskCommentsAndStrings(body);
+    const keyPattern = new RegExp(`^${key}\\s*:`);
+    let searchDepth = 0;
+    let scanIndex = 0;
+    let keyMatch = null;
+    while (scanIndex < masked.length) {
+        const char = masked[scanIndex];
+        if (char === "{" || char === "[" || char === "(") {
+            searchDepth += 1;
+        }
+        else if (char === "}" || char === "]" || char === ")") {
+            searchDepth -= 1;
+        }
+        else if (searchDepth === 0 && (scanIndex === 0 || /[\s{,]/.test(masked[scanIndex - 1]))) {
+            const candidate = keyPattern.exec(masked.slice(scanIndex));
+            if (candidate) {
+                keyMatch = candidate;
+                keyMatch.index = scanIndex;
+                break;
+            }
+        }
+        scanIndex += 1;
+    }
     if (!keyMatch)
         return null;
     const start = keyMatch.index + keyMatch[0].length;
@@ -531,3 +553,54 @@ export function checkFirebaseAuthConfig(options = {}) {
     }
     return { valid, checked: true, issues, formattedMessage };
 }
+function isUsableFieldValue(value) {
+    if (value === undefined || value === null)
+        return false;
+    if (typeof value === "string")
+        return value.trim() !== "";
+    return true;
+}
+const UNUSABLE_REASON = "resolved to an empty or missing value";
+export function validateFirebaseAuthConfigValues(options) {
+    const { firebaseAuth } = options;
+    if (!firebaseAuth) {
+        return { valid: true, checked: false, issues: [], formattedMessage: "" };
+    }
+    const issues = [];
+    for (const key of REQUIRED_AUTH_FIELDS) {
+        if (!isUsableFieldValue(firebaseAuth[key])) {
+            issues.push({ field: `firebaseAuth.${key}`, severity: "error", reason: UNUSABLE_REASON });
+        }
+    }
+    const appCheck = firebaseAuth.appCheck;
+    if (appCheck && appCheck.reportMissingServerCredentials !== false) {
+        for (const key of REQUIRED_APP_CHECK_FIELDS) {
+            if (!isUsableFieldValue(appCheck[key])) {
+                issues.push({ field: `firebaseAuth.appCheck.${key}`, severity: "warning", reason: UNUSABLE_REASON });
+            }
+        }
+        const hasPrivateKey = isUsableFieldValue(appCheck.privateKey);
+        const tripleUsable = OAUTH_TRIPLE.map((key) => isUsableFieldValue(appCheck[key]));
+        const hasTriple = tripleUsable.every(Boolean);
+        if (!hasPrivateKey && !hasTriple) {
+            const hasPartialTriple = tripleUsable.some(Boolean);
+            if (hasPartialTriple) {
+                OAUTH_TRIPLE.forEach((key, index) => {
+                    if (!tripleUsable[index]) {
+                        issues.push({ field: `firebaseAuth.appCheck.${key}`, severity: "warning", reason: UNUSABLE_REASON });
+                    }
+                });
+            }
+            else {
+                issues.push({
+                    field: "firebaseAuth.appCheck.privateKey",
+                    severity: "warning",
+                    reason: UNUSABLE_REASON + " — set it, or the full oauthClientId/oauthClientSecret/oauthRefreshToken triple",
+                });
+            }
+        }
+    }
+    const valid = !issues.some((issue) => issue.severity === "error");
+    const formattedMessage = formatFirebaseAuthConfigMessage(issues, options.intlConfigPath);
+    return { valid, checked: true, issues, formattedMessage };
+}

package/dist/src/firebase_auth_check/index.d.ts

@@ -1 +1,2 @@
-export { checkFirebaseAuthConfig, formatFirebaseAuthConfigMessage, extractObjectLiteral, extractFieldValue, type FirebaseAuthConfigIssue, type CheckFirebaseAuthConfigOptions, type CheckFirebaseAuthConfigReport, } from "./check_firebase_auth_config.js";
+export { checkFirebaseAuthConfig, validateFirebaseAuthConfigValues, formatFirebaseAuthConfigMessage, extractObjectLiteral, extractFieldValue, type FirebaseAuthConfigIssue, type CheckFirebaseAuthConfigOptions, type CheckFirebaseAuthConfigReport, type ValidateFirebaseAuthConfigValuesOptions, } from "./check_firebase_auth_config.js";
+export { loadResolvedFirebaseAuth, type LoadResolvedFirebaseAuthOptions } from "./load_resolved_firebase_auth.js";

package/dist/src/firebase_auth_check/index.js

@@ -1 +1,2 @@
-export { checkFirebaseAuthConfig, formatFirebaseAuthConfigMessage, extractObjectLiteral, extractFieldValue, } from "./check_firebase_auth_config.js";
+export { checkFirebaseAuthConfig, validateFirebaseAuthConfigValues, formatFirebaseAuthConfigMessage, extractObjectLiteral, extractFieldValue, } from "./check_firebase_auth_config.js";
+export { loadResolvedFirebaseAuth } from "./load_resolved_firebase_auth.js";

package/dist/src/firebase_auth_check/load_resolved_firebase_auth.d.ts

@@ -0,0 +1,8 @@
+import type { ResolvedConfig } from "vite";
+export interface LoadResolvedFirebaseAuthOptions {
+    intlConfigPath: string;
+    viteConfig: Pick<ResolvedConfig, "root" | "envDir" | "mode"> & {
+        resolve: Pick<ResolvedConfig["resolve"], "alias">;
+    };
+}
+export declare function loadResolvedFirebaseAuth(options: LoadResolvedFirebaseAuthOptions): Promise<Record<string, unknown> | undefined>;

package/dist/src/firebase_auth_check/load_resolved_firebase_auth.js

@@ -0,0 +1,51 @@
+export async function loadResolvedFirebaseAuth(options) {
+    let server;
+    try {
+        const { createServer } = await import("vite");
+        server = await createServer({
+            configFile: false,
+            root: options.viteConfig.root,
+            envDir: options.viteConfig.envDir,
+            mode: options.viteConfig.mode,
+            resolve: { alias: options.viteConfig.resolve.alias },
+            server: { middlewareMode: true, hmr: false, watch: null },
+            optimizeDeps: { noDiscovery: true },
+            logLevel: "silent",
+            clearScreen: false,
+            ssr: { noExternal: ["cloudflare-next-intl", /^cloudflare:/] },
+            plugins: [
+                {
+                    name: "cfni:firebase-auth-check-intl-config-alias",
+                    enforce: "pre",
+                    resolveId(id) {
+                        if (id === "@intl-config")
+                            return options.intlConfigPath;
+                        if (id === "cloudflare:workers" || id.startsWith("cloudflare:")) {
+                            return "\0cfni:cloudflare-workers-stub";
+                        }
+                    },
+                    load(id) {
+                        if (id === "\0cfni:cloudflare-workers-stub") {
+                            return ("export class WorkerEntrypoint {}\n" +
+                                "export class DurableObject {}\n" +
+                                "export const env = {};\n" +
+                                "export default {};\n");
+                        }
+                    },
+                },
+            ],
+        });
+        const mod = await server.ssrLoadModule(options.intlConfigPath);
+        const exported = mod.default;
+        const firebaseAuth = exported?.firebaseAuth;
+        return firebaseAuth && typeof firebaseAuth === "object"
+            ? firebaseAuth
+            : undefined;
+    }
+    catch {
+        return undefined;
+    }
+    finally {
+        await server?.close();
+    }
+}

package/dist/src/vite/buffer_stub.d.ts

@@ -0,0 +1,3 @@
+import type { Plugin } from "vite";
+export declare const BUFFER_STUB_ID = "\0cfni:buffer-stub";
+export declare function bufferStubPlugin(): Plugin;

package/dist/src/vite/buffer_stub.js

@@ -0,0 +1,18 @@
+export const BUFFER_STUB_ID = "\0cfni:buffer-stub";
+export function bufferStubPlugin() {
+    return {
+        name: "cfni:buffer-stub",
+        enforce: "pre",
+        resolveId(id, _importer, options) {
+            if ((id === "node:buffer" || id === "buffer") &&
+                (this.environment?.name === "client" || options?.ssr === false)) {
+                return BUFFER_STUB_ID;
+            }
+        },
+        load(id) {
+            if (id === BUFFER_STUB_ID) {
+                return `export { Buffer } from "buffer";\nexport default { Buffer };`;
+            }
+        },
+    };
+}

package/dist/src/vite/firebase_auth_check_plugin.js

@@ -1,4 +1,4 @@
-import { checkFirebaseAuthConfig } from "../firebase_auth_check/index.js";
+import { checkFirebaseAuthConfig, validateFirebaseAuthConfigValues, loadResolvedFirebaseAuth, } from "../firebase_auth_check/index.js";
 import { resolveDefaultIntlConfigPath } from "./locale_file_plugin.js";
 export function firebaseAuthCheckPlugin(options = {}) {
     let ran = false;
@@ -23,7 +23,21 @@ export function firebaseAuthCheckPlugin(options = {}) {
                     ...process.env,
                 };
             }
-            const report = checkFirebaseAuthConfig({ intlConfigPath, env, throwOnError: false });
+            const previousEnv = { ...process.env };
+            Object.assign(process.env, env);
+            let firebaseAuth;
+            try {
+                firebaseAuth = await loadResolvedFirebaseAuth({
+                    intlConfigPath,
+                    viteConfig: { root: config.root, envDir: config.envDir, mode: config.mode, resolve: { alias: config.resolve?.alias } },
+                });
+            }
+            finally {
+                process.env = previousEnv;
+            }
+            const report = firebaseAuth !== undefined
+                ? validateFirebaseAuthConfigValues({ firebaseAuth, intlConfigPath })
+                : checkFirebaseAuthConfig({ intlConfigPath, env, throwOnError: false });
             if (report.issues.length === 0)
                 return;
             console.warn(report.formattedMessage);

package/dist/src/vite/index.d.ts

@@ -5,6 +5,8 @@ export { firebaseAuthCheckPlugin, type FirebaseAuthCheckPluginOptions } from "./
 export { buildIdAsset } from "./build_id_asset.js";
 export { userAgentStubPlugin, USER_AGENT_STUB_ID, USER_AGENT_STUB_CODE } from "./user_agent_stub.js";
 export { cfWorkersClientStubPlugin, CF_WORKERS_CLIENT_STUB_ID, CF_WORKERS_CLIENT_STUB_CODE } from "./cf_workers_client_stub.js";
+export { bufferStubPlugin, BUFFER_STUB_ID } from "./buffer_stub.js";
+export { reactEvalStubPlugin, reactEvalEsbuildPlugin, transformReactEval, EVAL_WARNING_RE, EVAL_POLYFILL_SNIPPET, } from "./react_eval_stub.js";
 export { vinextRouteWiringFixPlugin, patchAppPageRouteWiring, isAppPageRouteWiringFile, isAppPageRouteWiringAlreadyFixed, isVinextAppPageRouteWiringSafeOnDisk, patchAppPageProbe, isAppPageProbeFile, isAppPageProbeAlreadyFixed, isVinextAppPageProbeSafeOnDisk, type VinextRouteWiringFixPluginOptions, } from "./vinext_route_wiring_fix.js";
 export { localeFilePlugin, resolveDefaultIntlConfigPath, type LocaleFilePluginOptions } from "./locale_file_plugin.js";
 export { lucideOptimizerPlugin, detectLucideReact, resolveLucideEsmEntry, parseLucideIconMap, transformLucideImports, transformNextJsImports, type LucideOptimizerPluginOptions, } from "./lucide_optimizer_plugin.js";

package/dist/src/vite/index.js

@@ -5,6 +5,8 @@ export { firebaseAuthCheckPlugin } from "./firebase_auth_check_plugin.js";
 export { buildIdAsset } from "./build_id_asset.js";
 export { userAgentStubPlugin, USER_AGENT_STUB_ID, USER_AGENT_STUB_CODE } from "./user_agent_stub.js";
 export { cfWorkersClientStubPlugin, CF_WORKERS_CLIENT_STUB_ID, CF_WORKERS_CLIENT_STUB_CODE } from "./cf_workers_client_stub.js";
+export { bufferStubPlugin, BUFFER_STUB_ID } from "./buffer_stub.js";
+export { reactEvalStubPlugin, reactEvalEsbuildPlugin, transformReactEval, EVAL_WARNING_RE, EVAL_POLYFILL_SNIPPET, } from "./react_eval_stub.js";
 export { vinextRouteWiringFixPlugin, patchAppPageRouteWiring, isAppPageRouteWiringFile, isAppPageRouteWiringAlreadyFixed, isVinextAppPageRouteWiringSafeOnDisk, patchAppPageProbe, isAppPageProbeFile, isAppPageProbeAlreadyFixed, isVinextAppPageProbeSafeOnDisk, } from "./vinext_route_wiring_fix.js";
 export { localeFilePlugin, resolveDefaultIntlConfigPath } from "./locale_file_plugin.js";
 export { lucideOptimizerPlugin, detectLucideReact, resolveLucideEsmEntry, parseLucideIconMap, transformLucideImports, transformNextJsImports, } from "./lucide_optimizer_plugin.js";

package/dist/src/vite/plugin.d.ts

@@ -14,6 +14,8 @@ export interface CloudflareNextIntlOptions extends LocaleFilePluginOptions {
     localeFiles?: boolean;
     userAgentStub?: boolean;
     cfWorkersClientStub?: boolean;
+    bufferStub?: boolean;
+    reactEvalStub?: boolean;
     imageOptimizer?: boolean | ImageOptimizerPluginOptions;
     vinextRouteWiringFix?: boolean | VinextRouteWiringFixPluginOptions;
     autoLocaleParams?: boolean | AutoLocaleParamsPluginOptions;

package/dist/src/vite/plugin.js

@@ -1,6 +1,8 @@
 import { buildIdAsset } from "./build_id_asset.js";
 import { userAgentStubPlugin } from "./user_agent_stub.js";
 import { cfWorkersClientStubPlugin } from "./cf_workers_client_stub.js";
+import { bufferStubPlugin } from "./buffer_stub.js";
+import { reactEvalStubPlugin } from "./react_eval_stub.js";
 import { localeFilePlugin } from "./locale_file_plugin.js";
 import { imageOptimizerPlugin } from "../image_optimizer/index.js";
 import { autoDynamicPagesPlugin } from "./auto_dynamic_pages_plugin.js";
@@ -54,6 +56,12 @@ export function cloudflareNextIntl(options = {}) {
         const fileName = typeof options.buildIdAsset === "string" ? options.buildIdAsset : "BUILD_ID";
         plugins.push(buildIdAsset(fileName));
     }
+    if (options.bufferStub !== false) {
+        plugins.push(bufferStubPlugin());
+    }
+    if (options.reactEvalStub !== false) {
+        plugins.push(reactEvalStubPlugin());
+    }
     if (options.cfWorkersClientStub !== false) {
         plugins.push(cfWorkersClientStubPlugin());
     }

package/dist/src/vite/react_eval_stub.d.ts

@@ -0,0 +1,10 @@
+import type { Plugin } from "vite";
+import type { PluginBuild } from "esbuild";
+export declare const EVAL_WARNING_RE: RegExp;
+export declare const EVAL_POLYFILL_SNIPPET = "\nif (typeof globalThis !== \"undefined\") {\n  try {\n    (0, eval)(\"null\");\n  } catch {\n    var _origEval = globalThis.eval;\n    globalThis.eval = function (code) {\n      if (code === \"null\") return null;\n      if (typeof code === \"string\") {\n        var match = code.match(/\\(\\{\\s*(\"(?:[^\"\\\\\\\\]|\\\\.)*\")\\s*:\\s*(?:async\\s+)?(?:function|\\(?\\)?\\s*=>|class)/);\n        if (match) {\n          try {\n            var name = JSON.parse(match[1]);\n            var fn = function () {};\n            Object.defineProperty(fn, \"name\", { value: name, configurable: true });\n            return { [name]: fn };\n          } catch {}\n        }\n      }\n      if (typeof _origEval === \"function\") {\n        try {\n          return _origEval.call(this, code);\n        } catch {}\n      }\n      return null;\n    };\n  }\n}\n";
+export declare function transformReactEval(code: string): string;
+export declare const reactEvalEsbuildPlugin: {
+    name: string;
+    setup(build: PluginBuild): void;
+};
+export declare function reactEvalStubPlugin(): Plugin;

package/dist/src/vite/react_eval_stub.js

@@ -0,0 +1,91 @@
+export const EVAL_WARNING_RE = /console\.error\(\s*["']eval\(\) is not supported in this environment[\s\S]*?React will never use eval\(\) in production mode["']\s*\);?/g;
+export const EVAL_POLYFILL_SNIPPET = `
+if (typeof globalThis !== "undefined") {
+  try {
+    (0, eval)("null");
+  } catch {
+    var _origEval = globalThis.eval;
+    globalThis.eval = function (code) {
+      if (code === "null") return null;
+      if (typeof code === "string") {
+        var match = code.match(/\\(\\{\\s*("(?:[^"\\\\\\\\]|\\\\.)*")\\s*:\\s*(?:async\\s+)?(?:function|\\(?\\)?\\s*=>|class)/);
+        if (match) {
+          try {
+            var name = JSON.parse(match[1]);
+            var fn = function () {};
+            Object.defineProperty(fn, "name", { value: name, configurable: true });
+            return { [name]: fn };
+          } catch {}
+        }
+      }
+      if (typeof _origEval === "function") {
+        try {
+          return _origEval.call(this, code);
+        } catch {}
+      }
+      return null;
+    };
+  }
+}
+`;
+export function transformReactEval(code) {
+    if (!code.includes("eval() is not supported in this environment")) {
+        return code;
+    }
+    return EVAL_POLYFILL_SNIPPET + "\n" + code.replace(EVAL_WARNING_RE, "/* silenced react eval warning */");
+}
+export const reactEvalEsbuildPlugin = {
+    name: "cfni:react-eval-stub-esbuild",
+    setup(build) {
+        build.onLoad({ filter: /react-server-dom-webpack.*\.js$/ }, async (args) => {
+            const fs = await import("node:fs/promises");
+            const raw = await fs.readFile(args.path, "utf8");
+            if (raw.includes("eval() is not supported in this environment")) {
+                return {
+                    contents: transformReactEval(raw),
+                    loader: "js",
+                };
+            }
+        });
+    },
+};
+export function reactEvalStubPlugin() {
+    return {
+        name: "cfni:react-eval-stub",
+        enforce: "pre",
+        transform(code) {
+            if (code.includes("eval() is not supported in this environment")) {
+                return {
+                    code: transformReactEval(code),
+                    map: null,
+                };
+            }
+        },
+        config() {
+            return {
+                optimizeDeps: {
+                    exclude: ["react-server-dom-webpack", "react-server-dom-webpack/client.edge"],
+                    esbuildOptions: {
+                        plugins: [reactEvalEsbuildPlugin],
+                    },
+                },
+                ssr: {
+                    optimizeDeps: {
+                        esbuildOptions: {
+                            plugins: [reactEvalEsbuildPlugin],
+                        },
+                    },
+                },
+                environments: {
+                    rsc: {
+                        optimizeDeps: {
+                            esbuildOptions: {
+                                plugins: [reactEvalEsbuildPlugin],
+                            },
+                        },
+                    },
+                },
+            };
+        },
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflare-next-intl",
-  "version": "0.10.6",
+  "version": "0.10.8",
   "description": "Optimized Next Intl Package Special for App Router and Cloudflare",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",