From 43d7a83138e7f0de426deeab84152ddb513dde8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Wed, 19 Oct 2022 15:50:16 +0200 Subject: [PATCH 01/19] chore(deps): update to i18next ^22.0.0 Link https://github.com/i18next/i18next/releases/tag/v22.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6bdc2018..1d02b6dc 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "@types/hoist-non-react-statics": "^3.3.1", "core-js": "^3", "hoist-non-react-statics": "^3.3.2", - "i18next": "^21.9.1", + "i18next": "^22.0.0", "i18next-fs-backend": "^1.1.5", "react-i18next": "^11.18.4" }, From 1653be1acf769be783d2f34f7a5150def62d0648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Thu, 20 Oct 2022 13:12:57 +0200 Subject: [PATCH 02/19] chore: more react-i18next i18next to peer deps --- examples/simple/package.json | 2 ++ examples/ssg/package.json | 6 +++++- package.json | 10 ++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/examples/simple/package.json b/examples/simple/package.json index 4eb06400..d2b10e28 100644 --- a/examples/simple/package.json +++ b/examples/simple/package.json @@ -9,10 +9,12 @@ "start": "next start -p ${PORT:=3000}" }, "dependencies": { + "i18next": "22.0.1", "next": "12.3.1", "next-i18next": "12.1.0", "prop-types": "15.8.1", "react": "18.2.0", + "react-i18next": "11.18.6", "react-dom": "18.2.0" } } diff --git a/examples/ssg/package.json b/examples/ssg/package.json index b9b49b09..f92c0392 100644 --- a/examples/ssg/package.json +++ b/examples/ssg/package.json @@ -15,9 +15,13 @@ "downloadLocales": "locize download --project-id=0842ada9-1d1d-4d48-ab27-08f6a132f558 --ver=latest --clean=true --path=./public/locales" }, "dependencies": { + "i18next": "22.0.1", "next": "12.3.1", "next-i18next": "12.1.0", - "next-language-detector": "1.0.2" + "next-language-detector": "1.0.2", + "react": "18.2.0", + "react-i18next": "11.18.6", + "react-dom": "18.2.0" }, "devDependencies": { "eslint-config-next": "12.3.1", diff --git a/package.json b/package.json index 1d02b6dc..f6304350 100644 --- a/package.json +++ b/package.json @@ -117,10 +117,12 @@ "eslint-plugin-typescript-sort-keys": "^2.1.0", "gh-release": "6.0.4", "husky": "^3.0.0", + "i18next": "^22.0.1", "jest": "^26.6.3", "next": "^12.2.5", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-i18next": "^11.18.6", "start-server-and-test": "^1.14.0", "typescript": "^4.7.4" }, @@ -129,13 +131,13 @@ "@types/hoist-non-react-statics": "^3.3.1", "core-js": "^3", "hoist-non-react-statics": "^3.3.2", - "i18next": "^22.0.0", - "i18next-fs-backend": "^1.1.5", - "react-i18next": "^11.18.4" + "i18next-fs-backend": "^1.1.5" }, "peerDependencies": { + "i18next": "^21.9.1 || ^22.0.1", "next": ">= 10.0.0", - "react": ">= 16.8.0" + "react": "16.8.0", + "react-i18next": "^11.18.4" }, "resolutions": { "i18next": ">=21.8.14", From b82d6c2344917a0b52d37ffd2541566b7f2324c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Thu, 20 Oct 2022 13:16:02 +0200 Subject: [PATCH 03/19] docs: update installation for peer-dependencies --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7a71e931..f1f88e9c 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ Now our Next.js app is fully translatable! ### 1. Installation -```jsx -yarn add next-i18next +```bash +yarn add next-i18next react-i18next i18next ``` You need to also have `react` and `next` installed. From 6ac538b7a95ad643874b9a74f150c786e28c8de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Thu, 20 Oct 2022 13:29:37 +0200 Subject: [PATCH 04/19] docs: added UPGRADING notes --- UPGRADING.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 UPGRADING.md diff --git a/UPGRADING.md b/UPGRADING.md new file mode 100644 index 00000000..fefd131e --- /dev/null +++ b/UPGRADING.md @@ -0,0 +1,15 @@ +## Version 13.x + +From version 13, both `i18next` and `react-i18next` have been moved to peerDependencies. +Be sure to install them in the consuming app or package by running: + +```bash +yarn add react-i18next i18next +pnpm add react-i18next i18next --save +npm install react-i18next i18next --save +``` + +> **Note:** +> If you're having issues after update, please check that your dependencies +> are properly deduplicated (ie: `yarn why react-i18next -R`, `pnpm why -r react-i18next i18next`...) +> or use `yarn dedupe --list`, `npx -y pnpm-dedpuplicate --list`, `npx -y yarn-deduplicate --list`... From 40ce20d683a3c1ace99d106c6c4bcda9518d2c29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Thu, 20 Oct 2022 13:30:34 +0200 Subject: [PATCH 05/19] docs: add upgrading --- UPGRADING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADING.md b/UPGRADING.md index fefd131e..ae7559b9 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -10,6 +10,6 @@ npm install react-i18next i18next --save ``` > **Note:** -> If you're having issues after update, please check that your dependencies +> If you're facing issues after upgrading, please first check that your dependencies > are properly deduplicated (ie: `yarn why react-i18next -R`, `pnpm why -r react-i18next i18next`...) > or use `yarn dedupe --list`, `npx -y pnpm-dedpuplicate --list`, `npx -y yarn-deduplicate --list`... From 68197836404d2514850035440712aade8fc1e8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Thu, 20 Oct 2022 13:43:16 +0200 Subject: [PATCH 06/19] docs: update upgrade notes --- UPGRADING.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/UPGRADING.md b/UPGRADING.md index ae7559b9..4317a691 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -9,7 +9,12 @@ pnpm add react-i18next i18next --save npm install react-i18next i18next --save ``` -> **Note:** +As of version 13.x, next-i18next supports i18next `^21.9.1 || ^22.0.1` range +react-i18next from `^11.18.4`. It's possible for the consuming application to +select a specific supported version, ie `yarn add 'i18next@^21.10.0'`. + +> **Note** > If you're facing issues after upgrading, please first check that your dependencies > are properly deduplicated (ie: `yarn why react-i18next -R`, `pnpm why -r react-i18next i18next`...) -> or use `yarn dedupe --list`, `npx -y pnpm-dedpuplicate --list`, `npx -y yarn-deduplicate --list`... +> or use `yarn dedupe --list`, `npx -y pnpm-dedpuplicate --list`, `npx -y yarn-deduplicate --list`. + From d96ced815a9542b68864eb3e6c0e2b9df79eb34f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Thu, 20 Oct 2022 21:18:05 +0200 Subject: [PATCH 07/19] chore(deps): update example to react-i18next v12 --- examples/simple/package.json | 2 +- examples/ssg/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/simple/package.json b/examples/simple/package.json index d2b10e28..7f78be8e 100644 --- a/examples/simple/package.json +++ b/examples/simple/package.json @@ -14,7 +14,7 @@ "next-i18next": "12.1.0", "prop-types": "15.8.1", "react": "18.2.0", - "react-i18next": "11.18.6", + "react-i18next": "12.0.0", "react-dom": "18.2.0" } } diff --git a/examples/ssg/package.json b/examples/ssg/package.json index f92c0392..cd4c5c25 100644 --- a/examples/ssg/package.json +++ b/examples/ssg/package.json @@ -20,7 +20,7 @@ "next-i18next": "12.1.0", "next-language-detector": "1.0.2", "react": "18.2.0", - "react-i18next": "11.18.6", + "react-i18next": "12.0.0", "react-dom": "18.2.0" }, "devDependencies": { From a103a0b42f5d3bef1b2ddfe6f33d23e33040c745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Thu, 20 Oct 2022 21:20:53 +0200 Subject: [PATCH 08/19] docs: changelog --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4bf39c4..2c6dc93d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ -## next +## next (v13) -- breaking: drop node 12.x support, requires 14.x. Recommended minimum to `^14.13.1`. +- breaking: react-i18next and i18next are now peer-dependencies and must be installed + in the consuming app, see [#1966](https://github.com/i18next/next-i18next/pull/1966) +- breaking: drop node 12.x support, requires 14.x. Recommended minimum to `^14.13.1`, + see [#1974](https://github.com/i18next/next-i18next/pull/1974). ## 12.1.0 From 2f64ff557956cb33ea866ceecd46e19f90e6d0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 21 Oct 2022 01:04:54 +0200 Subject: [PATCH 09/19] refactor!: drop export of Resources --- src/types.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/types.ts b/src/types.ts index 2a33ed23..e2a67604 100644 --- a/src/types.ts +++ b/src/types.ts @@ -5,7 +5,6 @@ import { Trans, withTranslation, WithTranslation as ReactI18nextWithTranslation, - Resources, DefaultNamespace, Translation, } from 'react-i18next' @@ -64,6 +63,5 @@ export { Trans, Translation, withTranslation, - Resources, DefaultNamespace, } From dd35ecfde4f02fd075a0654170209c70fe669138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 21 Oct 2022 12:35:53 +0200 Subject: [PATCH 10/19] chore(deps): update to i18next 22.0.2 --- examples/simple/package.json | 2 +- examples/ssg/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/simple/package.json b/examples/simple/package.json index a54103c7..4865038a 100644 --- a/examples/simple/package.json +++ b/examples/simple/package.json @@ -9,7 +9,7 @@ "start": "next start -p ${PORT:=3000}" }, "dependencies": { - "i18next": "22.0.1", + "i18next": "22.0.2", "next": "12.3.1", "next-i18next": "12.1.0", "react": "18.2.0", diff --git a/examples/ssg/package.json b/examples/ssg/package.json index cd4c5c25..3ce720ec 100644 --- a/examples/ssg/package.json +++ b/examples/ssg/package.json @@ -15,7 +15,7 @@ "downloadLocales": "locize download --project-id=0842ada9-1d1d-4d48-ab27-08f6a132f558 --ver=latest --clean=true --path=./public/locales" }, "dependencies": { - "i18next": "22.0.1", + "i18next": "22.0.2", "next": "12.3.1", "next-i18next": "12.1.0", "next-language-detector": "1.0.2", From a8a05cf4f9063b5123bfaea7e94957daf99862aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 21 Oct 2022 12:36:20 +0200 Subject: [PATCH 11/19] chore(peer-deps): remove range and min i18next to 22.0.2 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 070bf2d6..7f1b48d4 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "eslint-plugin-typescript-sort-keys": "^2.1.0", "gh-release": "6.0.4", "husky": "^3.0.0", - "i18next": "^22.0.1", + "i18next": "^22.0.2", "jest": "^26.6.3", "next": "^12.2.5", "npm-run-all": "^4.1.5", @@ -147,9 +147,9 @@ "i18next-fs-backend": "^1.1.5" }, "peerDependencies": { - "i18next": "^21.9.1 || ^22.0.1", + "i18next": "^22.0.2", "next": ">= 10.0.0", "react": ">= 16.8.0", - "react-i18next": "^11.18.4 || ^12.0.0" + "react-i18next": "^12.0.0" } } From 106378941baa2c1d3bad3fae90e39f12f2f4b3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 21 Oct 2022 12:48:36 +0200 Subject: [PATCH 12/19] feat(example): example on i18next new translation key --- examples/simple/types.d/i18next.d.ts.future | 25 +++++++++++++++++++ ...i18next.d.ts => react-i18next.d.ts.backup} | 7 +++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 examples/simple/types.d/i18next.d.ts.future rename examples/simple/types.d/{react-i18next.d.ts => react-i18next.d.ts.backup} (73%) diff --git a/examples/simple/types.d/i18next.d.ts.future b/examples/simple/types.d/i18next.d.ts.future new file mode 100644 index 00000000..aa8e2e12 --- /dev/null +++ b/examples/simple/types.d/i18next.d.ts.future @@ -0,0 +1,25 @@ +/** + * If you want to enable locale keys typechecking and enhance IDE experience. + * + * Requires `resolveJsonModule:true` in your tsconfig.json. + * + * @link https://www.i18next.com/overview/typescript + */ +import 'react-i18next' + +import type common from '../public/locales/en/common.json' +import type footer from '../public/locales/en/footer.json' +import type secondPage from '../public/locales/en/second-page.json' + +interface I18nNamespaces { + common: typeof common + footer: typeof footer + 'second-page': typeof secondPage +} + +declare module 'i18next' { + interface CustomTypeOptions { + defaultNS: 'common' + resources: I18nNamespaces + } +} diff --git a/examples/simple/types.d/react-i18next.d.ts b/examples/simple/types.d/react-i18next.d.ts.backup similarity index 73% rename from examples/simple/types.d/react-i18next.d.ts rename to examples/simple/types.d/react-i18next.d.ts.backup index aec115a4..78048ef9 100644 --- a/examples/simple/types.d/react-i18next.d.ts +++ b/examples/simple/types.d/react-i18next.d.ts.backup @@ -1,7 +1,8 @@ /** - * Types augmentation for translation keys to allow to typecheck - * and suggesting keys to the t function. In case it's too slow - * you can opt out by commenting the following code. + * If you want to enable locale keys typechecking and enhance IDE experience. + * + * Requires `resolveJsonModule:true` in your tsconfig.json. + * * @link https://www.i18next.com/overview/typescript */ import 'react-i18next' From 91467ac0e1f3292ee7333575b5444462a3733207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 21 Oct 2022 12:56:05 +0200 Subject: [PATCH 13/19] fix(examples): restore current way for keys typing --- .../types.d/{react-i18next.d.ts.backup => react-i18next.d.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename examples/simple/types.d/{react-i18next.d.ts.backup => react-i18next.d.ts} (100%) diff --git a/examples/simple/types.d/react-i18next.d.ts.backup b/examples/simple/types.d/react-i18next.d.ts similarity index 100% rename from examples/simple/types.d/react-i18next.d.ts.backup rename to examples/simple/types.d/react-i18next.d.ts From 0d873f9327f3dbcbcd11ea3c1c5f41aa9cbe388e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 21 Oct 2022 14:39:35 +0200 Subject: [PATCH 14/19] docs: changelog and upgrading updates --- CHANGELOG.md | 18 ++++++++++++++++-- UPGRADING.md | 20 ++++++++------------ 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f102feb..52cf5367 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,22 @@ ## next -- breaking: react-i18next and i18next are now peer-dependencies and must be installed +Although it is a major, there should not be breaking changes apart installation. +Read also the [UPGRADING](https://github.com/i18next/next-i18next/blob/master/UPGRADING.md) document +to know more. + +- **breaking**: react-i18next and i18next are now peer-dependencies and must be installed in the consuming app, see [#1966](https://github.com/i18next/next-i18next/pull/1966) -- breaking: drop nextjs < 12.0.0 and react < 17.0.2 in [#1983](https://github.com/i18next/next-i18next/pull/1983) + + ```bash + npm install react-i18next i18next --save # NPM + yarn add react-i18next i18next # Yarn + pnpm add react-i18next i18next --save # PNPM + ``` + + If you encounter any issue, please read the [Troubleshoot](https://github.com/i18next/next-i18next/blob/master/TROUBLESHOOT.md) doc. + +- **new:**: Upgrade to [i18next v22](https://github.com/i18next/i18next/releases) and react-i18next v12, see [#1966](https://github.com/i18next/next-i18next/pull/1966) +- **breaking**: drop nextjs < 12.0.0 and react < 17.0.2 in [#1983](https://github.com/i18next/next-i18next/pull/1983) - breaking: drop node 12.x support, requires 14.x. Recommended minimum to `^14.13.1`, see [#1974](https://github.com/i18next/next-i18next/pull/1974) diff --git a/UPGRADING.md b/UPGRADING.md index 4317a691..e2750711 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -1,20 +1,16 @@ ## Version 13.x -From version 13, both `i18next` and `react-i18next` have been moved to peerDependencies. -Be sure to install them in the consuming app or package by running: +Both `i18next` and `react-i18next` have been moved to [peerDependencies](https://github.com/npm/rfcs/blob/main/implemented/0030-no-install-optional-peer-deps.md) +and must be installed part of `next-i18next`. When upgrading don't forget to add them to your dependencies: ```bash -yarn add react-i18next i18next -pnpm add react-i18next i18next --save -npm install react-i18next i18next --save +npm install react-i18next i18next --save # NPM +yarn add react-i18next i18next # Yarn +pnpm add react-i18next i18next --save # PNPM ``` -As of version 13.x, next-i18next supports i18next `^21.9.1 || ^22.0.1` range -react-i18next from `^11.18.4`. It's possible for the consuming application to -select a specific supported version, ie `yarn add 'i18next@^21.10.0'`. +This move was done in the hope to avoid issues regarding duplicates. See the +[TROUBLESHOOT](https://github.com/i18next/next-i18next/blob/master/TROUBLESHOOT.md#multiple-instances) +for more info. In the future it will also allow to support multiple ranges. -> **Note** -> If you're facing issues after upgrading, please first check that your dependencies -> are properly deduplicated (ie: `yarn why react-i18next -R`, `pnpm why -r react-i18next i18next`...) -> or use `yarn dedupe --list`, `npx -y pnpm-dedpuplicate --list`, `npx -y yarn-deduplicate --list`. From 98fe8bf2ebd0b6bd5ccf26e42a5f79223c2c8e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 21 Oct 2022 14:41:45 +0200 Subject: [PATCH 15/19] docs: rephrase --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52cf5367..42e79f51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## next -Although it is a major, there should not be breaking changes apart installation. +Although it is a major, existing code should not be impacted. Only the install. Read also the [UPGRADING](https://github.com/i18next/next-i18next/blob/master/UPGRADING.md) document to know more. From c453ac2036b41287f171a0a35b3a102c7d0e9bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 21 Oct 2022 14:59:29 +0200 Subject: [PATCH 16/19] Add @belgattitude as a contributor --- .all-contributorsrc | 13 +++++++++++++ README.md | 26 +++++++++++++++++--------- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 30d1c176..1a53356c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -165,6 +165,19 @@ "talk", "test" ] + }, + { + "login": "belgattitude", + "name": "SΓ©bastien Vanvelthem", + "avatar_url": "https://avatars.githubusercontent.com/u/259798?v=4", + "profile": "https://soluble.io/pro", + "contributions": [ + "code", + "doc", + "example", + "maintenance", + "userTesting" + ] } ], "commitConvention": "none" diff --git a/README.md b/README.md index 19a50f5b..6266b494 100644 --- a/README.md +++ b/README.md @@ -367,19 +367,27 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds - - - - - - - - - + + + + + + + + + + + + + + + +

