@inlang/paraglide-js 2.0.12 → 2.1.0

package/dist/compiler/runtime/strategy.test.js

@@ -0,0 +1,94 @@
+import { test, expect, describe, beforeEach } from "vitest";
+import { newProject } from "@inlang/sdk";
+import { defineCustomServerStrategy, defineCustomClientStrategy, isCustomStrategy, } from "./strategy.js";
+import { createParaglide } from "../create-paraglide.js";
+describe("isCustomStrategy", () => {
+    test("returns true for valid custom strategy patterns", () => {
+        expect(isCustomStrategy("custom-header")).toBe(true);
+        expect(isCustomStrategy("custom-auth123")).toBe(true);
+        expect(isCustomStrategy("custom-API")).toBe(true);
+        expect(isCustomStrategy("custom-sessionStorage")).toBe(true);
+        expect(isCustomStrategy("custom-oAuth2")).toBe(true);
+        expect(isCustomStrategy("custom-a")).toBe(true);
+        expect(isCustomStrategy("custom-1")).toBe(true);
+        expect(isCustomStrategy("custom-Z")).toBe(true);
+        expect(isCustomStrategy("custom-9")).toBe(true);
+        expect(isCustomStrategy("custom-aZ19")).toBe(true);
+    });
+    test("returns false for invalid custom strategy patterns", () => {
+        expect(isCustomStrategy("")).toBe(false);
+        expect(isCustomStrategy("custom_")).toBe(false);
+        expect(isCustomStrategy("custom-")).toBe(false);
+        expect(isCustomStrategy("header")).toBe(false);
+        expect(isCustomStrategy("custom")).toBe(false);
+        expect(isCustomStrategy("custom-invalid-name")).toBe(false);
+        expect(isCustomStrategy("custom-invalid_name")).toBe(false);
+        expect(isCustomStrategy("custom-invalid name")).toBe(false);
+        expect(isCustomStrategy("custom-invalid@")).toBe(false);
+        expect(isCustomStrategy("Custom-header")).toBe(false);
+        expect(isCustomStrategy("CUSTOM-header")).toBe(false);
+        expect(isCustomStrategy(null)).toBe(false);
+        expect(isCustomStrategy(undefined)).toBe(false);
+        expect(isCustomStrategy(123)).toBe(false);
+        expect(isCustomStrategy({})).toBe(false);
+        expect(isCustomStrategy([])).toBe(false);
+    });
+    test("returns false for built-in strategy names", () => {
+        expect(isCustomStrategy("cookie")).toBe(false);
+        expect(isCustomStrategy("baseLocale")).toBe(false);
+        expect(isCustomStrategy("globalVariable")).toBe(false);
+        expect(isCustomStrategy("url")).toBe(false);
+        expect(isCustomStrategy("preferredLanguage")).toBe(false);
+        expect(isCustomStrategy("localStorage")).toBe(false);
+    });
+});
+describe.each([
+    ["defineCustomServerStrategy", defineCustomServerStrategy],
+    ["defineCustomClientStrategy", defineCustomClientStrategy],
+])("%s", (strategyName, defineStrategy) => {
+    beforeEach(() => {
+        // Reset global variables before each test
+        if (typeof globalThis !== "undefined") {
+            // @ts-expect-error - Testing environment cleanup
+            delete globalThis.document;
+            // @ts-expect-error - Testing environment cleanup
+            delete globalThis.window;
+            // @ts-expect-error - Testing environment cleanup
+            delete globalThis.localStorage;
+            // @ts-expect-error - Testing environment cleanup
+            delete globalThis.navigator;
+        }
+    });
+    const defaultHandler = { getLocale: () => "en", setLocale: () => { } };
+    const invalidInputs = [
+        ["", "empty name"],
+        ["invalid-name", "names with hyphens"],
+        ["invalid_name", "names with underscores"],
+        ["@invalid", "names with special characters (@)"],
+        ["invalid!", "names with special characters (!)"],
+        ["inva lid", "names with spaces"],
+    ];
+    test.each(invalidInputs)(`${strategyName} throws error for %s (%s)`, (input) => {
+        expect(() => defineStrategy(input, defaultHandler)).toThrow(`Invalid custom strategy: "${input}". Must be a custom strategy following the pattern custom-<name> where <name> contains only alphanumeric characters.`);
+    });
+    test(`${strategyName} should compile with custom strategies in strategy array`, async () => {
+        // Test that compile accepts custom strategies
+        const runtime = await createParaglide({
+            blob: await newProject({
+                settings: {
+                    baseLocale: "en",
+                    locales: ["en", "de", "fr"],
+                },
+            }),
+            strategy: ["custom-auth", "custom-header", "cookie", "baseLocale"],
+            cookieName: "PARAGLIDE_LOCALE",
+        });
+        // Verify the runtime contains the strategy array
+        expect(runtime.strategy).toEqual([
+            "custom-auth",
+            "custom-header",
+            "cookie",
+            "baseLocale",
+        ]);
+    });
+});

