next-intl 2.19.1 → 2.19.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
import { isLocaleSupportedOnDomain } from './utils';
|
|
1
|
+
import { getHost, isLocaleSupportedOnDomain } from './utils';
|
|
2
2
|
function getUnprefixedUrl(config, request) {
|
|
3
|
+
var _a, _b;
|
|
3
4
|
const url = new URL(request.url);
|
|
5
|
+
url.host = (_a = getHost(request.headers)) !== null && _a !== void 0 ? _a : url.host;
|
|
6
|
+
url.protocol = (_b = request.headers.get('x-forwarded-proto')) !== null && _b !== void 0 ? _b : url.protocol;
|
|
4
7
|
if (!url.pathname.endsWith('/')) {
|
|
5
8
|
url.pathname += '/';
|
|
6
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAlternateLinksHeaderValue.js","sourceRoot":"","sources":["../../../src/middleware/getAlternateLinksHeaderValue.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAC,yBAAyB,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"getAlternateLinksHeaderValue.js","sourceRoot":"","sources":["../../../src/middleware/getAlternateLinksHeaderValue.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "next-intl",
|
|
3
|
-
"version": "2.19.
|
|
3
|
+
"version": "2.19.2",
|
|
4
4
|
"sideEffects": false,
|
|
5
5
|
"author": "Jan Amann <jan@amann.work>",
|
|
6
6
|
"description": "A minimal, but complete solution for internationalization in Next.js apps.",
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"dependencies": {
|
|
68
68
|
"@formatjs/intl-localematcher": "^0.2.32",
|
|
69
69
|
"negotiator": "^0.6.3",
|
|
70
|
-
"use-intl": "^2.19.
|
|
70
|
+
"use-intl": "^2.19.2"
|
|
71
71
|
},
|
|
72
72
|
"peerDependencies": {
|
|
73
73
|
"next": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0",
|
|
@@ -103,5 +103,5 @@
|
|
|
103
103
|
"engines": {
|
|
104
104
|
"node": ">=10"
|
|
105
105
|
},
|
|
106
|
-
"gitHead": "
|
|
106
|
+
"gitHead": "9038031fb733e7d0f7b2403d0de59581d972676a"
|
|
107
107
|
}
|
|
@@ -2,10 +2,13 @@ import {NextRequest} from 'next/server';
|
|
|
2
2
|
import MiddlewareConfig, {
|
|
3
3
|
MiddlewareConfigWithDefaults
|
|
4
4
|
} from './NextIntlMiddlewareConfig';
|
|
5
|
-
import {isLocaleSupportedOnDomain} from './utils';
|
|
5
|
+
import {getHost, isLocaleSupportedOnDomain} from './utils';
|
|
6
6
|
|
|
7
7
|
function getUnprefixedUrl(config: MiddlewareConfig, request: NextRequest) {
|
|
8
8
|
const url = new URL(request.url);
|
|
9
|
+
url.host = getHost(request.headers) ?? url.host;
|
|
10
|
+
url.protocol = request.headers.get('x-forwarded-proto') ?? url.protocol;
|
|
11
|
+
|
|
9
12
|
if (!url.pathname.endsWith('/')) {
|
|
10
13
|
url.pathname += '/';
|
|
11
14
|
}
|