Adriano Raiano
πŸ’¬ πŸ“ πŸ› πŸ’» πŸ“– πŸ’‘ πŸ‘€ ⚠️ βœ…
Isaac Hinman
πŸ’¬ πŸ’» πŸ–‹ πŸ“– πŸ’‘ πŸ‘€
Rob Capellini
πŸ’» ⚠️
Alexander Kachkaev
πŸ“’ πŸ’¬ πŸ€” πŸ’» ⚠️
Felix Mosheev
πŸ’¬ πŸ’» πŸ“’ ⚠️
Mathias WΓΈbbe
πŸ’» πŸ€” ⚠️
Lucas Feliciano
πŸ€” πŸ‘€
Rob Capellini
Rob Capellini
πŸ’» ⚠️		Alexander Kachkaev
Alexander Kachkaev
πŸ“’ πŸ’¬ πŸ€” πŸ’» ⚠️		Mathias WΓΈbbe
Mathias WΓΈbbe
πŸ’» πŸ€” ⚠️		Lucas Feliciano
Lucas Feliciano
πŸ€” πŸ‘€		Ryan Leung
Ryan Leung
πŸ’»		Nathan Friemel
Nathan Friemel
πŸ’» πŸ“– πŸ’‘ πŸ€”		Isaac Hinman
Isaac Hinman
️️️️♿️ πŸ’¬ πŸ”Š πŸ“ πŸ› πŸ’Ό πŸ’» πŸ–‹ πŸ”£ 🎨 πŸ“– πŸ“‹ πŸ’‘ πŸ’΅ πŸ” πŸ€” πŸš‡ 🚧 πŸ§‘β€πŸ« πŸ“¦ πŸ”Œ πŸ“† πŸ”¬ πŸ‘€ πŸ›‘οΈ πŸ“’ ⚠️ πŸ”§ 🌍 βœ… πŸ““ πŸ“Ή
Adriano Raiano
Adriano Raiano
️️️️♿️ πŸ’¬ πŸ”Š πŸ“ πŸ› πŸ’Ό πŸ’» πŸ–‹ πŸ”£ 🎨 πŸ“– πŸ“‹ πŸ’‘ πŸ’΅ πŸ” πŸ€” πŸš‡ 🚧 πŸ§‘β€πŸ« πŸ“¦ πŸ”Œ πŸ“† πŸ”¬ πŸ‘€ πŸ›‘οΈ πŸ“’ ⚠️ πŸ”§ 🌍 βœ… πŸ““ πŸ“Ή		Felix Mosheev
Felix Mosheev
πŸ’¬ πŸ’» πŸ“’ ⚠️		SΓ©bastien Vanvelthem
SΓ©bastien Vanvelthem
πŸ’» πŸ“– πŸ’‘ 🚧 πŸ““
+ This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome! From 062f4df7dea7d2f03145f8daaa566cf95e8e803b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Wed, 26 Oct 2022 11:24:56 +0200 Subject: [PATCH 17/19] refactor: remove i18next type augmentation --- examples/simple/types.d/i18next.d.ts.future | 25 --------------------- 1 file changed, 25 deletions(-) delete mode 100644 examples/simple/types.d/i18next.d.ts.future diff --git a/examples/simple/types.d/i18next.d.ts.future b/examples/simple/types.d/i18next.d.ts.future deleted file mode 100644 index aa8e2e12..00000000 --- a/examples/simple/types.d/i18next.d.ts.future +++ /dev/null @@ -1,25 +0,0 @@ -/** - * If you want to enable locale keys typechecking and enhance IDE experience. - * - * Requires `resolveJsonModule:true` in your tsconfig.json. - * - * @link https://www.i18next.com/overview/typescript - */ -import 'react-i18next' - -import type common from '../public/locales/en/common.json' -import type footer from '../public/locales/en/footer.json' -import type secondPage from '../public/locales/en/second-page.json' - -interface I18nNamespaces { - common: typeof common - footer: typeof footer - 'second-page': typeof secondPage -} - -declare module 'i18next' { - interface CustomTypeOptions { - defaultNS: 'common' - resources: I18nNamespaces - } -} From b37086c985fb43f7b8e55b0d557c9e2e2c013340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Wed, 26 Oct 2022 12:08:28 +0200 Subject: [PATCH 18/19] revert: lost range during merges --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6d644f13..7179b8ad 100644 --- a/package.json +++ b/package.json @@ -148,8 +148,8 @@ }, "peerDependencies": { "i18next": "^22.0.2", - "next": ">= 10.0.0", - "react": ">= 16.8.0", + "next": ">= 12.0.0", + "react": ">= 17.0.2", "react-i18next": "^12.0.0" } } From f94278db52fdfa0c5f25d59c02e1ad7cbdb83f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Wed, 26 Oct 2022 13:12:01 +0200 Subject: [PATCH 19/19] chore(deps): update to i18next-fs-backend@^2.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b31063fd..fc3f606a 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "@types/hoist-non-react-statics": "^3.3.1", "core-js": "^3", "hoist-non-react-statics": "^3.3.2", - "i18next-fs-backend": "^1.2.0" + "i18next-fs-backend": "^2.0.0" }, "peerDependencies": { "i18next": "^22.0.2",