package/dist/compiler/runtime/type.d.ts

@@ -28,7 +28,11 @@ export type Runtime = {
     extractLocaleFromUrl: typeof import("./extract-locale-from-url.js").extractLocaleFromUrl;
     extractLocaleFromRequest: typeof import("./extract-locale-from-request.js").extractLocaleFromRequest;
     extractLocaleFromCookie: typeof import("./extract-locale-from-cookie.js").extractLocaleFromCookie;
+    extractLocaleFromHeader: typeof import("./extract-locale-from-header.js").extractLocaleFromHeader;
+    extractLocaleFromNavigator: typeof import("./extract-locale-from-navigator.js").extractLocaleFromNavigator;
     generateStaticLocalizedUrls: typeof import("./generate-static-localized-urls.js").generateStaticLocalizedUrls;
     trackMessageCall: typeof import("./track-message-call.js").trackMessageCall;
+    defineCustomServerStrategy: typeof import("./strategy.js").defineCustomServerStrategy;
+    defineCustomClientStrategy: typeof import("./strategy.js").defineCustomClientStrategy;
 };
 //# sourceMappingURL=type.d.ts.map

package/dist/compiler/runtime/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../src/compiler/runtime/type.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG;IACrB,UAAU,EAAE,cAAc,gBAAgB,EAAE,UAAU,CAAC;IACvD,OAAO,EAAE,cAAc,gBAAgB,EAAE,OAAO,CAAC;IACjD,QAAQ,EAAE,cAAc,gBAAgB,EAAE,QAAQ,CAAC;IACnD,UAAU,EAAE,cAAc,gBAAgB,EAAE,UAAU,CAAC;IACvD,YAAY,EAAE,cAAc,gBAAgB,EAAE,YAAY,CAAC;IAC3D,WAAW,EAAE,cAAc,gBAAgB,EAAE,WAAW,CAAC;IACzD,wBAAwB,EAAE,cAAc,gBAAgB,EAAE,wBAAwB,CAAC;IACnF,uBAAuB,EAAE,cAAc,gBAAgB,EAAE,uBAAuB,CAAC;IACjF,qCAAqC,EAAE,cAAc,gBAAgB,EAAE,qCAAqC,CAAC;IAC7G,QAAQ,EAAE,cAAc,gBAAgB,EAAE,QAAQ,CAAC;IACnD,SAAS,EAAE,cAAc,iBAAiB,EAAE,SAAS,CAAC;IACtD,SAAS,EAAE,cAAc,iBAAiB,EAAE,SAAS,CAAC;IACtD,YAAY,EAAE,cAAc,qBAAqB,EAAE,YAAY,CAAC;IAChE,kBAAkB,EAAE,cAAc,iBAAiB,EAAE,kBAAkB,CAAC;IACxE,kBAAkB,EAAE,cAAc,iBAAiB,EAAE,kBAAkB,CAAC;IACxE,qBAAqB,EAAE,cAAc,qBAAqB,EAAE,qBAAqB,CAAC;IAClF,gCAAgC,EAAE,cAAc,gBAAgB,EAAE,gCAAgC,CAAC;IACnG,cAAc,EAAE,cAAc,uBAAuB,EAAE,cAAc,CAAC;IACtE,QAAQ,EAAE,cAAc,gBAAgB,EAAE,QAAQ,CAAC;IACnD,YAAY,EAAE,cAAc,oBAAoB,EAAE,YAAY,CAAC;IAC/D,cAAc,EAAE,cAAc,oBAAoB,EAAE,cAAc,CAAC;IACnE,WAAW,EAAE,cAAc,mBAAmB,EAAE,WAAW,CAAC;IAC5D,aAAa,EAAE,cAAc,mBAAmB,EAAE,aAAa,CAAC;IAChE,oBAAoB,EAAE,cAAc,8BAA8B,EAAE,oBAAoB,CAAC;IACzF,wBAAwB,EAAE,cAAc,kCAAkC,EAAE,wBAAwB,CAAC;IACrG,uBAAuB,EAAE,cAAc,iCAAiC,EAAE,uBAAuB,CAAC;IAClG,2BAA2B,EAAE,cAAc,qCAAqC,EAAE,2BAA2B,CAAC;IAC9G,gBAAgB,EAAE,cAAc,yBAAyB,EAAE,gBAAgB,CAAC;CAC5E,CAAC"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../src/compiler/runtime/type.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG;IACrB,UAAU,EAAE,cAAc,gBAAgB,EAAE,UAAU,CAAC;IACvD,OAAO,EAAE,cAAc,gBAAgB,EAAE,OAAO,CAAC;IACjD,QAAQ,EAAE,cAAc,gBAAgB,EAAE,QAAQ,CAAC;IACnD,UAAU,EAAE,cAAc,gBAAgB,EAAE,UAAU,CAAC;IACvD,YAAY,EAAE,cAAc,gBAAgB,EAAE,YAAY,CAAC;IAC3D,WAAW,EAAE,cAAc,gBAAgB,EAAE,WAAW,CAAC;IACzD,wBAAwB,EAAE,cAAc,gBAAgB,EAAE,wBAAwB,CAAC;IACnF,uBAAuB,EAAE,cAAc,gBAAgB,EAAE,uBAAuB,CAAC;IACjF,qCAAqC,EAAE,cAAc,gBAAgB,EAAE,qCAAqC,CAAC;IAC7G,QAAQ,EAAE,cAAc,gBAAgB,EAAE,QAAQ,CAAC;IACnD,SAAS,EAAE,cAAc,iBAAiB,EAAE,SAAS,CAAC;IACtD,SAAS,EAAE,cAAc,iBAAiB,EAAE,SAAS,CAAC;IACtD,YAAY,EAAE,cAAc,qBAAqB,EAAE,YAAY,CAAC;IAChE,kBAAkB,EAAE,cAAc,iBAAiB,EAAE,kBAAkB,CAAC;IACxE,kBAAkB,EAAE,cAAc,iBAAiB,EAAE,kBAAkB,CAAC;IACxE,qBAAqB,EAAE,cAAc,qBAAqB,EAAE,qBAAqB,CAAC;IAClF,gCAAgC,EAAE,cAAc,gBAAgB,EAAE,gCAAgC,CAAC;IACnG,cAAc,EAAE,cAAc,uBAAuB,EAAE,cAAc,CAAC;IACtE,QAAQ,EAAE,cAAc,gBAAgB,EAAE,QAAQ,CAAC;IACnD,YAAY,EAAE,cAAc,oBAAoB,EAAE,YAAY,CAAC;IAC/D,cAAc,EAAE,cAAc,oBAAoB,EAAE,cAAc,CAAC;IACnE,WAAW,EAAE,cAAc,mBAAmB,EAAE,WAAW,CAAC;IAC5D,aAAa,EAAE,cAAc,mBAAmB,EAAE,aAAa,CAAC;IAChE,oBAAoB,EAAE,cAAc,8BAA8B,EAAE,oBAAoB,CAAC;IACzF,wBAAwB,EAAE,cAAc,kCAAkC,EAAE,wBAAwB,CAAC;IACrG,uBAAuB,EAAE,cAAc,iCAAiC,EAAE,uBAAuB,CAAC;IAClG,uBAAuB,EAAE,cAAc,iCAAiC,EAAE,uBAAuB,CAAC;IAClG,0BAA0B,EAAE,cAAc,oCAAoC,EAAE,0BAA0B,CAAC;IAC3G,2BAA2B,EAAE,cAAc,qCAAqC,EAAE,2BAA2B,CAAC;IAC9G,gBAAgB,EAAE,cAAc,yBAAyB,EAAE,gBAAgB,CAAC;IAC5E,0BAA0B,EAAE,cAAc,eAAe,EAAE,0BAA0B,CAAC;IACtF,0BAA0B,EAAE,cAAc,eAAe,EAAE,0BAA0B,CAAC;CACtF,CAAC"}

