next-intl 2.12.0-beta.1 → 2.12.0-beta.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.
- package/dist/src/client/getCookieLocale.js +2 -1
- package/dist/src/client/getCookieLocale.js.map +1 -1
- package/dist/src/middleware/getHost.js +2 -3
- package/dist/src/middleware/getHost.js.map +1 -1
- package/dist/src/middleware/middleware.js +3 -2
- package/dist/src/middleware/middleware.js.map +1 -1
- package/dist/src/middleware/resolveLocale.js +5 -3
- package/dist/src/middleware/resolveLocale.js.map +1 -1
- package/dist/src/middleware/setAlternateLinksHeader.js +2 -1
- package/dist/src/middleware/setAlternateLinksHeader.js.map +1 -1
- package/dist/src/react-server/useIntl.js +5 -0
- package/dist/src/react-server/useIntl.js.map +1 -1
- package/dist/src/server/getConfig.js +2 -2
- package/dist/src/server/getConfig.js.map +1 -1
- package/dist/src/server/getLocale.js +2 -1
- package/dist/src/server/getLocale.js.map +1 -1
- package/dist/src/shared/Link.js +1 -1
- package/dist/src/shared/Link.js.map +1 -1
- package/package.json +1 -1
- package/src/react-server/useIntl.tsx +9 -0
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { COOKIE_LOCALE_NAME } from '../shared/constants';
|
|
2
2
|
function getCookieValueByName(name) {
|
|
3
|
+
var _a;
|
|
3
4
|
// https://stackoverflow.com/a/15724300/343045
|
|
4
5
|
const value = `; ${document.cookie}`;
|
|
5
6
|
const parts = value.split(`; ${name}=`);
|
|
6
7
|
if (parts.length === 2) {
|
|
7
|
-
const part = parts.pop()
|
|
8
|
+
const part = (_a = parts.pop()) === null || _a === void 0 ? void 0 : _a.split(';').shift();
|
|
8
9
|
if (part)
|
|
9
10
|
return part;
|
|
10
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCookieLocale.js","sourceRoot":"","sources":["../../../src/client/getCookieLocale.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AAEvD,SAAS,oBAAoB,CAAC,IAAY
|
|
1
|
+
{"version":3,"file":"getCookieLocale.js","sourceRoot":"","sources":["../../../src/client/getCookieLocale.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AAEvD,SAAS,oBAAoB,CAAC,IAAY;;IACxC,8CAA8C;IAC9C,MAAM,KAAK,GAAG,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC;IACrC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC;IACxC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,MAAM,IAAI,GAAG,MAAA,KAAK,CAAC,GAAG,EAAE,0CAAE,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC;QAC7C,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;KACvB;IAED,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,eAAe;IACrC,OAAO,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;AAClD,CAAC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
export default function getHost(requestHeaders) {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
undefined);
|
|
2
|
+
var _a, _b;
|
|
3
|
+
return ((_b = (_a = requestHeaders.get('x-forwarded-host')) !== null && _a !== void 0 ? _a : requestHeaders.get('host')) !== null && _b !== void 0 ? _b : undefined);
|
|
5
4
|
}
|
|
6
5
|
//# sourceMappingURL=getHost.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getHost.js","sourceRoot":"","sources":["../../../src/middleware/getHost.tsx"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,cAAuB
|
|
1
|
+
{"version":3,"file":"getHost.js","sourceRoot":"","sources":["../../../src/middleware/getHost.tsx"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,cAAuB;;IACrD,OAAO,CACL,MAAA,MAAA,cAAc,CAAC,GAAG,CAAC,kBAAkB,CAAC,mCACtC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,mCAC1B,SAAS,CACV,CAAC;AACJ,CAAC"}
|
|
@@ -5,9 +5,10 @@ import setAlternateLinksHeader from './setAlternateLinksHeader';
|
|
|
5
5
|
const ROOT_URL = '/';
|
|
6
6
|
export default function createIntlMiddleware(config) {
|
|
7
7
|
return function middleware(request) {
|
|
8
|
+
var _a, _b;
|
|
8
9
|
const { domain, locale } = resolveLocale(config, request.headers, request.cookies, request.nextUrl.pathname);
|
|
9
10
|
const isRoot = request.nextUrl.pathname === ROOT_URL;
|
|
10
|
-
const hasOutdatedCookie = request.cookies.get(COOKIE_LOCALE_NAME)
|
|
11
|
+
const hasOutdatedCookie = ((_a = request.cookies.get(COOKIE_LOCALE_NAME)) === null || _a === void 0 ? void 0 : _a.value) !== locale;
|
|
11
12
|
const hasMatchedDefaultLocale = domain
|
|
12
13
|
? domain.defaultLocale === locale
|
|
13
14
|
: locale === config.defaultLocale;
|
|
@@ -75,7 +76,7 @@ export default function createIntlMiddleware(config) {
|
|
|
75
76
|
if (hasOutdatedCookie) {
|
|
76
77
|
response.cookies.set(COOKIE_LOCALE_NAME, locale);
|
|
77
78
|
}
|
|
78
|
-
if ((config.alternateLinks
|
|
79
|
+
if (((_b = config.alternateLinks) !== null && _b !== void 0 ? _b : true) && config.locales.length > 1) {
|
|
79
80
|
setAlternateLinksHeader(config, request, response);
|
|
80
81
|
}
|
|
81
82
|
return response;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/middleware/middleware.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAC,MAAM,aAAa,CAAC;AACtD,OAAO,EAAC,kBAAkB,EAAE,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AAE3E,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAEhE,MAAM,QAAQ,GAAG,GAAG,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,MAAgC;IAC3E,OAAO,SAAS,UAAU,CAAC,OAAoB
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/middleware/middleware.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,12 @@ import Negotiator from 'negotiator';
|
|
|
3
3
|
import { COOKIE_LOCALE_NAME } from '../shared/constants';
|
|
4
4
|
import getHost from './getHost';
|
|
5
5
|
function findLocaleDomain(requestHeaders, i18n) {
|
|
6
|
+
var _a;
|
|
6
7
|
let host = getHost(requestHeaders);
|
|
7
8
|
// Remove port
|
|
8
|
-
host = host
|
|
9
|
+
host = host === null || host === void 0 ? void 0 : host.replace(/:\d+$/, '');
|
|
9
10
|
// Consider optional www subdomain
|
|
10
|
-
const domains = i18n.domains
|
|
11
|
+
const domains = (_a = i18n.domains) === null || _a === void 0 ? void 0 : _a.flatMap((cur) => {
|
|
11
12
|
if (cur.domain.startsWith('www.')) {
|
|
12
13
|
return cur;
|
|
13
14
|
}
|
|
@@ -20,6 +21,7 @@ function findLocaleDomain(requestHeaders, i18n) {
|
|
|
20
21
|
return undefined;
|
|
21
22
|
}
|
|
22
23
|
export default function resolveLocale(i18n, requestHeaders, requestCookies, pathname) {
|
|
24
|
+
var _a;
|
|
23
25
|
let locale, domain;
|
|
24
26
|
// Prio 1: Use route prefix
|
|
25
27
|
if (pathname) {
|
|
@@ -41,7 +43,7 @@ export default function resolveLocale(i18n, requestHeaders, requestCookies, path
|
|
|
41
43
|
// Prio 3: Use existing cookie
|
|
42
44
|
if (!locale && requestCookies) {
|
|
43
45
|
if (requestCookies.has(COOKIE_LOCALE_NAME)) {
|
|
44
|
-
const value = requestCookies.get(COOKIE_LOCALE_NAME)
|
|
46
|
+
const value = (_a = requestCookies.get(COOKIE_LOCALE_NAME)) === null || _a === void 0 ? void 0 : _a.value;
|
|
45
47
|
if (value && i18n.locales.includes(value)) {
|
|
46
48
|
locale = value;
|
|
47
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveLocale.js","sourceRoot":"","sources":["../../../src/middleware/resolveLocale.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,8BAA8B,CAAC;AACnD,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AAEvD,OAAO,OAAO,MAAM,WAAW,CAAC;AAEhC,SAAS,gBAAgB,CACvB,cAAuB,EACvB,IAA8B
|
|
1
|
+
{"version":3,"file":"resolveLocale.js","sourceRoot":"","sources":["../../../src/middleware/resolveLocale.tsx"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ function getAlternateEntry(url, locale) {
|
|
|
19
19
|
export default function setAlternateLinksHeader(config, request, response) {
|
|
20
20
|
const unprefixedPathname = getUnprefixedPathname(config, request);
|
|
21
21
|
const links = config.locales.flatMap((locale) => {
|
|
22
|
+
var _a;
|
|
22
23
|
function localizePathname(url) {
|
|
23
24
|
if (url.pathname === '/') {
|
|
24
25
|
url.pathname = `/${locale}`;
|
|
@@ -29,7 +30,7 @@ export default function setAlternateLinksHeader(config, request, response) {
|
|
|
29
30
|
return url;
|
|
30
31
|
}
|
|
31
32
|
let url;
|
|
32
|
-
const domainConfigs = config.domains
|
|
33
|
+
const domainConfigs = ((_a = config.domains) === null || _a === void 0 ? void 0 : _a.filter((cur) => cur.defaultLocale === locale)) || [];
|
|
33
34
|
if (domainConfigs.length > 1) {
|
|
34
35
|
// Prio 1: Configured domain(s)
|
|
35
36
|
return domainConfigs.map((domainConfig) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setAlternateLinksHeader.js","sourceRoot":"","sources":["../../../src/middleware/setAlternateLinksHeader.tsx"],"names":[],"mappings":"AAGA,SAAS,qBAAqB,CAC5B,MAAgC,EAChC,OAAoB;IAEpB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC/B,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC;KACrB;IAED,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CACjC,IAAI,MAAM,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAC9C,GAAG,CACJ,CAAC;IAEF,wBAAwB;IACxB,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG,EAAE;QACxB,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC1C;IAED,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW,EAAE,MAAc;IACpD,OAAO,IAAI,GAAG,iCAAiC,MAAM,GAAG,CAAC;AAC3D,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAC7C,MAAgC,EAChC,OAAoB,EACpB,QAAsB;IAEtB,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAElE,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"setAlternateLinksHeader.js","sourceRoot":"","sources":["../../../src/middleware/setAlternateLinksHeader.tsx"],"names":[],"mappings":"AAGA,SAAS,qBAAqB,CAC5B,MAAgC,EAChC,OAAoB;IAEpB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC/B,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC;KACrB;IAED,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CACjC,IAAI,MAAM,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAC9C,GAAG,CACJ,CAAC;IAEF,wBAAwB;IACxB,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG,EAAE;QACxB,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC1C;IAED,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW,EAAE,MAAc;IACpD,OAAO,IAAI,GAAG,iCAAiC,MAAM,GAAG,CAAC;AAC3D,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAC7C,MAAgC,EAChC,OAAoB,EACpB,QAAsB;IAEtB,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAElE,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;QAC9C,SAAS,gBAAgB,CAAC,GAAQ;YAChC,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG,EAAE;gBACxB,GAAG,CAAC,QAAQ,GAAG,IAAI,MAAM,EAAE,CAAC;aAC7B;iBAAM;gBACL,GAAG,CAAC,QAAQ,GAAG,IAAI,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;aAC5C;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QAED,IAAI,GAAG,CAAC;QAER,MAAM,aAAa,GACjB,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM,CAAC,KAAI,EAAE,CAAC;QAEtE,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,+BAA+B;YAC/B,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;gBACxC,GAAG,GAAG,IAAI,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBAClC,GAAG,CAAC,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC;gBAC/B,OAAO,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,yBAAyB;YACzB,GAAG,GAAG,IAAI,GAAG,CAAC,kBAAkB,CAAC,CAAC;YAClC,gBAAgB,CAAC,GAAG,CAAC,CAAC;SACvB;QAED,OAAO,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC,CAAC;IAE/D,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AACjD,CAAC"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import getIntl from '../server/getIntl';
|
|
2
2
|
import useHook from './useHook';
|
|
3
|
+
let hasWarned = false;
|
|
3
4
|
export default function useIntl() {
|
|
5
|
+
if (!hasWarned) {
|
|
6
|
+
hasWarned = true;
|
|
7
|
+
console.warn('`useIntl()` is deprecated and will be removed in the next major version. Please switch to `useFormatter()`.');
|
|
8
|
+
}
|
|
4
9
|
return useHook('useIntl', getIntl());
|
|
5
10
|
}
|
|
6
11
|
//# sourceMappingURL=useIntl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useIntl.js","sourceRoot":"","sources":["../../../src/react-server/useIntl.tsx"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,OAAO,MAAM,WAAW,CAAC;AAEhC,MAAM,CAAC,OAAO,UAAU,OAAO;IAC7B,OAAO,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACvC,CAAC"}
|
|
1
|
+
{"version":3,"file":"useIntl.js","sourceRoot":"","sources":["../../../src/react-server/useIntl.tsx"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,OAAO,MAAM,WAAW,CAAC;AAEhC,IAAI,SAAS,GAAG,KAAK,CAAC;AAEtB,MAAM,CAAC,OAAO,UAAU,OAAO;IAC7B,IAAI,CAAC,SAAS,EAAE;QACd,SAAS,GAAG,IAAI,CAAC;QACjB,OAAO,CAAC,IAAI,CACV,6GAA6G,CAC9G,CAAC;KACH;IAED,OAAO,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACvC,CAAC"}
|
|
@@ -3,14 +3,14 @@ import getIntlContextValue from 'use-intl/dist/src/react/getIntlContextValue';
|
|
|
3
3
|
import createRequestConfig from '../server/createRequestConfig';
|
|
4
4
|
import getLocale from './getLocale';
|
|
5
5
|
const receiveRuntimeConfig = cache(async (locale, getConfig) => {
|
|
6
|
-
let result = getConfig
|
|
6
|
+
let result = getConfig === null || getConfig === void 0 ? void 0 : getConfig({ locale });
|
|
7
7
|
if (result instanceof Promise) {
|
|
8
8
|
result = await result;
|
|
9
9
|
}
|
|
10
10
|
return {
|
|
11
11
|
...result,
|
|
12
12
|
// Make sure `now` is consistent across the request in case none was configured
|
|
13
|
-
now: result
|
|
13
|
+
now: (result === null || result === void 0 ? void 0 : result.now) || new Date()
|
|
14
14
|
};
|
|
15
15
|
});
|
|
16
16
|
const getConfig = cache(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getConfig.js","sourceRoot":"","sources":["../../../src/server/getConfig.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,OAAO,CAAC;AAC5B,OAAO,mBAAmB,MAAM,6CAA6C,CAAC;AAC9E,OAAO,mBAAmB,MAAM,+BAA+B,CAAC;AAChE,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,oBAAoB,GAAG,KAAK,CAChC,KAAK,EAAE,MAAc,EAAE,SAAsC,EAAE,EAAE;IAC/D,IAAI,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"getConfig.js","sourceRoot":"","sources":["../../../src/server/getConfig.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,OAAO,CAAC;AAC5B,OAAO,mBAAmB,MAAM,6CAA6C,CAAC;AAC9E,OAAO,mBAAmB,MAAM,+BAA+B,CAAC;AAChE,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,oBAAoB,GAAG,KAAK,CAChC,KAAK,EAAE,MAAc,EAAE,SAAsC,EAAE,EAAE;IAC/D,IAAI,MAAM,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAG,EAAC,MAAM,EAAC,CAAC,CAAC;IACnC,IAAI,MAAM,YAAY,OAAO,EAAE;QAC7B,MAAM,GAAG,MAAM,MAAM,CAAC;KACvB;IACD,OAAO;QACL,GAAG,MAAM;QACT,+EAA+E;QAC/E,GAAG,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,KAAI,IAAI,IAAI,EAAE;KAC/B,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,IAAI,EAAE;IACjC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC9E,MAAM,IAAI,GAAG,EAAC,GAAG,aAAa,EAAE,MAAM,EAAC,CAAC;IACxC,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { cookies, headers } from 'next/headers';
|
|
|
2
2
|
import { cache } from 'react';
|
|
3
3
|
import { COOKIE_LOCALE_NAME, HEADER_LOCALE_NAME } from '../shared/constants';
|
|
4
4
|
const getLocale = cache(() => {
|
|
5
|
+
var _a;
|
|
5
6
|
let locale;
|
|
6
7
|
// A header is only set when we're changing the locale,
|
|
7
8
|
// otherwise we reuse an existing one from a cookie.
|
|
@@ -10,7 +11,7 @@ const getLocale = cache(() => {
|
|
|
10
11
|
locale = requestHeaders.get(HEADER_LOCALE_NAME);
|
|
11
12
|
}
|
|
12
13
|
else {
|
|
13
|
-
locale = cookies().get(COOKIE_LOCALE_NAME)
|
|
14
|
+
locale = (_a = cookies().get(COOKIE_LOCALE_NAME)) === null || _a === void 0 ? void 0 : _a.value;
|
|
14
15
|
}
|
|
15
16
|
if (!locale) {
|
|
16
17
|
throw new Error('Unable to find `next-intl` locale, have you configured the middleware?`');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLocale.js","sourceRoot":"","sources":["../../../src/server/getLocale.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,KAAK,EAAC,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAC,kBAAkB,EAAE,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AAE3E,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,EAAE
|
|
1
|
+
{"version":3,"file":"getLocale.js","sourceRoot":"","sources":["../../../src/server/getLocale.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,KAAK,EAAC,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAC,kBAAkB,EAAE,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AAE3E,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,EAAE;;IAC3B,IAAI,MAAM,CAAC;IAEX,uDAAuD;IACvD,oDAAoD;IACpD,MAAM,cAAc,GAAG,OAAO,EAAE,CAAC;IACjC,IAAI,cAAc,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAAE;QAC1C,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;KACjD;SAAM;QACL,MAAM,GAAG,MAAA,OAAO,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,0CAAE,KAAK,CAAC;KACnD;IAED,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CACb,yEAAyE,CAC1E,CAAC;KACH;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC"}
|
package/dist/src/shared/Link.js
CHANGED
|
@@ -19,7 +19,7 @@ function Link({ href, locale, prefetch, ...rest }, ref) {
|
|
|
19
19
|
const [localizedHref, setLocalizedHref] = useState(href);
|
|
20
20
|
const pathname = usePathname();
|
|
21
21
|
useEffect(() => {
|
|
22
|
-
setLocalizedHref(localizeHref(href, locale, pathname
|
|
22
|
+
setLocalizedHref(localizeHref(href, locale, pathname !== null && pathname !== void 0 ? pathname : undefined));
|
|
23
23
|
}, [href, locale, pathname]);
|
|
24
24
|
if (locale !== undefined) {
|
|
25
25
|
// If Next.js fixes the bug where the markup isn't updated correctly when
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Link.js","sourceRoot":"","sources":["../../../src/shared/Link.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAE,EAAiB,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC7E,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAMlD;;;;;;;;;;;GAWG;AACH,SAAS,IAAI,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAQ,EAAE,GAAiB;IACvE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAc,IAAI,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,SAAS,CAAC,GAAG,EAAE;QACb,gBAAgB,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"Link.js","sourceRoot":"","sources":["../../../src/shared/Link.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAE,EAAiB,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC7E,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAMlD;;;;;;;;;;;GAWG;AACH,SAAS,IAAI,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAQ,EAAE,GAAiB;IACvE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAc,IAAI,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,SAAS,CAAC,GAAG,EAAE;QACb,gBAAgB,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,SAAS,CAAC,CAAC,CAAC;IACtE,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE7B,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,yEAAyE;QACzE,2EAA2E;QAC3E,mDAAmD;QAEnD,IAAI,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;YACrD,OAAO,CAAC,KAAK,CACX,yFAAyF,CAC1F,CAAC;SACH;QAED,IAAI,mBAAmB,CAAC;QACxB,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;YACrC,mBAAmB,GAAG,aAAa,CAAC;SACrC;aAAM,IAAI,aAAa,EAAE;YACxB,mBAAmB,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;SAChD;QAED,OAAO;QACL,uDAAuD;QACvD,2BAAG,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,mBAAmB,KAAM,IAAI,GAAI,CACrD,CAAC;KACH;IAED,OAAO,CACL,oBAAC,QAAQ,IAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,KAAM,IAAI,GAAI,CAC1E,CAAC;AACJ,CAAC;AAED,eAAe,UAAU,CAAC,IAAI,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
import getIntl from '../server/getIntl';
|
|
2
2
|
import useHook from './useHook';
|
|
3
3
|
|
|
4
|
+
let hasWarned = false;
|
|
5
|
+
|
|
4
6
|
export default function useIntl() {
|
|
7
|
+
if (!hasWarned) {
|
|
8
|
+
hasWarned = true;
|
|
9
|
+
console.warn(
|
|
10
|
+
'`useIntl()` is deprecated and will be removed in the next major version. Please switch to `useFormatter()`.'
|
|
11
|
+
);
|
|
12
|
+
}
|
|
13
|
+
|
|
5
14
|
return useHook('useIntl', getIntl());
|
|
6
15
|
}
|