From cdbcebadf628772e2241f0cb04f8b7075e28cba1 Mon Sep 17 00:00:00 2001 From: Jesse Chan Date: Wed, 12 Aug 2020 19:58:25 +0800 Subject: [PATCH] dependencies: bump react-intl to 5.4.7 (major) --- client/src/javascript/i18n/languages.ts | 39 ------ package-lock.json | 159 +++++++++++++++++++----- package.json | 3 +- 3 files changed, 126 insertions(+), 75 deletions(-) diff --git a/client/src/javascript/i18n/languages.ts b/client/src/javascript/i18n/languages.ts index 6d17374f..5f5a9fe1 100644 --- a/client/src/javascript/i18n/languages.ts +++ b/client/src/javascript/i18n/languages.ts @@ -1,23 +1,3 @@ -import {addLocaleData} from 'react-intl'; -import enLocaleData from 'react-intl/locale-data/en'; -import csLocaleData from 'react-intl/locale-data/cs'; -import deLocaleData from 'react-intl/locale-data/de'; -import esLocaleData from 'react-intl/locale-data/es'; -import frLocaleData from 'react-intl/locale-data/fr'; -import itLocaleData from 'react-intl/locale-data/it'; -import nlLocaleData from 'react-intl/locale-data/nl'; -import noLocaleData from 'react-intl/locale-data/no'; -import plLocaleData from 'react-intl/locale-data/pl'; -import ptLocaleData from 'react-intl/locale-data/pt'; -import ruLocaleData from 'react-intl/locale-data/ru'; -import roLocaleData from 'react-intl/locale-data/ro'; -import svLocaleData from 'react-intl/locale-data/sv'; -import ukLocaleData from 'react-intl/locale-data/uk'; -import koLocaleData from 'react-intl/locale-data/ko'; -import jaLocaleData from 'react-intl/locale-data/ja'; -import zhLocaleData from 'react-intl/locale-data/zh'; -import arLocaleData from 'react-intl/locale-data/ar'; - import EN from './strings'; import CS from './translations/cs'; @@ -39,25 +19,6 @@ import ZH_HANS from './translations/zh-Hans'; import ZH_HANT from './translations/zh-Hant'; import AR from './translations/ar'; -addLocaleData(enLocaleData); -addLocaleData(csLocaleData); -addLocaleData(deLocaleData); -addLocaleData(esLocaleData); -addLocaleData(frLocaleData); -addLocaleData(itLocaleData); -addLocaleData(nlLocaleData); -addLocaleData(noLocaleData); -addLocaleData(plLocaleData); -addLocaleData(ptLocaleData); -addLocaleData(ruLocaleData); -addLocaleData(roLocaleData); -addLocaleData(svLocaleData); -addLocaleData(ukLocaleData); -addLocaleData(koLocaleData); -addLocaleData(jaLocaleData); -addLocaleData(zhLocaleData); -addLocaleData(arLocaleData); - export const languages = { auto: EN, en: EN, diff --git a/package-lock.json b/package-lock.json index 39bf4647..5678e693 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1203,6 +1203,70 @@ "to-fast-properties": "^2.0.0" } }, + "@formatjs/intl-datetimeformat": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-2.3.1.tgz", + "integrity": "sha512-i1H3hflcILP40ETiaaWcmLOdkt/iDbfn/2Z8aCWss/IgP2b7r/mCXbgaRJh1dh6pCpmbLp5g4lpIrkvUKuhUtA==", + "requires": { + "@formatjs/intl-getcanonicallocales": "^1.3.1", + "@formatjs/intl-utils": "^3.8.2" + } + }, + "@formatjs/intl-displaynames": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-3.1.7.tgz", + "integrity": "sha512-a0aOuCa8HUEq/vnc3cT88Ocww9tC6KbXhgfk4OzB38acFBWi34lAHTEC34ZmkJg1ASdWkbXOi18WdXNzEZCXZg==", + "requires": { + "@formatjs/intl-utils": "^3.8.2" + } + }, + "@formatjs/intl-getcanonicallocales": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.3.1.tgz", + "integrity": "sha512-0E1ZOTwIB8zEjqnW4V7k0gBVdmtbXiLfq1sWhX28Uq59iTmo+zoADre9dIr15Sx6Kl+4JgC6Mu9/bP3F746Fjg==", + "requires": { + "cldr-core": "36.0.0" + } + }, + "@formatjs/intl-listformat": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-4.0.0.tgz", + "integrity": "sha512-ptWeK9LSuvWZswZP0NpGkchoBOSi+brrbGC2MxakitkXb6o1smDtnLnQP0Ai/yv0/xR1bV+D8n9o++ycUgXwaA==", + "requires": { + "@formatjs/intl-utils": "^3.8.2" + } + }, + "@formatjs/intl-numberformat": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-5.3.3.tgz", + "integrity": "sha512-keU4arK7WoQMMfUuXzVP5nPzKFXrNpcNne/58OxxDxoJfqiv4vHiBjHHfPzy5xf+1rgnoplaV1mabNt1HTPtwA==", + "requires": { + "@formatjs/intl-utils": "^3.8.2" + } + }, + "@formatjs/intl-relativetimeformat": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-7.0.0.tgz", + "integrity": "sha512-QQpQezSY8Q5H/PZVvPAs8SFhoUVXM52le+UgKAYTyAkeC4lr+DkX4ZP7Msateu81K1jFB8jhxcSOUEzGie7g2w==", + "requires": { + "@formatjs/intl-utils": "^3.8.2" + } + }, + "@formatjs/intl-utils": { + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/@formatjs/intl-utils/-/intl-utils-3.8.2.tgz", + "integrity": "sha512-34J1HmuNSRYQgJ6Gi/dYJQzdDsyAPJOrzXx977UajrhlXlI+0dvoqleP4W+Qtyc65EqzTGtUSgqLYhoPty8v3w==", + "requires": { + "emojis-list": "^3.0.0" + }, + "dependencies": { + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" + } + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -1372,6 +1436,25 @@ "integrity": "sha512-2xtoL22/3Mv6a70i4+4RB7VgbDDORoWwjcqeNysojZA0R7NK17RbY5Gof/2QiFfJgX+KkWghbwJ+d/2SB8Ndzg==", "dev": true }, + "@types/hoist-non-react-statics": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", + "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==", + "requires": { + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0" + }, + "dependencies": { + "hoist-non-react-statics": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "requires": { + "react-is": "^16.7.0" + } + } + } + }, "@types/html-minifier-terser": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz", @@ -1421,11 +1504,6 @@ "@types/react": "*" } }, - "@types/react-intl": { - "version": "2.3.18", - "resolved": "https://registry.npmjs.org/@types/react-intl/-/react-intl-2.3.18.tgz", - "integrity": "sha512-DVNJs49zUxKRZng8VuILE886Yihdsf3yLr5vHk9zJrmF8SyRSK3sxNSvikAKxNkv9hX55XBTJShz6CkJnbNjgg==" - }, "@types/react-router": { "version": "5.1.8", "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.8.tgz", @@ -3970,6 +4048,11 @@ "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz", "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==" }, + "cldr-core": { + "version": "36.0.0", + "resolved": "https://registry.npmjs.org/cldr-core/-/cldr-core-36.0.0.tgz", + "integrity": "sha512-QLnAjt20rZe38c8h8OJ9jPND+O4o5O8Nw0TK/P3KpNn1cmOhMu0rk6Kc3ap96c5OStQ9gAngs9+Be2sum26NOw==" + }, "clean-stack": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", @@ -7009,6 +7092,11 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, + "fast-memoize": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz", + "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==" + }, "fastparse": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz", @@ -8974,30 +9062,21 @@ "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", "dev": true }, - "intl-format-cache": { - "version": "2.2.9", - "resolved": "https://registry.npmjs.org/intl-format-cache/-/intl-format-cache-2.2.9.tgz", - "integrity": "sha512-Zv/u8wRpekckv0cLkwpVdABYST4hZNTDaX7reFetrYTJwxExR2VyTqQm+l0WmL0Qo8Mjb9Tf33qnfj0T7pjxdQ==" - }, "intl-messageformat": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-2.2.0.tgz", - "integrity": "sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.2.0.tgz", + "integrity": "sha512-mdASJPZpKfhbM//NLNIETArWgVL06j5M9ZdhgiKBO4XayS4GQHnXW+zVUE5iAwHcGZIKzvdWCj4D4kmNzUmEzA==", "requires": { - "intl-messageformat-parser": "1.4.0" + "fast-memoize": "^2.5.2", + "intl-messageformat-parser": "^5.3.7" } }, "intl-messageformat-parser": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz", - "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU=" - }, - "intl-relativeformat": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz", - "integrity": "sha512-4bV/7kSKaPEmu6ArxXf9xjv1ny74Zkwuey8Pm01NH4zggPP7JHwg2STk8Y3JdspCKRDriwIyLRfEXnj2ZLr4Bw==", + "version": "5.3.7", + "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-5.3.7.tgz", + "integrity": "sha512-83C+eODXu/zfR35bKjSz/HKEGkNSHbsF1WOuZDgFs/TudaEuVIZ8pstQYFyY0CIuCGXomcSevrFW1d4y7nW5xw==", "requires": { - "intl-messageformat": "^2.0.0" + "@formatjs/intl-numberformat": "^5.3.3" } }, "invariant": { @@ -13028,21 +13107,28 @@ "dev": true }, "react-intl": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.9.0.tgz", - "integrity": "sha512-27jnDlb/d2A7mSJwrbOBnUgD+rPep+abmoJE511Tf8BnoONIAUehy/U1zZCHGO17mnOwMWxqN4qC0nW11cD6rA==", + "version": "5.4.7", + "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.4.7.tgz", + "integrity": "sha512-oiR/w6KdVTFGa2LlycQYfumbbE0/YRymhmvj8diGYo3vvDjlZjjB1V/bzaGNWPhbNWwJXeMH+WHVylATHMCYbQ==", "requires": { - "hoist-non-react-statics": "^3.3.0", - "intl-format-cache": "^2.0.5", - "intl-messageformat": "^2.1.0", - "intl-relativeformat": "^2.1.0", - "invariant": "^2.1.1" + "@formatjs/intl-datetimeformat": "^2.3.1", + "@formatjs/intl-displaynames": "^3.1.7", + "@formatjs/intl-listformat": "^4.0.0", + "@formatjs/intl-numberformat": "^5.3.3", + "@formatjs/intl-relativetimeformat": "^7.0.0", + "@formatjs/intl-utils": "^3.8.2", + "@types/hoist-non-react-statics": "^3.3.1", + "fast-memoize": "^2.5.2", + "hoist-non-react-statics": "^3.3.2", + "intl-messageformat": "^9.2.0", + "intl-messageformat-parser": "^5.3.7", + "shallow-equal": "^1.2.1" }, "dependencies": { "hoist-non-react-statics": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", - "integrity": "sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", "requires": { "react-is": "^16.7.0" } @@ -14372,6 +14458,11 @@ "safe-buffer": "^5.0.1" } }, + "shallow-equal": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz", + "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==" + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", diff --git a/package.json b/package.json index fe725e2a..4d7a6611 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "@babel/preset-react": "^7.10.4", "@babel/preset-typescript": "^7.10.4", "@types/react-dom": "^16.9.8", - "@types/react-intl": "^2.3.18", "argon2": "^0.26.2", "autoprefixer": "^9.8.6", "axios": "^0.19.2", @@ -80,7 +79,7 @@ "react-dnd-html5-backend": "^2.6.0", "react-dom": "^16.13.1", "react-dropzone": "^4.3.0", - "react-intl": "^2.9.0", + "react-intl": "^5.4.7", "react-markdown": "^4.3.1", "react-measure": "^2.3.0", "react-router": "^5.2.0",