package/dist/compiler/runtime/variables.d.ts

@@ -36,9 +36,9 @@ export const cookieDomain: string;
 /** @type {string} */
 export const localStorageKey: string;
 /**
- * @type {Array<"cookie" | "baseLocale" | "globalVariable" | "url" | "preferredLanguage" | "localStorage">}
+ * @type {Array<"cookie" | "baseLocale" | "globalVariable" | "url" | "preferredLanguage" | "localStorage" | `custom-${string}`>}
  */
-export const strategy: Array<"cookie" | "baseLocale" | "globalVariable" | "url" | "preferredLanguage" | "localStorage">;
+export const strategy: Array<"cookie" | "baseLocale" | "globalVariable" | "url" | "preferredLanguage" | "localStorage" | `custom-${string}`>;
 /**
  * The used URL patterns.
  *

package/dist/compiler/runtime/variables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../../src/compiler/runtime/variables.js"],"names":[],"mappings":"AAwEA;;;;;;;;;GASG;AACH,wDAFW,0BAA0B,GAAG,SAAS,QAIhD;AApFD;;;;;;;GAOG;AACH,yBAA0B,IAAI,CAAC;AAE/B;;;;;;;GAOG;AACH,4CAA2D;AAE3D,qBAAqB;AACrB,yBADW,MAAM,CACyB;AAE1C,qBAAqB;AACrB,2BADW,MAAM,CAC8B;AAE/C,qBAAqB;AACrB,2BADW,MAAM,CAC6B;AAE9C,qBAAqB;AACrB,8BADW,MAAM,CACiC;AAElD;;GAEG;AACH,uBAFU,KAAK,CAAC,QAAQ,GAAG,YAAY,GAAG,gBAAgB,GAAG,KAAK,GAAG,mBAAmB,GAAG,cAAc,CAAC,CAE/D;AAE3C;;;;GAIG;AACH,0BAFU,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;CAAE,CAAC,CAE1C;AAE9B;;;;;;;;;;GAUG;AAEH;;;;;;;GAOG;AACH,oCAFU,0BAA0B,GAAG,SAAS,CAED;AAE/C,uCAAwC,KAAK,CAAC;AAE9C,oDAAqD,KAAK,CAAC;AAE3D,+BAAsD;AAgBtD,8CAA+C,KAAK,CAAC;AAErD,2CAA4C,KAAK,CAAC;AAElD,uDAAwD,KAAK,CAAC;AAE9D,0DAA2D,KAAK,CAAC;AAEjE,kDAAmD,KAAK,CAAC;AAEzD,qDAAsD,KAAK,CAAC;yCAnD/C;IACR,QAAQ,IAAI;QACV,MAAM,CAAC,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;KACzB,GAAG,SAAS,CAAC;IACf,GAAG,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;KAAC,EAC3E,EAAE,EAAE,GAAG,KAAK,GAAG,CAAA;CACjB"}
+{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../../src/compiler/runtime/variables.js"],"names":[],"mappings":"AAwEA;;;;;;;;;GASG;AACH,wDAFW,0BAA0B,GAAG,SAAS,QAIhD;AApFD;;;;;;;GAOG;AACH,yBAA0B,IAAI,CAAC;AAE/B;;;;;;;GAOG;AACH,4CAA2D;AAE3D,qBAAqB;AACrB,yBADW,MAAM,CACyB;AAE1C,qBAAqB;AACrB,2BADW,MAAM,CAC8B;AAE/C,qBAAqB;AACrB,2BADW,MAAM,CAC6B;AAE9C,qBAAqB;AACrB,8BADW,MAAM,CACiC;AAElD;;GAEG;AACH,uBAFU,KAAK,CAAC,QAAQ,GAAG,YAAY,GAAG,gBAAgB,GAAG,KAAK,GAAG,mBAAmB,GAAG,cAAc,GAAG,UAAU,MAAM,EAAE,CAAC,CAEpF;AAE3C;;;;GAIG;AACH,0BAFU,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;CAAE,CAAC,CAE1C;AAE9B;;;;;;;;;;GAUG;AAEH;;;;;;;GAOG;AACH,oCAFU,0BAA0B,GAAG,SAAS,CAED;AAE/C,uCAAwC,KAAK,CAAC;AAE9C,oDAAqD,KAAK,CAAC;AAE3D,+BAAsD;AAgBtD,8CAA+C,KAAK,CAAC;AAErD,2CAA4C,KAAK,CAAC;AAElD,uDAAwD,KAAK,CAAC;AAE9D,0DAA2D,KAAK,CAAC;AAEjE,kDAAmD,KAAK,CAAC;AAEzD,qDAAsD,KAAK,CAAC;yCAnD/C;IACR,QAAQ,IAAI;QACV,MAAM,CAAC,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;KACzB,GAAG,SAAS,CAAC;IACf,GAAG,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;KAAC,EAC3E,EAAE,EAAE,GAAG,KAAK,GAAG,CAAA;CACjB"}

package/dist/compiler/runtime/variables.js

@@ -25,7 +25,7 @@ export const cookieDomain = "<cookie-domain>";
 /** @type {string} */
 export const localStorageKey = "PARAGLIDE_LOCALE";
 /**
- * @type {Array<"cookie" | "baseLocale" | "globalVariable" | "url" | "preferredLanguage" | "localStorage">}
+ * @type {Array<"cookie" | "baseLocale" | "globalVariable" | "url" | "preferredLanguage" | "localStorage" | `custom-${string}`>}
  */
 export const strategy = ["globalVariable"];
 /**

package/dist/compiler/server/middleware.d.ts

@@ -17,7 +17,7 @@
  *
  * @param {Request} request - The incoming request object
  * @param {(args: { request: Request, locale: import("./runtime.js").Locale }) => T | Promise<T>} resolve - Function to handle the request
- *
+ * @param {{ onRedirect:(response: Response) => void }} [callbacks] - Callbacks to handle events from middleware
  * @returns {Promise<Response>}
  *
  * @example
@@ -62,5 +62,7 @@
 export function paraglideMiddleware<T>(request: Request, resolve: (args: {
     request: Request;
     locale: import("./runtime.js").Locale;
-}) => T | Promise<T>): Promise<Response>;
+}) => T | Promise<T>, callbacks?: {
+    onRedirect: (response: Response) => void;
+}): Promise<Response>;
 //# sourceMappingURL=middleware.d.ts.map

package/dist/compiler/server/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/compiler/server/middleware.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4DG;AACH,oCA9Ca,CAAC,WAEH,OAAO,WACP,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,cAAc,EAAE,MAAM,CAAA;CAAE,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAEnF,OAAO,CAAC,QAAQ,CAAC,CA0H7B"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/compiler/server/middleware.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4DG;AACH,oCA9Ca,CAAC,WAEH,OAAO,WACP,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,cAAc,EAAE,MAAM,CAAA;CAAE,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,cACrF;IAAE,UAAU,EAAC,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAA;CAAE,GACzC,OAAO,CAAC,QAAQ,CAAC,CA0I7B"}

package/dist/compiler/server/middleware.js

@@ -18,7 +18,7 @@ import * as runtime from "./runtime.js";
  *
  * @param {Request} request - The incoming request object
  * @param {(args: { request: Request, locale: import("./runtime.js").Locale }) => T | Promise<T>} resolve - Function to handle the request
- *
+ * @param {{ onRedirect:(response: Response) => void }} [callbacks] - Callbacks to handle events from middleware
  * @returns {Promise<Response>}
  *
  * @example
@@ -60,7 +60,7 @@ import * as runtime from "./runtime.js";
  * };
  * ```
  */
