From e4668ae3047718c472a1dfa405035da34127fba9 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 23 Oct 2019 10:26:27 +0200 Subject: [PATCH] Update i18next dependency version --- scm-ui/ui-components/package.json | 3 +- scm-ui/ui-plugins/package.json | 2 +- scm-ui/ui-webapp/package.json | 9 +++--- scm-ui/ui-webapp/src/i18n.ts | 5 ++-- yarn.lock | 49 ++++++++++--------------------- 5 files changed, 25 insertions(+), 43 deletions(-) diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index 871eae36b0..e7266aae6f 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -29,7 +29,6 @@ "@types/query-string": "5", "@types/react": "^16.9.9", "@types/react-dom": "^16.9.2", - "@types/react-i18next": "^7.8.3", "@types/react-router-dom": "^5.1.0", "@types/react-select": "^2.0.19", "@types/react-syntax-highlighter": "^11.0.1", @@ -54,7 +53,7 @@ "react": "^16.8.6", "react-diff-view": "^1.8.1", "react-dom": "^16.8.6", - "react-i18next": "^7.9.0", + "react-i18next": "^10.13.1", "react-markdown": "^4.0.6", "react-router-dom": "^5.1.2", "react-select": "^2.1.2", diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index 6462f246ff..ef328fe1a3 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -27,7 +27,7 @@ "jest": "^24.9.0", "query-string": "^5.0.1", "react": "^16.10.2", - "react-i18next": "^7.9.0", + "react-i18next": "^10.13.1", "react-redux": "^5.0.7", "react-router-dom": "^5.1.2", "redux": "^4.0.0", diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json index 39023a5034..af33163aeb 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -7,14 +7,14 @@ "@scm-manager/ui-extensions": "^2.0.0-SNAPSHOT", "classnames": "^2.2.5", "history": "^4.10.1", - "i18next": "^11.4.0", - "i18next-browser-languagedetector": "^2.2.2", - "i18next-fetch-backend": "^0.1.0", + "i18next": "^17.3.0", + "i18next-browser-languagedetector": "^4.0.0", + "i18next-fetch-backend": "^2.2.0", "memoize-one": "^5.0.4", "query-string": "5", "react": "^16.10.2", "react-dom": "^16.10.2", - "react-i18next": "^7.9.0", + "react-i18next": "^10.13.1", "react-redux": "^5.0.7", "react-router-dom": "^5.1.2", "react-select": "^2.1.2", @@ -38,7 +38,6 @@ "@types/query-string": "5", "@types/react": "^16.9.9", "@types/react-dom": "^16.9.2", - "@types/react-i18next": "^7.8.3", "@types/react-redux": "5.0.7", "@types/react-router-dom": "^5.1.0", "@types/styled-components": "^4.1.19", diff --git a/scm-ui/ui-webapp/src/i18n.ts b/scm-ui/ui-webapp/src/i18n.ts index b0898eaabb..b46185ced6 100644 --- a/scm-ui/ui-webapp/src/i18n.ts +++ b/scm-ui/ui-webapp/src/i18n.ts @@ -1,7 +1,8 @@ import i18n from "i18next"; +// @ts-ignore import Backend from "i18next-fetch-backend"; import LanguageDetector from "i18next-browser-languagedetector"; -import { reactI18nextModule } from "react-i18next"; +import { initReactI18next } from "react-i18next"; import { urls } from "@scm-manager/ui-components"; const loadPath = urls.withContextPath("/locales/{{lng}}/{{ns}}.json"); @@ -11,7 +12,7 @@ const loadPath = urls.withContextPath("/locales/{{lng}}/{{ns}}.json"); i18n .use(Backend) .use(LanguageDetector) - .use(reactI18nextModule) + .use(initReactI18next) .init({ fallbackLng: "en", diff --git a/yarn.lock b/yarn.lock index 58aa9a704f..dc7a5874f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7615,11 +7615,6 @@ hmac-drbg@^1.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoist-non-react-statics@^2.3.1: - version "2.5.5" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" - integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw== - hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b" @@ -7835,22 +7830,17 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -i18next-browser-languagedetector@^2.2.2: - version "2.2.4" - resolved "https://registry.yarnpkg.com/i18next-browser-languagedetector/-/i18next-browser-languagedetector-2.2.4.tgz#b02412d7ab15d7d74e1b1317d67d8a244b219ee3" - integrity sha512-wPbtH18FdOuB245I8Bhma5/XSDdN/HpYlX+wga1eMy+slhaFQSnrWX6fp+aYSL2eEuj0RlfHeEVz6Fo/lxAj6A== - -i18next-fetch-backend@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/i18next-fetch-backend/-/i18next-fetch-backend-0.1.0.tgz#18b67920d0e605e616f93bbdf897e59adf9c9c05" - integrity sha512-qnas13LdqiX3ViKjP/isoYz/38g5KvlAxmTt0ZQ8Ok/l9cS9pqTqpAf+7xdnvCmiQYzaqAuucEzJAD/qoyVIIQ== +i18next-browser-languagedetector@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/i18next-browser-languagedetector/-/i18next-browser-languagedetector-4.0.0.tgz#42dfe51b307821707d34669f1b848a7703675c01" + integrity sha512-w0glQVjhxMTPJHeDg1pUzF8h3teSkp1aotJp6GU6zvF0vVjdlsQdAyvDiQOYKwyQeg1P6Ja5XQLxfyq6sZZkFg== dependencies: - i18next-xhr-backend "^1.4.3" + "@babel/runtime" "^7.5.5" -i18next-xhr-backend@^1.4.3: - version "1.5.1" - resolved "https://registry.yarnpkg.com/i18next-xhr-backend/-/i18next-xhr-backend-1.5.1.tgz#50282610780c6a696d880dfa7f4ac1d01e8c3ad5" - integrity sha512-9OLdC/9YxDvTFcgsH5t2BHCODHEotHCa6h7Ly0EUlUC7Y2GS09UeoHOGj3gWKQ3HCqXz8NlH4gOrK3NNc9vPuw== +i18next-fetch-backend@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/i18next-fetch-backend/-/i18next-fetch-backend-2.2.0.tgz#39ff6578596e0122e80692e04d7897ee373607d6" + integrity sha512-HodOCr4fezjMgJwWnOR/JUotdbM1onXdnB6Y+XDgDpXX58SkZXcyz6VmmUGc/8XMxFzq3162Qs2vO+SlO4TCFw== i18next@*: version "17.2.0" @@ -7859,10 +7849,12 @@ i18next@*: dependencies: "@babel/runtime" "^7.3.1" -i18next@^11.4.0: - version "11.10.2" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-11.10.2.tgz#e5f10346f6320ecf15595419926c25255381a56c" - integrity sha512-1rowdX8PqrvsdFhYb3v0A/LlIHLQL1HTa4ia29IzhvNAg2fesNV7R1jXibWLmLQdz3FfTB8RuqSqDEjIawXruA== +i18next@^17.3.0: + version "17.3.0" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-17.3.0.tgz#6223799605303607243ce7c4c9846b205c14cd9c" + integrity sha512-4sJ6CHhLu/+xOEo3wresVl7jhC92bXhBkZYigJRzXCljzlgdayNhP/+0K+76GHmFTlL/OHg/hw04Praph9SJsA== + dependencies: + "@babel/runtime" "^7.3.1" iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" @@ -11729,7 +11721,7 @@ react-hotkeys@2.0.0-pre4: dependencies: prop-types "^15.6.1" -react-i18next@^10.11.4: +react-i18next@^10.11.4, react-i18next@^10.13.1: version "10.13.1" resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-10.13.1.tgz#4ad37e0bec5e4cf53aaa2a0c96a4e171e01ad520" integrity sha512-MReJUMoYooaKZONvoewFuAwf31bQU60Xt25P5wBIPTMphY4LjDJE27rwhEKjNLL24nSIHa3Jh+z9bPwSKISAoA== @@ -11737,15 +11729,6 @@ react-i18next@^10.11.4: "@babel/runtime" "^7.3.1" html-parse-stringify2 "2.0.1" -react-i18next@^7.9.0: - version "7.13.0" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-7.13.0.tgz#a6f64fd749215ec70400f90da6cbde2a9c5b1588" - integrity sha512-35M+MZFPqHwVIas7tXWQKFrf+ozCJukNplUTiGqL8mczSk+VRBsHxxXuuQKRkz/4CcWkONGWbp/AzxfM6wZncg== - dependencies: - hoist-non-react-statics "^2.3.1" - html-parse-stringify2 "2.0.1" - prop-types "^15.6.0" - react-input-autosize@^2.2.1: version "2.2.2" resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.2.tgz#fcaa7020568ec206bc04be36f4eb68e647c4d8c2"