next-intl 3.0.2 → 3.1.0

package/dist/development/navigation/react-server/BaseLink.js

@@ -4,21 +4,20 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
-var useLocale = require('../../react-server/useLocale.js');
 var BaseLinkWithLocale = require('../../shared/BaseLinkWithLocale.js');
+var getLocale = require('../../server/getLocale.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefault(React);
 
-function BaseLink(_ref) {
+async function BaseLink(_ref) {
   let {
     locale,
     ...rest
   } = _ref;
-  const defaultLocale = useLocale.default();
   return /*#__PURE__*/React__default.default.createElement(BaseLinkWithLocale.default, _rollupPluginBabelHelpers.extends({
-    locale: locale || defaultLocale
+    locale: locale || (await getLocale.default())
   }, rest));
 }
 

package/dist/development/plugin.js

@@ -10,38 +10,72 @@ var path__default = /*#__PURE__*/_interopDefault(path);
 
 /* eslint-env node */
 
-function resolveI18nPath(cwd, providedPath) {
-  let i18nPath = providedPath;
-  if (i18nPath) {
-    i18nPath = path__default.default.resolve(i18nPath);
-    if (!fs__default.default.existsSync(i18nPath)) {
-      throw new Error("Could not find i18n config at ".concat(i18nPath, ", please provide a valid path."));
+function resolveI18nPath(providedPath, cwd) {
+  function resolvePath(pathname) {
+    const parts = [];
+    if (cwd) parts.push(cwd);
+    parts.push(pathname);
+    return path__default.default.resolve(...parts);
+  }
+  function pathExists(pathname) {
+    return fs__default.default.existsSync(resolvePath(pathname));
+  }
+  if (providedPath) {
+    if (!pathExists(providedPath)) {
+      throw new Error("Could not find i18n config at ".concat(providedPath, ", please provide a valid path."));
     }
+    return providedPath;
   } else {
-    i18nPath = ['./i18n.tsx', './i18n.ts', './i18n.js', './i18n.jsx', './src/i18n.tsx', './src/i18n.ts', './src/i18n.js', './src/i18n.jsx'].map(cur => path__default.default.resolve(cwd, cur)).find(cur => fs__default.default.existsSync(cur));
-    if (!i18nPath) {
-      throw new Error("\n\nCould not locate i18n config. Create one at `./(src/)i18n.{js,jsx,ts,tsx}` or specify a custom location:\n\nconst withNextIntl = require('next-intl/plugin')(\n  './path/to/i18n.tsx'\n);\n\nmodule.exports = withNextIntl({\n  // Other Next.js configuration ...\n});\n");
+    for (const candidate of ['./i18n.tsx', './i18n.ts', './i18n.js', './i18n.jsx', './src/i18n.tsx', './src/i18n.ts', './src/i18n.js', './src/i18n.jsx']) {
+      if (pathExists(candidate)) {
+        return candidate;
+      }
     }
+    throw new Error("\n\nCould not locate i18n config. Create one at `./(src/)i18n.{js,jsx,ts,tsx}` or specify a custom location:\n\nconst withNextIntl = require('next-intl/plugin')(\n  './path/to/i18n.tsx'\n);\n\nmodule.exports = withNextIntl({\n  // Other Next.js configuration ...\n});\n");
   }
-  return i18nPath;
 }
 function initPlugin(i18nPath, nextConfig) {
   if ((nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.i18n) != null) {
     console.warn("\nnext-intl has found an `i18n` config in your next.config.js. This likely causes conflicts and should therefore be removed if you use the App Router.\n\nIf you're in progress of migrating from the `pages` folder, you can refer to this example: https://github.com/amannn/next-intl/tree/main/packages/example-app-router-migration\n");
   }
-  return Object.assign({}, nextConfig, {
-    webpack() {
-      for (var _len = arguments.length, _ref = new Array(_len), _key = 0; _key < _len; _key++) {
-        _ref[_key] = arguments[_key];
+  const useTurbo = process.env.TURBOPACK != null;
+  let nextIntlConfig;
+  if (useTurbo) {
+    var _nextConfig$experimen, _nextConfig$experimen2;
+    if (i18nPath && i18nPath.startsWith('/')) {
+      throw new Error("Turbopack support for next-intl currently does not support absolute paths, please provide a relative one (e.g. './src/i18n/config.ts').\n\nFound: " + i18nPath + '\n');
+    }
+    nextIntlConfig = {
+      experimental: {
+        ...(nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.experimental),
+        turbo: {
+          ...(nextConfig === null || nextConfig === void 0 || (_nextConfig$experimen = nextConfig.experimental) === null || _nextConfig$experimen === void 0 ? void 0 : _nextConfig$experimen.turbo),
+          resolveAlias: {
+            ...(nextConfig === null || nextConfig === void 0 || (_nextConfig$experimen2 = nextConfig.experimental) === null || _nextConfig$experimen2 === void 0 || (_nextConfig$experimen2 = _nextConfig$experimen2.turbo) === null || _nextConfig$experimen2 === void 0 ? void 0 : _nextConfig$experimen2.resolveAlias),
+            // Turbo aliases don't work with absolute
+            // paths (see error handling above)
+            'next-intl/config': resolveI18nPath(i18nPath)
+          }
+        }
       }
-      let [config, options] = _ref;
-      config.resolve.alias['next-intl/config'] = require.resolve(resolveI18nPath(config.context, i18nPath));
-      if (typeof (nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.webpack) === 'function') {
-        return nextConfig.webpack(config, options);
+    };
+  } else {
+    nextIntlConfig = {
+      webpack() {
+        for (var _len = arguments.length, _ref = new Array(_len), _key = 0; _key < _len; _key++) {
+          _ref[_key] = arguments[_key];
+        }
+        let [config, options] = _ref;
+        // Webpack requires absolute paths
+        config.resolve.alias['next-intl/config'] = path__default.default.resolve(config.context, resolveI18nPath(i18nPath, config.context));
+        if (typeof (nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.webpack) === 'function') {
+          return nextConfig.webpack(config, options);
+        }
+        return config;
       }
-      return config;
-    }
-  });
+    };
+  }
+  return Object.assign({}, nextConfig, nextIntlConfig);
 }
 module.exports = function withNextIntl(i18nPath) {
   return nextConfig => initPlugin(i18nPath, nextConfig);

package/dist/development/react-server/NextIntlClientProvider.js

@@ -5,28 +5,28 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _rollupPluginBabelHelpers = require('../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var NextIntlClientProvider$1 = require('../shared/NextIntlClientProvider.js');
-var useLocale = require('./useLocale.js');
-var useNow = require('./useNow.js');
-var useTimeZone = require('./useTimeZone.js');
+var getLocale = require('../server/getLocale.js');
+var getNow = require('../server/getNow.js');
+var getTimeZone = require('../server/getTimeZone.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefault(React);
 
-function NextIntlClientProvider(_ref) {
+async function NextIntlClientProvider(_ref) {
   let {
     locale,
     now,
     timeZone,
     ...rest
   } = _ref;
-  const defaultLocale = useLocale.default();
-  const defaultNow = useNow.default();
-  const defaultTimeZone = useTimeZone.default();
-  return /*#__PURE__*/React__default.default.createElement(NextIntlClientProvider$1.default, _rollupPluginBabelHelpers.extends({
-    locale: locale !== null && locale !== void 0 ? locale : defaultLocale,
-    now: now !== null && now !== void 0 ? now : defaultNow,
-    timeZone: timeZone !== null && timeZone !== void 0 ? timeZone : defaultTimeZone
+  return /*#__PURE__*/React__default.default.createElement(NextIntlClientProvider$1.default
+  // We need to be careful about potentially reading from headers here.
+  // See https://github.com/amannn/next-intl/issues/631
+  , _rollupPluginBabelHelpers.extends({
+    locale: locale !== null && locale !== void 0 ? locale : await getLocale.default(),
+    now: now !== null && now !== void 0 ? now : await getNow.default(),
+    timeZone: timeZone !== null && timeZone !== void 0 ? timeZone : await getTimeZone.default()
   }, rest));
 }
 

package/dist/esm/navigation/react-server/BaseLink.js

@@ -1 +1 @@
-import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r from"react";import t from"../../react-server/useLocale.js";import o from"../../shared/BaseLinkWithLocale.js";function l(l){let{locale:a,...s}=l;const c=t();return r.createElement(o,e({locale:a||c},s))}export{l as default};
+import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r from"react";import t from"../../shared/BaseLinkWithLocale.js";import a from"../../server/getLocale.js";async function l(l){let{locale:o,...s}=l;return r.createElement(t,e({locale:o||await a()},s))}export{l as default};

package/dist/esm/plugin.js

@@ -1 +1 @@
-import n from"fs";import e from"path";function t(t,o){return null!=(null==o?void 0:o.i18n)&&console.warn("\nnext-intl has found an `i18n` config in your next.config.js. This likely causes conflicts and should therefore be removed if you use the App Router.\n\nIf you're in progress of migrating from the `pages` folder, you can refer to this example: https://github.com/amannn/next-intl/tree/main/packages/example-app-router-migration\n"),Object.assign({},o,{webpack(){for(var i=arguments.length,r=new Array(i),s=0;s<i;s++)r[s]=arguments[s];let[a,l]=r;return a.resolve.alias["next-intl/config"]=require.resolve(function(t,o){let i=o;if(i){if(i=e.resolve(i),!n.existsSync(i))throw new Error("Could not find i18n config at ".concat(i,", please provide a valid path."))}else if(i=["./i18n.tsx","./i18n.ts","./i18n.js","./i18n.jsx","./src/i18n.tsx","./src/i18n.ts","./src/i18n.js","./src/i18n.jsx"].map((n=>e.resolve(t,n))).find((e=>n.existsSync(e))),!i)throw new Error("\n\nCould not locate i18n config. Create one at `./(src/)i18n.{js,jsx,ts,tsx}` or specify a custom location:\n\nconst withNextIntl = require('next-intl/plugin')(\n  './path/to/i18n.tsx'\n);\n\nmodule.exports = withNextIntl({\n  // Other Next.js configuration ...\n});\n");return i}(a.context,t)),"function"==typeof(null==o?void 0:o.webpack)?o.webpack(a,l):a}})}module.exports=function(n){return e=>t(n,e)};
+import n from"fs";import e from"path";function t(t,o){function r(t){return n.existsSync(function(n){const t=[];return o&&t.push(o),t.push(n),e.resolve(...t)}(t))}if(t){if(!r(t))throw new Error("Could not find i18n config at ".concat(t,", please provide a valid path."));return t}for(const n of["./i18n.tsx","./i18n.ts","./i18n.js","./i18n.jsx","./src/i18n.tsx","./src/i18n.ts","./src/i18n.js","./src/i18n.jsx"])if(r(n))return n;throw new Error("\n\nCould not locate i18n config. Create one at `./(src/)i18n.{js,jsx,ts,tsx}` or specify a custom location:\n\nconst withNextIntl = require('next-intl/plugin')(\n  './path/to/i18n.tsx'\n);\n\nmodule.exports = withNextIntl({\n  // Other Next.js configuration ...\n});\n")}module.exports=function(n){return o=>function(n,o){let r;if(null!=(null==o?void 0:o.i18n)&&console.warn("\nnext-intl has found an `i18n` config in your next.config.js. This likely causes conflicts and should therefore be removed if you use the App Router.\n\nIf you're in progress of migrating from the `pages` folder, you can refer to this example: https://github.com/amannn/next-intl/tree/main/packages/example-app-router-migration\n"),null!=process.env.TURBOPACK){var i,s;if(n&&n.startsWith("/"))throw new Error("Turbopack support for next-intl currently does not support absolute paths, please provide a relative one (e.g. './src/i18n/config.ts').\n\nFound: "+n+"\n");r={experimental:{...null==o?void 0:o.experimental,turbo:{...null==o||null===(i=o.experimental)||void 0===i?void 0:i.turbo,resolveAlias:{...null==o||null===(s=o.experimental)||void 0===s||null===(s=s.turbo)||void 0===s?void 0:s.resolveAlias,"next-intl/config":t(n)}}}}}else r={webpack(){for(var r=arguments.length,i=new Array(r),s=0;s<r;s++)i[s]=arguments[s];let[l,a]=i;return l.resolve.alias["next-intl/config"]=e.resolve(l.context,t(n,l.context)),"function"==typeof(null==o?void 0:o.webpack)?o.webpack(l,a):l}};return Object.assign({},o,r)}(n,o)};

package/dist/esm/react-server/NextIntlClientProvider.js

@@ -1 +1 @@
-import{extends as e}from"../_virtual/_rollupPluginBabelHelpers.js";import o from"react";import r from"../shared/NextIntlClientProvider.js";import l from"./useLocale.js";import t from"./useNow.js";import n from"./useTimeZone.js";function m(m){let{locale:i,now:s,timeZone:u,...a}=m;const p=l(),f=t(),c=n();return o.createElement(r,e({locale:null!=i?i:p,now:null!=s?s:f,timeZone:null!=u?u:c},a))}export{m as default};
+import{extends as e}from"../_virtual/_rollupPluginBabelHelpers.js";import r from"react";import t from"../shared/NextIntlClientProvider.js";import o from"../server/getLocale.js";import l from"../server/getNow.js";import a from"../server/getTimeZone.js";async function i(i){let{locale:n,now:m,timeZone:s,...p}=i;return r.createElement(t,e({locale:null!=n?n:await o(),now:null!=m?m:await l(),timeZone:null!=s?s:await a()},p))}export{i as default};

package/dist/production/navigation/react-server/BaseLink.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../_virtual/_rollupPluginBabelHelpers.js"),r=require("react"),t=require("../../react-server/useLocale.js"),l=require("../../shared/BaseLinkWithLocale.js");function u(e){return e&&e.__esModule?e:{default:e}}var a=u(r);exports.default=function(r){let{locale:u,...s}=r;const o=t.default();return a.default.createElement(l.default,e.extends({locale:u||o},s))};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../_virtual/_rollupPluginBabelHelpers.js"),r=require("react"),t=require("../../shared/BaseLinkWithLocale.js"),l=require("../../server/getLocale.js");function a(e){return e&&e.__esModule?e:{default:e}}var u=a(r);exports.default=async function(r){let{locale:a,...s}=r;return u.default.createElement(t.default,e.extends({locale:a||await l.default()},s))};

package/dist/production/plugin.js

@@ -1 +1 @@
-"use strict";var n=require("fs"),e=require("path");function t(n){return n&&n.__esModule?n:{default:n}}var r=t(n),i=t(e);function o(n,e){return null!=(null==e?void 0:e.i18n)&&console.warn("\nnext-intl has found an `i18n` config in your next.config.js. This likely causes conflicts and should therefore be removed if you use the App Router.\n\nIf you're in progress of migrating from the `pages` folder, you can refer to this example: https://github.com/amannn/next-intl/tree/main/packages/example-app-router-migration\n"),Object.assign({},e,{webpack(){for(var t=arguments.length,o=new Array(t),s=0;s<t;s++)o[s]=arguments[s];let[a,l]=o;return a.resolve.alias["next-intl/config"]=require.resolve(function(n,e){let t=e;if(t){if(t=i.default.resolve(t),!r.default.existsSync(t))throw new Error("Could not find i18n config at ".concat(t,", please provide a valid path."))}else if(t=["./i18n.tsx","./i18n.ts","./i18n.js","./i18n.jsx","./src/i18n.tsx","./src/i18n.ts","./src/i18n.js","./src/i18n.jsx"].map((e=>i.default.resolve(n,e))).find((n=>r.default.existsSync(n))),!t)throw new Error("\n\nCould not locate i18n config. Create one at `./(src/)i18n.{js,jsx,ts,tsx}` or specify a custom location:\n\nconst withNextIntl = require('next-intl/plugin')(\n  './path/to/i18n.tsx'\n);\n\nmodule.exports = withNextIntl({\n  // Other Next.js configuration ...\n});\n");return t}(a.context,n)),"function"==typeof(null==e?void 0:e.webpack)?e.webpack(a,l):a}})}module.exports=function(n){return e=>o(n,e)};
+"use strict";var n=require("fs"),e=require("path");function t(n){return n&&n.__esModule?n:{default:n}}var o=t(n),r=t(e);function i(n,e){function t(n){return o.default.existsSync(function(n){const t=[];return e&&t.push(e),t.push(n),r.default.resolve(...t)}(n))}if(n){if(!t(n))throw new Error("Could not find i18n config at ".concat(n,", please provide a valid path."));return n}for(const n of["./i18n.tsx","./i18n.ts","./i18n.js","./i18n.jsx","./src/i18n.tsx","./src/i18n.ts","./src/i18n.js","./src/i18n.jsx"])if(t(n))return n;throw new Error("\n\nCould not locate i18n config. Create one at `./(src/)i18n.{js,jsx,ts,tsx}` or specify a custom location:\n\nconst withNextIntl = require('next-intl/plugin')(\n  './path/to/i18n.tsx'\n);\n\nmodule.exports = withNextIntl({\n  // Other Next.js configuration ...\n});\n")}module.exports=function(n){return e=>function(n,e){let t;if(null!=(null==e?void 0:e.i18n)&&console.warn("\nnext-intl has found an `i18n` config in your next.config.js. This likely causes conflicts and should therefore be removed if you use the App Router.\n\nIf you're in progress of migrating from the `pages` folder, you can refer to this example: https://github.com/amannn/next-intl/tree/main/packages/example-app-router-migration\n"),null!=process.env.TURBOPACK){var o,s;if(n&&n.startsWith("/"))throw new Error("Turbopack support for next-intl currently does not support absolute paths, please provide a relative one (e.g. './src/i18n/config.ts').\n\nFound: "+n+"\n");t={experimental:{...null==e?void 0:e.experimental,turbo:{...null==e||null===(o=e.experimental)||void 0===o?void 0:o.turbo,resolveAlias:{...null==e||null===(s=e.experimental)||void 0===s||null===(s=s.turbo)||void 0===s?void 0:s.resolveAlias,"next-intl/config":i(n)}}}}}else t={webpack(){for(var t=arguments.length,o=new Array(t),s=0;s<t;s++)o[s]=arguments[s];let[l,u]=o;return l.resolve.alias["next-intl/config"]=r.default.resolve(l.context,i(n,l.context)),"function"==typeof(null==e?void 0:e.webpack)?e.webpack(l,u):l}};return Object.assign({},e,t)}(n,e)};

package/dist/production/react-server/NextIntlClientProvider.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../_virtual/_rollupPluginBabelHelpers.js"),l=require("react"),r=require("../shared/NextIntlClientProvider.js"),u=require("./useLocale.js"),t=require("./useNow.js"),n=require("./useTimeZone.js");function o(e){return e&&e.__esModule?e:{default:e}}var a=o(l);exports.default=function(l){let{locale:o,now:s,timeZone:i,...d}=l;const c=u.default(),f=t.default(),j=n.default();return a.default.createElement(r.default,e.extends({locale:null!=o?o:c,now:null!=s?s:f,timeZone:null!=i?i:j},d))};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../_virtual/_rollupPluginBabelHelpers.js"),r=require("react"),t=require("../shared/NextIntlClientProvider.js"),l=require("../server/getLocale.js"),u=require("../server/getNow.js"),a=require("../server/getTimeZone.js");function n(e){return e&&e.__esModule?e:{default:e}}var i=n(r);exports.default=async function(r){let{locale:n,now:o,timeZone:s,...d}=r;return i.default.createElement(t.default,e.extends({locale:null!=n?n:await l.default(),now:null!=o?o:await u.default(),timeZone:null!=s?s:await a.default()},d))};

package/dist/types/src/navigation/react-server/BaseLink.d.ts

@@ -4,5 +4,5 @@ import { AllLocales } from '../../shared/types';
 type Props<Locales extends AllLocales> = Omit<ComponentProps<typeof BaseLinkWithLocale>, 'locale'> & {
     locale?: Locales[number];
 };
-export default function BaseLink<Locales extends AllLocales>({ locale, ...rest }: Props<Locales>): React.JSX.Element;
+export default function BaseLink<Locales extends AllLocales>({ locale, ...rest }: Props<Locales>): Promise<React.JSX.Element>;
 export {};

package/dist/types/src/navigation/react-server/createSharedPathnamesNavigation.d.ts

@@ -37,7 +37,7 @@ export default function createSharedPathnamesNavigation<Locales extends AllLocal
         locale: string;
     }, "ref"> & import("react").RefAttributes<HTMLAnchorElement>, "locale"> & {
         locale?: Locales[number] | undefined;
-    }) => import("react").JSX.Element;
+    }) => Promise<import("react").JSX.Element>;
     redirect: typeof baseRedirect;
     usePathname: () => never;
     useRouter: () => never;

package/dist/types/src/react-server/NextIntlClientProvider.d.ts

@@ -1,5 +1,5 @@
 import React, { ComponentProps } from 'react';
 import BaseNextIntlClientProvider from '../shared/NextIntlClientProvider';
 type Props = ComponentProps<typeof BaseNextIntlClientProvider>;
-export default function NextIntlClientProvider({ locale, now, timeZone, ...rest }: Props): React.JSX.Element;
+export default function NextIntlClientProvider({ locale, now, timeZone, ...rest }: Props): Promise<React.JSX.Element>;
 export {};

package/dist/types/test/react-server/NextIntlClientProvider.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "description": "A minimal, but complete solution for internationalization in Next.js apps.",
@@ -73,7 +73,7 @@
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.2.32",
     "negotiator": "^0.6.3",
-    "use-intl": "^3.0.2"
+    "use-intl": "^3.1.0"
   },
   "peerDependencies": {
     "next": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
@@ -89,7 +89,7 @@
     "eslint": "^8.46.0",
     "eslint-config-molindo": "^7.0.0",
     "eslint-plugin-deprecation": "^1.4.1",
-    "next": "14.0.1",
+    "next": "14.0.3",
     "path-to-regexp": "^6.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -125,5 +125,5 @@
       "limit": "5.7 KB"
     }
   ],
-  "gitHead": "a1b397dbab0dabee1c04b820848fab66b89df6e3"
+  "gitHead": "12d1bb5ea05e2e41b036d0d68c59ff13a946f841"
 }