-export async function paraglideMiddleware(request, resolve) {
+export async function paraglideMiddleware(request, resolve, callbacks) {
     if (!runtime.disableAsyncLocalStorage && !runtime.serverAsyncLocalStorage) {
         const { AsyncLocalStorage } = await import("async_hooks");
         runtime.overwriteServerAsyncLocalStorage(new AsyncLocalStorage());
@@ -76,7 +76,21 @@ export async function paraglideMiddleware(request, resolve) {
         runtime.strategy.includes("url")) {
         const localizedUrl = runtime.localizeUrl(request.url, { locale });
         if (normalizeURL(localizedUrl.href) !== normalizeURL(request.url)) {
-            return Response.redirect(localizedUrl, 307);
+            // Create headers object with Vary header if preferredLanguage strategy is used
+            /** @type {Record<string, string>} */
+            const headers = {};
+            if (runtime.strategy.includes("preferredLanguage")) {
+                headers["Vary"] = "Accept-Language";
+            }
+            const response = new Response(null, {
+                status: 307,
+                headers: {
+                    Location: localizedUrl.href,
+                    ...headers,
+                },
+            });
+            callbacks?.onRedirect(response);
+            return response;
         }
     }
     // If the strategy includes "url", we need to de-localize the URL

package/dist/compiler/server/middleware.test.js

@@ -109,6 +109,157 @@ test("redirects to localized URL when non-URL strategy determines locale", async
     expect(response.status).toBe(307); // Redirect status code
     expect(response.headers.get("Location")).toBe("https://example.com/fr/some-path");
 });
+test("call onRedirect callback when redirecting to new url", async () => {
+    const runtime = await createParaglide({
+        blob: await newProject({
+            settings: {
+                baseLocale: "en",
+                locales: ["en", "fr"],
+            },
+        }),
+        strategy: ["cookie", "url"],
+        cookieName: "PARAGLIDE_LOCALE",
+        urlPatterns: [
+            {
+                pattern: "https://example.com/:path(.*)?",
+                localized: [
+                    ["en", "https://example.com/en/:path(.*)?"],
+                    ["fr", "https://example.com/fr/:path(.*)?"],
+                ],
+            },
+        ],
+    });
+    // Request to URL in en with cookie specifying French
+    const request = new Request("https://example.com/en/some-path", {
+        headers: {
+            cookie: `PARAGLIDE_LOCALE=fr`,
+            "Sec-Fetch-Dest": "document",
+        },
+    });
+    let response;
+    await runtime.paraglideMiddleware(request, () => {
+        // This shouldn't be called since we should redirect
+        throw new Error("Should not reach here");
+    }, {
+        onRedirect: (res) => {
+            response = res;
+        },
+    });
+    expect(response instanceof Response).toBe(true);
+    // needs to be 307 status code https://github.com/opral/inlang-paraglide-js/issues/416
+    expect(response.status).toBe(307); // Redirect status code
+    expect(response.headers.get("Location")).toBe("https://example.com/fr/some-path");
+});
+test("sets Vary: Accept-Language header when preferredLanguage strategy is used and redirect occurs", async () => {
+    const runtime = await createParaglide({
+        blob: await newProject({
+            settings: {
+                baseLocale: "en",
+                locales: ["en", "fr"],
+            },
+        }),
+        strategy: ["preferredLanguage", "url"],
+        urlPatterns: [
+            {
+                pattern: "https://example.com/:path(.*)?",
+                localized: [
+                    ["en", "https://example.com/en/:path(.*)?"],
+                    ["fr", "https://example.com/fr/:path(.*)?"],
+                ],
+            },
+        ],
+    });
+    // Request with Accept-Language header preferring French
+    const request = new Request("https://example.com/en/some-path", {
+        headers: {
+            "Accept-Language": "fr,en;q=0.8",
+            "Sec-Fetch-Dest": "document",
+        },
+    });
+    const response = await runtime.paraglideMiddleware(request, () => {
+        // This shouldn't be called since we should redirect
+        throw new Error("Should not reach here");
+    });
+    expect(response instanceof Response).toBe(true);
+    expect(response.status).toBe(307); // Redirect status code
+    expect(response.headers.get("Location")).toBe("https://example.com/fr/some-path");
+    // Should have Vary header when preferredLanguage strategy is used
+    expect(response.headers.get("Vary")).toBe("Accept-Language");
+});
+test("does not set Vary header when preferredLanguage strategy is not used", async () => {
+    const runtime = await createParaglide({
+        blob: await newProject({
+            settings: {
+                baseLocale: "en",
+                locales: ["en", "fr"],
+            },
+        }),
+        strategy: ["cookie", "url"],
+        cookieName: "PARAGLIDE_LOCALE",
+        urlPatterns: [
+            {
+                pattern: "https://example.com/:path(.*)?",
+                localized: [
+                    ["en", "https://example.com/en/:path(.*)?"],
+                    ["fr", "https://example.com/fr/:path(.*)?"],
+                ],
+            },
+        ],
+    });
+    // Request with cookie specifying French
+    const request = new Request("https://example.com/en/some-path", {
+        headers: {
+            cookie: `PARAGLIDE_LOCALE=fr`,
+            "Sec-Fetch-Dest": "document",
+        },
+    });
+    const response = await runtime.paraglideMiddleware(request, () => {
+        // This shouldn't be called since we should redirect
+        throw new Error("Should not reach here");
+    });
+    expect(response instanceof Response).toBe(true);
+    expect(response.status).toBe(307); // Redirect status code
+    expect(response.headers.get("Location")).toBe("https://example.com/fr/some-path");
+    // Should NOT have Vary header when preferredLanguage strategy is not used
+    expect(response.headers.get("Vary")).toBe(null);
+});
+test("does not call onRedirect callback when there is no redirecting", async () => {
+    const runtime = await createParaglide({
+        blob: await newProject({
+            settings: {
+                baseLocale: "en",
+                locales: ["en", "fr"],
+            },
+        }),
+        strategy: ["cookie", "url"],
+        cookieName: "PARAGLIDE_LOCALE",
+        urlPatterns: [
+            {
+                pattern: "https://example.com/:path(.*)?",
+                localized: [
+                    ["en", "https://example.com/en/:path(.*)?"],
+                    ["fr", "https://example.com/fr/:path(.*)?"],
+                ],
+            },
+        ],
+    });
+    // Request to URL in en with cookie specifying French
+    const request = new Request("https://example.com/fr/some-path", {
+        headers: {
+            cookie: `PARAGLIDE_LOCALE=fr`,
+            "Sec-Fetch-Dest": "document",
+        },
+    });
+    let response = null;
+    await runtime.paraglideMiddleware(request, () => {
+        return new Response("Hello World");
+    }, {
+        onRedirect: (res) => {
+            response = res;
+        },
+    });
+    expect(response).toBe(null);
+});
 test("does not redirect if URL already matches determined locale", async () => {
     const runtime = await createParaglide({
         blob: await newProject({

package/dist/services/codegen/quotes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quotes.d.ts","sourceRoot":"","sources":["../../../src/services/codegen/quotes.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,eAAO,MAAM,WAAW,QAAS,MAAM,WAAoC,CAAC;AAC5E,yCAAyC;AACzC,eAAO,MAAM,QAAQ,QAAS,MAAM,WAAiB,CAAC"}
+{"version":3,"file":"quotes.d.ts","sourceRoot":"","sources":["../../../src/services/codegen/quotes.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,WAAoC,CAAC;AAC5E,yCAAyC;AACzC,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAAiB,CAAC"}

package/dist/services/env-variables/index.js

@@ -1,5 +1,5 @@
 export const ENV_VARIABLES = {
     PARJS_APP_ID: "library.inlang.paraglideJs",
     PARJS_POSTHOG_TOKEN: "phc_m5yJZCxjOGxF8CJvP5sQ3H0d76xpnLrsmiZHduT4jDz",
-    PARJS_PACKAGE_VERSION: "2.0.12",
+    PARJS_PACKAGE_VERSION: "2.1.0",
 };

package/dist/services/telemetry/capture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../../src/services/telemetry/capture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGnD;;;;GAIG;AACH,eAAO,MAAM,OAAO,UACZ,+BAA+B,QAChC;IACL,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;CAC7C,kBA8BD,CAAC"}
+{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../../src/services/telemetry/capture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGnD;;;;GAIG;AACH,eAAO,MAAM,OAAO,GACnB,OAAO,+BAA+B,EACtC,MAAM;IACL,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;CAC7C,kBA8BD,CAAC"}

package/dist/utilities/detect-json-formatting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detect-json-formatting.d.ts","sourceRoot":"","sources":["../../src/utilities/detect-json-formatting.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,SAC1B,MAAM,KACV,CAAC,CACH,KAAK,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC3C,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAE3C,MAAM,CAOV,CAAC"}
+{"version":3,"file":"detect-json-formatting.d.ts","sourceRoot":"","sources":["../../src/utilities/detect-json-formatting.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,GAChC,MAAM,MAAM,KACV,CAAC,CACH,KAAK,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC3C,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAE3C,MAAM,CAOV,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@inlang/paraglide-js",
   "type": "module",
-  "version": "2.0.12",
+  "version": "2.1.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public",
@@ -31,7 +31,7 @@
     "json5": "2.2.3",
     "unplugin": "^2.1.2",
     "urlpattern-polyfill": "^10.0.0",
-    "@inlang/sdk": "2.4.8",
+    "@inlang/sdk": "2.4.9",
     "@inlang/recommend-sherlock": "0.2.1"
   },
   "devDependencies": {
@@ -44,13 +44,13 @@
     "memfs": "4.17.0",
     "prettier": "^3.4.2",
     "rolldown": "1.0.0-beta.1",
-    "typedoc": "^0.27.7",
-    "typedoc-plugin-markdown": "^4.4.2",
-    "typedoc-plugin-missing-exports": "^3.1.0",
+    "typedoc": "0.28.3",
+    "typedoc-plugin-markdown": "^4.6.0",
+    "typedoc-plugin-missing-exports": "4.0.0",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.20.0",
     "vitest": "2.1.8",
-    "@inlang/paraglide-js": "2.0.12",
+    "@inlang/paraglide-js": "2.1.0",
     "@inlang/plugin-message-format": "4.0.0",
     "@opral/tsconfig": "1.1.0"
   },