intor 2.3.30 → 2.3.31

package/dist/express/src/adapters/express/middleware/create-intor-middleware.js

@@ -1,4 +1,3 @@
-import { INTOR_HEADERS } from '../../../core/constants/headers.js';
 import '../../../core/error/intor-error.js';
 import { normalizeQuery } from '../../../core/utils/normalizers/normalize-query.js';
 import 'logry';
@@ -23,7 +22,7 @@ import { parseCookieHeader } from '../../../server/shared/utils/parse-cookie-hea
  */
 function createIntorMiddleware(config, options) {
     return async function intorMiddleware(req, _res, next) {
-        // locale from accept-language header
+        // Locale from Accept-Language header
         const acceptLanguage = req.headers["accept-language"];
         const localeFromAcceptLanguage = getLocaleFromAcceptLanguage(acceptLanguage, config.supportedLocales);
         // ----------------------------------------------------------
@@ -35,15 +34,10 @@ function createIntorMiddleware(config, options) {
             cookie: parseCookieHeader(req.headers.cookie)[config.cookie.name],
             detected: localeFromAcceptLanguage || config.defaultLocale,
         });
-        // --------------------------------------------------
-        // Attach routing metadata to response headers
-        // --------------------------------------------------
-        req.headers[INTOR_HEADERS.LOCALE] = locale;
-        req.headers[INTOR_HEADERS.LOCALE_SOURCE] = localeSource;
-        req.headers[INTOR_HEADERS.PATHNAME] = pathname;
-        // --------------------------------------------------
+        // ----------------------------------------------------------
         // Bind inbound routing context
-        // --------------------------------------------------
+        // ----------------------------------------------------------
+        req.intor = { locale, localeSource, pathname };
         const { hasKey, t } = (await getTranslator(config, {
             locale,
             handlers: options?.handlers,
@@ -51,7 +45,6 @@ function createIntorMiddleware(config, options) {
             readers: options?.readers,
             allowCacheWrite: true,
         }));
-        req.intor = { locale, localeSource, pathname };
         // DX shortcuts (optional)
         req.locale = locale;
         req.hasKey = hasKey;

package/dist/next/src/adapters/next/proxy/intor-proxy.js

@@ -17,7 +17,7 @@ import { getLocaleFromAcceptLanguage } from '../../../routing/locale/get-locale-
  * @platform Next.js
  */
 const intorProxy = async (config, request) => {
-    // locale from accept-language header
+    // Locale from Accept-Language header
     const acceptLanguageHeader = request.headers.get("accept-language");
     const localeFromAcceptLanguage = getLocaleFromAcceptLanguage(acceptLanguageHeader, config.supportedLocales);
     // Check whether this navigation flow has already redirected

package/dist/svelte-kit/src/adapters/svelte-kit/server/create-intor-handle.js

@@ -1,5 +1,5 @@
 import { redirect } from '@sveltejs/kit';
-import { INTOR_HEADERS } from '../../../core/constants/headers.js';
+import { isSvelteKitSSG } from './utils/is-svelte-kit-ssg.js';
 import '../../../core/error/intor-error.js';
 import { normalizeQuery } from '../../../core/utils/normalizers/normalize-query.js';
 import 'logry';
@@ -18,28 +18,37 @@ import { getLocaleFromAcceptLanguage } from '../../../routing/locale/get-locale-
  */
 function createIntorHandle(config) {
     return async ({ event, resolve }) => {
-        // ----------------------------------------------------------
         // Locale from Accept-Language header
-        // ----------------------------------------------------------
         const acceptLanguage = event.request.headers.get("accept-language");
         const localeFromAcceptLanguage = getLocaleFromAcceptLanguage(acceptLanguage, config.supportedLocales);
         // ----------------------------------------------------------
         // Resolve inbound routing decision (pure computation)
         // ----------------------------------------------------------
-        const { locale, localeSource, pathname, shouldRedirect } = await resolveInbound(config, event.url.pathname, false, {
-            host: event.url.host,
-            query: normalizeQuery(Object.fromEntries(event.url.searchParams.entries())),
-            cookie: event.cookies.get(config.cookie.name),
-            detected: localeFromAcceptLanguage || config.defaultLocale,
-        });
+        let inbound;
+        if (isSvelteKitSSG(event)) {
+            inbound = {
+                locale: event.params?.locale,
+                localeSource: "path",
+                pathname: event.url.pathname,
+                shouldRedirect: false,
+            };
+        }
+        else {
+            inbound = await resolveInbound(config, event.url.pathname, false, {
+                host: event.url.host,
+                query: normalizeQuery(Object.fromEntries(event.url.searchParams.entries())),
+                cookie: event.cookies.get(config.cookie.name),
+                detected: localeFromAcceptLanguage || config.defaultLocale,
+            });
+        }
+        const { locale, localeSource, pathname, shouldRedirect } = inbound;
         // ----------------------------------------------------------
         // Redirect if needed
         // ----------------------------------------------------------
-        if (shouldRedirect) {
-            throw redirect(307, pathname);
-        }
+        if (shouldRedirect)
+            redirect(307, pathname);
         // ----------------------------------------------------------
-        // Attach routing metadata
+        // Bind inbound routing context
         // ----------------------------------------------------------
         // @ts-expect-error - App.Locals must be extended by user
         event.locals.intor = {
@@ -47,10 +56,9 @@ function createIntorHandle(config) {
             localeSource,
             pathname,
         };
-        const response = await resolve(event);
-        response.headers.set(INTOR_HEADERS.LOCALE, locale);
-        response.headers.set(INTOR_HEADERS.LOCALE_SOURCE, localeSource);
-        response.headers.set(INTOR_HEADERS.PATHNAME, pathname);
+        const response = await resolve(event, {
+            transformPageChunk: ({ html }) => html.replace("%lang%", locale),
+        });
         return response;
     };
 }

package/dist/svelte-kit/src/adapters/svelte-kit/server/utils/is-svelte-kit-ssg.js

@@ -0,0 +1,15 @@
+/**
+ * Heuristic to detect static (prerender) execution in SvelteKit.
+ *
+ * This is NOT a guaranteed signal.
+ * It intentionally prefers false positives over false negatives.
+ */
+function isSvelteKitSSG(event) {
+    // No user-agent is a strong signal of static rendering
+    if (event.request.headers.get("user-agent") === null) {
+        return true;
+    }
+    return false;
+}
+
+export { isSvelteKitSSG };

package/dist/types/src/adapters/svelte-kit/server/utils/is-svelte-kit-ssg.d.ts

@@ -0,0 +1,8 @@
+import type { RequestEvent } from "@sveltejs/kit";
+/**
+ * Heuristic to detect static (prerender) execution in SvelteKit.
+ *
+ * This is NOT a guaranteed signal.
+ * It intentionally prefers false positives over false negatives.
+ */
+export declare function isSvelteKitSSG(event: RequestEvent<Record<string, string>, string | null>): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor",
-  "version": "2.3.30",
+  "version": "2.3.31",
   "description": "The i18n library for modern JavaScript",
   "author": "Yiming Liao",
   "homepage": "https://github.com/yiming-liao/intor#readme",
@@ -116,7 +116,7 @@
     "@rollup/plugin-alias": "6.0.0",
     "@rollup/plugin-typescript": "12.3.0",
     "@rollup/pluginutils": "5.3.0",
-    "@sveltejs/kit": "^2.50.1",
+    "@sveltejs/kit": "2.50.1",
     "@testing-library/dom": "10.4.1",
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.1",
@@ -146,7 +146,7 @@
     "remark": "15.0.1",
     "remark-gfm": "4.0.1",
     "rollup": "4.53.3",
-    "rollup-plugin-copy": "^3.5.0",
+    "rollup-plugin-copy": "3.5.0",
     "svelte": "5.46.1",
     "tsc-alias": "1.8.16",
     "tsd": "0.33.0",

package/dist/express/src/core/constants/headers.js

@@ -1,6 +0,0 @@
-const INTOR_HEADERS = {
-    LOCALE: "x-intor-locale",
-    LOCALE_SOURCE: "x-intor-locale-source",
-    PATHNAME: "x-intor-pathname"};
-
-export { INTOR_HEADERS };

package/dist/svelte-kit/src/core/constants/headers.js

@@ -1,6 +0,0 @@
-const INTOR_HEADERS = {
-    LOCALE: "x-intor-locale",
-    LOCALE_SOURCE: "x-intor-locale-source",
-    PATHNAME: "x-intor-pathname"};
-
-export { INTOR_HEADERS };