-
Notifications
You must be signed in to change notification settings - Fork 135
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix rewrite/redirect with i18n (#469)
* fix rewrite/redirect with i18n * Create cuddly-waves-smash.md
- Loading branch information
Showing
7 changed files
with
235 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"open-next": patch | ||
--- | ||
|
||
fix rewrite/redirect with i18n |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
140 changes: 140 additions & 0 deletions
140
packages/open-next/src/core/routing/i18n/accept-header.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,140 @@ | ||
// Copied from Next.js source code | ||
// https://github.com/vercel/next.js/blob/canary/packages/next/src/server/accept-header.ts | ||
|
||
interface Selection { | ||
pos: number; | ||
pref?: number; | ||
q: number; | ||
token: string; | ||
} | ||
|
||
interface Options { | ||
prefixMatch?: boolean; | ||
type: "accept-language"; | ||
} | ||
|
||
function parse( | ||
raw: string, | ||
preferences: string[] | undefined, | ||
options: Options, | ||
) { | ||
const lowers = new Map<string, { orig: string; pos: number }>(); | ||
const header = raw.replace(/[ \t]/g, ""); | ||
|
||
if (preferences) { | ||
let pos = 0; | ||
for (const preference of preferences) { | ||
const lower = preference.toLowerCase(); | ||
lowers.set(lower, { orig: preference, pos: pos++ }); | ||
if (options.prefixMatch) { | ||
const parts = lower.split("-"); | ||
while ((parts.pop(), parts.length > 0)) { | ||
const joined = parts.join("-"); | ||
if (!lowers.has(joined)) { | ||
lowers.set(joined, { orig: preference, pos: pos++ }); | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
const parts = header.split(","); | ||
const selections: Selection[] = []; | ||
const map = new Set<string>(); | ||
|
||
for (let i = 0; i < parts.length; ++i) { | ||
const part = parts[i]; | ||
if (!part) { | ||
continue; | ||
} | ||
|
||
const params = part.split(";"); | ||
if (params.length > 2) { | ||
throw new Error(`Invalid ${options.type} header`); | ||
} | ||
|
||
let token = params[0].toLowerCase(); | ||
if (!token) { | ||
throw new Error(`Invalid ${options.type} header`); | ||
} | ||
|
||
const selection: Selection = { token, pos: i, q: 1 }; | ||
if (preferences && lowers.has(token)) { | ||
selection.pref = lowers.get(token)!.pos; | ||
} | ||
|
||
map.add(selection.token); | ||
|
||
if (params.length === 2) { | ||
const q = params[1]; | ||
const [key, value] = q.split("="); | ||
|
||
if (!value || (key !== "q" && key !== "Q")) { | ||
throw new Error(`Invalid ${options.type} header`); | ||
} | ||
|
||
const score = parseFloat(value); | ||
if (score === 0) { | ||
continue; | ||
} | ||
|
||
if (Number.isFinite(score) && score <= 1 && score >= 0.001) { | ||
selection.q = score; | ||
} | ||
} | ||
|
||
selections.push(selection); | ||
} | ||
|
||
selections.sort((a, b) => { | ||
if (b.q !== a.q) { | ||
return b.q - a.q; | ||
} | ||
|
||
if (b.pref !== a.pref) { | ||
if (a.pref === undefined) { | ||
return 1; | ||
} | ||
|
||
if (b.pref === undefined) { | ||
return -1; | ||
} | ||
|
||
return a.pref - b.pref; | ||
} | ||
|
||
return a.pos - b.pos; | ||
}); | ||
|
||
const values = selections.map((selection) => selection.token); | ||
if (!preferences || !preferences.length) { | ||
return values; | ||
} | ||
|
||
const preferred: string[] = []; | ||
for (const selection of values) { | ||
if (selection === "*") { | ||
for (const [preference, value] of lowers) { | ||
if (!map.has(preference)) { | ||
preferred.push(value.orig); | ||
} | ||
} | ||
} else { | ||
const lower = selection.toLowerCase(); | ||
if (lowers.has(lower)) { | ||
preferred.push(lowers.get(lower)!.orig); | ||
} | ||
} | ||
} | ||
|
||
return preferred; | ||
} | ||
|
||
export function acceptLanguage(header = "", preferences?: string[]) { | ||
return ( | ||
parse(header, preferences, { | ||
type: "accept-language", | ||
prefixMatch: true, | ||
})[0] || undefined | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
import { NextConfig } from "config/index.js"; | ||
import type { i18nConfig } from "types/next-types"; | ||
import { InternalEvent } from "types/open-next"; | ||
|
||
import { debug } from "../../../adapters/logger.js"; | ||
import { acceptLanguage } from "./accept-header"; | ||
|
||
function isLocalizedPath(path: string): boolean { | ||
return ( | ||
NextConfig.i18n?.locales.includes(path.split("/")[1].toLowerCase()) ?? false | ||
); | ||
} | ||
|
||
// https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/i18n/get-locale-redirect.ts | ||
function getLocaleFromCookie(cookies: Record<string, string>) { | ||
const i18n = NextConfig.i18n; | ||
const nextLocale = cookies.NEXT_LOCALE?.toLowerCase(); | ||
return nextLocale | ||
? i18n?.locales.find((locale) => nextLocale === locale.toLowerCase()) | ||
: undefined; | ||
} | ||
|
||
function detectLocale(internalEvent: InternalEvent, i18n: i18nConfig): string { | ||
const cookiesLocale = getLocaleFromCookie(internalEvent.cookies); | ||
const preferredLocale = acceptLanguage( | ||
internalEvent.headers["accept-language"], | ||
i18n?.locales, | ||
); | ||
debug({ | ||
cookiesLocale, | ||
preferredLocale, | ||
defaultLocale: i18n.defaultLocale, | ||
}); | ||
|
||
return cookiesLocale ?? preferredLocale ?? i18n.defaultLocale; | ||
|
||
// TODO: handle domain based locale detection | ||
} | ||
|
||
export function localizePath(internalEvent: InternalEvent): string { | ||
const i18n = NextConfig.i18n; | ||
if (!i18n) { | ||
return internalEvent.rawPath; | ||
} | ||
if (isLocalizedPath(internalEvent.rawPath)) { | ||
return internalEvent.rawPath; | ||
} | ||
const detectedLocale = detectLocale(internalEvent, i18n); | ||
return `/${detectedLocale}${internalEvent.rawPath}`; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters