From db1c4dc6e338dc9c8b662de2b334235488ce1d5f Mon Sep 17 00:00:00 2001 From: Samuel Newman Date: Tue, 2 Jun 2026 01:03:53 +0300 Subject: [PATCH] Update Intl polyfills (#10587) Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> --- package.json | 8 +- pnpm-lock.yaml | 107 ++++++++----------- src/locale/i18n.ts | 255 ++++++++++++++++++++++----------------------- tsconfig.json | 2 - 4 files changed, 175 insertions(+), 197 deletions(-) diff --git a/package.json b/package.json index a5060568eb..f82c2922ed 100644 --- a/package.json +++ b/package.json @@ -112,10 +112,10 @@ "@expo/webpack-config": "^19.0.1", "@floating-ui/dom": "^1.6.3", "@floating-ui/react-dom": "^2.0.8", - "@formatjs/intl-displaynames": "^6.8.13", - "@formatjs/intl-locale": "^4.2.13", - "@formatjs/intl-numberformat": "^8.15.6", - "@formatjs/intl-pluralrules": "^5.4.6", + "@formatjs/intl-displaynames": "^7.3.9", + "@formatjs/intl-locale": "^5.3.8", + "@formatjs/intl-numberformat": "^9.3.10", + "@formatjs/intl-pluralrules": "^6.3.9", "@growthbook/growthbook": "^1.6.5", "@growthbook/growthbook-react": "^1.6.5", "@ipld/dag-cbor": "^9.2.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 255d70f128..0b4789ac58 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -302,17 +302,17 @@ importers: specifier: ^2.0.8 version: 2.1.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@formatjs/intl-displaynames': - specifier: ^6.8.13 - version: 6.8.13 + specifier: ^7.3.9 + version: 7.3.9 '@formatjs/intl-locale': - specifier: ^4.2.13 - version: 4.2.13 + specifier: ^5.3.8 + version: 5.3.8 '@formatjs/intl-numberformat': - specifier: ^8.15.6 - version: 8.15.6 + specifier: ^9.3.10 + version: 9.3.10 '@formatjs/intl-pluralrules': - specifier: ^5.4.6 - version: 5.4.6 + specifier: ^6.3.9 + version: 6.3.9 '@growthbook/growthbook': specifier: ^1.6.5 version: 1.6.5 @@ -2065,33 +2065,32 @@ packages: '@floating-ui/utils@0.2.11': resolution: {integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==} - '@formatjs/ecma402-abstract@2.3.6': - resolution: {integrity: sha512-HJnTFeRM2kVFVr5gr5kH1XP6K0JcJtE7Lzvtr3FS/so5f1kpsqqqxy5JF+FRaO6H2qmcMfAUIox7AJteieRtVw==} + '@formatjs/bigdecimal@0.2.5': + resolution: {integrity: sha512-2XTKNrZRaCUyXK2976wfutqxMBuPO/S/zbJnQdysLI2Zy5mWPVNVEkE6tsTcSVWSE7DgO88t8DtBy+uf3I8bxg==} - '@formatjs/fast-memoize@2.2.7': - resolution: {integrity: sha512-Yabmi9nSvyOMrlSeGGWDiH7rf3a7sIwplbvo/dlz9WCIjzIQAfy1RMf4S0X3yG724n5Ghu2GmEl5NJIV6O9sZQ==} + '@formatjs/fast-memoize@3.1.5': + resolution: {integrity: sha512-KLi3fan6WnCHmigd9pmEEN8Hid0v4wiFBW576M/d07KMWYecf1CvyMI3n34vCmHT4AoVqG2n702kiHbXjzZX2A==} - '@formatjs/intl-displaynames@6.8.13': - resolution: {integrity: sha512-VbY7BdYJX5eURVKLk2grndUQtnbCLNbcJId/Sb/PsX7fWXiqWvg7qt/mecVHRzqoSEoGCQToKDxzpJj8RC0s3g==} + '@formatjs/intl-displaynames@7.3.9': + resolution: {integrity: sha512-UELvrHS171ElQW9iMCGqMR/HmUYQPYkYSz1A/SSkQtJ62ZH7aUWC1QnXPxL0CInQmxa/MgC7oE402XBoTe5nTQ==} - '@formatjs/intl-enumerator@1.8.12': - resolution: {integrity: sha512-rT2hnyQ0q6RDG1jISMH+MP6wlHQLUC81C0BeYEzabJb48S4tU2HGCPUxsOqMa3vDAUmpnz9Kw5vYTD5hTkOVgg==} - deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. + '@formatjs/intl-getcanonicallocales@3.2.9': + resolution: {integrity: sha512-b1dLzhFSeccG5X1PY2KodVFRGd0p6tBPc7pRBJaW6A7+fMeZnwHOAJLkMsGNDyvM9XailkkstE4jzmNa1GVh5w==} - '@formatjs/intl-getcanonicallocales@2.5.6': - resolution: {integrity: sha512-CnBbc4St61RL06gDXlCZG08Gt41uiySgsdZNBExh8/c0FBONJCrAlQ9FsyalUdq9ze0nCeknJtMmO8JnB9xHgQ==} + '@formatjs/intl-locale@5.3.8': + resolution: {integrity: sha512-pJgqQlg4zFoyCiVMXlKPBWpY7fAxvsUiShNmB/l8BW2ZwmFMefMWCrDzgocSH9WR+Z3pkihfjh1XbalCZhXc1Q==} - '@formatjs/intl-locale@4.2.13': - resolution: {integrity: sha512-Qcs0mP9JhEPCinPfpZ5JKzOa+VYDg94TQSFZozYuqG8R+hEGUTKyoyMqB5xi5QZT/hlB0CSgeNc/0fWMGtTFXA==} + '@formatjs/intl-localematcher@0.8.9': + resolution: {integrity: sha512-GmB0F/gYh4Hdl4rLWjgDsgT+x4pB54fkJeRh8kAZ4XFzKeCK8dGs+SBJWXO42QZtOUni+IDWKNuCw6wiL4lTvw==} - '@formatjs/intl-localematcher@0.6.2': - resolution: {integrity: sha512-XOMO2Hupl0wdd172Y06h6kLpBz6Dv+J4okPLl4LPtzbr8f66WbIoy4ev98EBuZ6ZK4h5ydTN6XneT4QVpD7cdA==} + '@formatjs/intl-numberformat@9.3.10': + resolution: {integrity: sha512-wYboXVXZyTvuMBgwE0AxcXYxV8LM0IkH+lfCoBlRVNjCwNzdHVbRcUxDRHE+HbFkQ6/zWFkyguvIP5y3PAt+jw==} - '@formatjs/intl-numberformat@8.15.6': - resolution: {integrity: sha512-htynTNKm5WOnbR521tNSMkWzX3yO6Z77qjOxvRujh5/A/UBKeoNElyuKCJltizdx3X33QNWQZC4aWjLKcccyeQ==} + '@formatjs/intl-pluralrules@6.3.9': + resolution: {integrity: sha512-0405uU1npNs5/N04tfIQ3pme96Xb51tEkCBTBKy8HMjAsssbhnK70gf8v3ogj1WqHf7WFRoFZu8clQTsvwBQNg==} - '@formatjs/intl-pluralrules@5.4.6': - resolution: {integrity: sha512-2HlOq+c7KsSps829SJ3B5987coX5mzKx9NbPcNwQ07eq8FBHgB3HfMoxt5HvLsdk4oQwCjAEnocbtd+wVwZ2Kg==} + '@formatjs/intl-supportedvaluesof@2.3.7': + resolution: {integrity: sha512-ZTXEKijV5H08z19odngZPsXlmGndfukHuVnjd9qyER77XSk/yJwDMiSjoJYY5C5WxFs2UN4s/EMtu75e6Tp3ug==} '@gorhom/portal@1.0.14': resolution: {integrity: sha512-MXyL4xvCjmgaORr/rtryDNFy3kU4qUbKlwtQqqsygd0xX3mhKjOLn6mQK8wfu0RkoE0pBE0nAasRoHua+/QZ7A==} @@ -11055,56 +11054,38 @@ snapshots: '@floating-ui/utils@0.2.11': {} - '@formatjs/ecma402-abstract@2.3.6': - dependencies: - '@formatjs/fast-memoize': 2.2.7 - '@formatjs/intl-localematcher': 0.6.2 - decimal.js: 10.6.0 - tslib: 2.8.1 + '@formatjs/bigdecimal@0.2.5': {} - '@formatjs/fast-memoize@2.2.7': - dependencies: - tslib: 2.8.1 + '@formatjs/fast-memoize@3.1.5': {} - '@formatjs/intl-displaynames@6.8.13': + '@formatjs/intl-displaynames@7.3.9': dependencies: - '@formatjs/ecma402-abstract': 2.3.6 - '@formatjs/intl-localematcher': 0.6.2 - tslib: 2.8.1 + '@formatjs/intl-localematcher': 0.8.9 - '@formatjs/intl-enumerator@1.8.12': - dependencies: - '@formatjs/ecma402-abstract': 2.3.6 - tslib: 2.8.1 + '@formatjs/intl-getcanonicallocales@3.2.9': {} - '@formatjs/intl-getcanonicallocales@2.5.6': + '@formatjs/intl-locale@5.3.8': dependencies: - tslib: 2.8.1 + '@formatjs/intl-getcanonicallocales': 3.2.9 + '@formatjs/intl-supportedvaluesof': 2.3.7 - '@formatjs/intl-locale@4.2.13': + '@formatjs/intl-localematcher@0.8.9': dependencies: - '@formatjs/ecma402-abstract': 2.3.6 - '@formatjs/intl-enumerator': 1.8.12 - '@formatjs/intl-getcanonicallocales': 2.5.6 - tslib: 2.8.1 + '@formatjs/fast-memoize': 3.1.5 - '@formatjs/intl-localematcher@0.6.2': + '@formatjs/intl-numberformat@9.3.10': dependencies: - tslib: 2.8.1 + '@formatjs/bigdecimal': 0.2.5 + '@formatjs/intl-localematcher': 0.8.9 - '@formatjs/intl-numberformat@8.15.6': + '@formatjs/intl-pluralrules@6.3.9': dependencies: - '@formatjs/ecma402-abstract': 2.3.6 - '@formatjs/intl-localematcher': 0.6.2 - decimal.js: 10.6.0 - tslib: 2.8.1 + '@formatjs/bigdecimal': 0.2.5 + '@formatjs/intl-localematcher': 0.8.9 - '@formatjs/intl-pluralrules@5.4.6': + '@formatjs/intl-supportedvaluesof@2.3.7': dependencies: - '@formatjs/ecma402-abstract': 2.3.6 - '@formatjs/intl-localematcher': 0.6.2 - decimal.js: 10.6.0 - tslib: 2.8.1 + '@formatjs/fast-memoize': 3.1.5 '@gorhom/portal@1.0.14(react-native@0.81.5(patch_hash=2656ac6deb71b92a4df4af4593d13ace6a5740936432e5e7e8ef32bc3cd05194)(@babel/core@7.29.0)(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)': dependencies: diff --git a/src/locale/i18n.ts b/src/locale/i18n.ts index c063f30a4c..88d85d473c 100644 --- a/src/locale/i18n.ts +++ b/src/locale/i18n.ts @@ -1,12 +1,12 @@ // Don't remove -force from these because detection is VERY slow on low-end Android. // https://github.com/formatjs/formatjs/issues/4463#issuecomment-2176070577 -import '@formatjs/intl-locale/polyfill-force' -import '@formatjs/intl-pluralrules/polyfill-force' -import '@formatjs/intl-numberformat/polyfill-force' -import '@formatjs/intl-displaynames/polyfill-force' -import '@formatjs/intl-pluralrules/locale-data/en' -import '@formatjs/intl-numberformat/locale-data/en' -import '@formatjs/intl-displaynames/locale-data/en' +import '@formatjs/intl-locale/polyfill-force.js' +import '@formatjs/intl-pluralrules/polyfill-force.js' +import '@formatjs/intl-numberformat/polyfill-force.js' +import '@formatjs/intl-displaynames/polyfill-force.js' +import '@formatjs/intl-pluralrules/locale-data/en.js' +import '@formatjs/intl-numberformat/locale-data/en.js' +import '@formatjs/intl-displaynames/locale-data/en.js' import {useEffect, useState} from 'react' import {i18n} from '@lingui/core' @@ -66,9 +66,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesAn}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/es'), - import('@formatjs/intl-pluralrules/locale-data/an'), - import('@formatjs/intl-numberformat/locale-data/es'), - import('@formatjs/intl-displaynames/locale-data/es'), + import('@formatjs/intl-pluralrules/locale-data/an.js'), + import('@formatjs/intl-numberformat/locale-data/an.js'), + import('@formatjs/intl-displaynames/locale-data/an.js'), ]) return dateLocale } @@ -76,9 +76,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesAst}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/es'), - import('@formatjs/intl-pluralrules/locale-data/ast'), - import('@formatjs/intl-numberformat/locale-data/ast'), - import('@formatjs/intl-displaynames/locale-data/ast'), + import('@formatjs/intl-pluralrules/locale-data/ast.js'), + import('@formatjs/intl-numberformat/locale-data/ast.js'), + import('@formatjs/intl-displaynames/locale-data/ast.js'), ]) return dateLocale } @@ -86,9 +86,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesCa}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/ca'), - import('@formatjs/intl-pluralrules/locale-data/ca'), - import('@formatjs/intl-numberformat/locale-data/ca'), - import('@formatjs/intl-displaynames/locale-data/ca'), + import('@formatjs/intl-pluralrules/locale-data/ca.js'), + import('@formatjs/intl-numberformat/locale-data/ca.js'), + import('@formatjs/intl-displaynames/locale-data/ca.js'), ]) return dateLocale } @@ -96,9 +96,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesCy}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/cy'), - import('@formatjs/intl-pluralrules/locale-data/cy'), - import('@formatjs/intl-numberformat/locale-data/cy'), - import('@formatjs/intl-displaynames/locale-data/cy'), + import('@formatjs/intl-pluralrules/locale-data/cy.js'), + import('@formatjs/intl-numberformat/locale-data/cy.js'), + import('@formatjs/intl-displaynames/locale-data/cy.js'), ]) return dateLocale } @@ -106,9 +106,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesDa}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/da'), - import('@formatjs/intl-pluralrules/locale-data/da'), - import('@formatjs/intl-numberformat/locale-data/da'), - import('@formatjs/intl-displaynames/locale-data/da'), + import('@formatjs/intl-pluralrules/locale-data/da.js'), + import('@formatjs/intl-numberformat/locale-data/da.js'), + import('@formatjs/intl-displaynames/locale-data/da.js'), ]) return dateLocale } @@ -116,9 +116,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesDe}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/de'), - import('@formatjs/intl-pluralrules/locale-data/de'), - import('@formatjs/intl-numberformat/locale-data/de'), - import('@formatjs/intl-displaynames/locale-data/de'), + import('@formatjs/intl-pluralrules/locale-data/de.js'), + import('@formatjs/intl-numberformat/locale-data/de.js'), + import('@formatjs/intl-displaynames/locale-data/de.js'), ]) return dateLocale } @@ -126,9 +126,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesEl}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/el'), - import('@formatjs/intl-pluralrules/locale-data/el'), - import('@formatjs/intl-numberformat/locale-data/el'), - import('@formatjs/intl-displaynames/locale-data/el'), + import('@formatjs/intl-pluralrules/locale-data/el.js'), + import('@formatjs/intl-numberformat/locale-data/el.js'), + import('@formatjs/intl-displaynames/locale-data/el.js'), ]) return dateLocale } @@ -136,9 +136,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesEn_GB}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/en-GB'), - import('@formatjs/intl-pluralrules/locale-data/en'), - import('@formatjs/intl-numberformat/locale-data/en-GB'), - import('@formatjs/intl-displaynames/locale-data/en-GB'), + import('@formatjs/intl-pluralrules/locale-data/en.js'), + import('@formatjs/intl-numberformat/locale-data/en-GB.js'), + import('@formatjs/intl-displaynames/locale-data/en-GB.js'), ]) return dateLocale } @@ -146,10 +146,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesEo}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/eo'), - import('@formatjs/intl-pluralrules/locale-data/eo'), - import('@formatjs/intl-numberformat/locale-data/eo'), - // borked, see https://github.com/bluesky-social/social-app/pull/9574 - // import('@formatjs/intl-displaynames/locale-data/eo'), + import('@formatjs/intl-pluralrules/locale-data/eo.js'), + import('@formatjs/intl-numberformat/locale-data/eo.js'), + import('@formatjs/intl-displaynames/locale-data/eo.js'), ]) return dateLocale } @@ -157,9 +156,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesEs}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/es'), - import('@formatjs/intl-pluralrules/locale-data/es'), - import('@formatjs/intl-numberformat/locale-data/es'), - import('@formatjs/intl-displaynames/locale-data/es'), + import('@formatjs/intl-pluralrules/locale-data/es.js'), + import('@formatjs/intl-numberformat/locale-data/es.js'), + import('@formatjs/intl-displaynames/locale-data/es.js'), ]) return dateLocale } @@ -167,9 +166,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesEu}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/eu'), - import('@formatjs/intl-pluralrules/locale-data/eu'), - import('@formatjs/intl-numberformat/locale-data/eu'), - import('@formatjs/intl-displaynames/locale-data/eu'), + import('@formatjs/intl-pluralrules/locale-data/eu.js'), + import('@formatjs/intl-numberformat/locale-data/eu.js'), + import('@formatjs/intl-displaynames/locale-data/eu.js'), ]) return dateLocale } @@ -177,9 +176,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesFi}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/fi'), - import('@formatjs/intl-pluralrules/locale-data/fi'), - import('@formatjs/intl-numberformat/locale-data/fi'), - import('@formatjs/intl-displaynames/locale-data/fi'), + import('@formatjs/intl-pluralrules/locale-data/fi.js'), + import('@formatjs/intl-numberformat/locale-data/fi.js'), + import('@formatjs/intl-displaynames/locale-data/fi.js'), ]) return dateLocale } @@ -187,9 +186,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesFr}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/fr'), - import('@formatjs/intl-pluralrules/locale-data/fr'), - import('@formatjs/intl-numberformat/locale-data/fr'), - import('@formatjs/intl-displaynames/locale-data/fr'), + import('@formatjs/intl-pluralrules/locale-data/fr.js'), + import('@formatjs/intl-numberformat/locale-data/fr.js'), + import('@formatjs/intl-displaynames/locale-data/fr.js'), ]) return dateLocale } @@ -197,18 +196,18 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesFy}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/fy'), - import('@formatjs/intl-pluralrules/locale-data/fy'), - import('@formatjs/intl-numberformat/locale-data/fy'), - import('@formatjs/intl-displaynames/locale-data/fy'), + import('@formatjs/intl-pluralrules/locale-data/fy.js'), + import('@formatjs/intl-numberformat/locale-data/fy.js'), + import('@formatjs/intl-displaynames/locale-data/fy.js'), ]) return dateLocale } case AppLanguage.ga: { i18n.loadAndActivate({locale, messages: messagesGa}) await Promise.all([ - import('@formatjs/intl-pluralrules/locale-data/ga'), - import('@formatjs/intl-numberformat/locale-data/ga'), - import('@formatjs/intl-displaynames/locale-data/ga'), + import('@formatjs/intl-pluralrules/locale-data/ga.js'), + import('@formatjs/intl-numberformat/locale-data/ga.js'), + import('@formatjs/intl-displaynames/locale-data/ga.js'), ]) return undefined } @@ -216,9 +215,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesGd}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/gd'), - import('@formatjs/intl-pluralrules/locale-data/gd'), - import('@formatjs/intl-numberformat/locale-data/gd'), - import('@formatjs/intl-displaynames/locale-data/gd'), + import('@formatjs/intl-pluralrules/locale-data/gd.js'), + import('@formatjs/intl-numberformat/locale-data/gd.js'), + import('@formatjs/intl-displaynames/locale-data/gd.js'), ]) return dateLocale } @@ -226,9 +225,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesGl}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/gl'), - import('@formatjs/intl-pluralrules/locale-data/gl'), - import('@formatjs/intl-numberformat/locale-data/gl'), - import('@formatjs/intl-displaynames/locale-data/gl'), + import('@formatjs/intl-pluralrules/locale-data/gl.js'), + import('@formatjs/intl-numberformat/locale-data/gl.js'), + import('@formatjs/intl-displaynames/locale-data/gl.js'), ]) return dateLocale } @@ -236,9 +235,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesHi}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/hi'), - import('@formatjs/intl-pluralrules/locale-data/hi'), - import('@formatjs/intl-numberformat/locale-data/hi'), - import('@formatjs/intl-displaynames/locale-data/hi'), + import('@formatjs/intl-pluralrules/locale-data/hi.js'), + import('@formatjs/intl-numberformat/locale-data/hi.js'), + import('@formatjs/intl-displaynames/locale-data/hi.js'), ]) return dateLocale } @@ -246,18 +245,18 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesHu}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/hu'), - import('@formatjs/intl-pluralrules/locale-data/hu'), - import('@formatjs/intl-numberformat/locale-data/hu'), - import('@formatjs/intl-displaynames/locale-data/hu'), + import('@formatjs/intl-pluralrules/locale-data/hu.js'), + import('@formatjs/intl-numberformat/locale-data/hu.js'), + import('@formatjs/intl-displaynames/locale-data/hu.js'), ]) return dateLocale } case AppLanguage.ia: { i18n.loadAndActivate({locale, messages: messagesIa}) await Promise.all([ - import('@formatjs/intl-pluralrules/locale-data/ia'), - import('@formatjs/intl-numberformat/locale-data/ia'), - import('@formatjs/intl-displaynames/locale-data/ia'), + import('@formatjs/intl-pluralrules/locale-data/ia.js'), + import('@formatjs/intl-numberformat/locale-data/ia.js'), + import('@formatjs/intl-displaynames/locale-data/ia.js'), ]) return undefined } @@ -265,9 +264,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesId}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/id'), - import('@formatjs/intl-pluralrules/locale-data/id'), - import('@formatjs/intl-numberformat/locale-data/id'), - import('@formatjs/intl-displaynames/locale-data/id'), + import('@formatjs/intl-pluralrules/locale-data/id.js'), + import('@formatjs/intl-numberformat/locale-data/id.js'), + import('@formatjs/intl-displaynames/locale-data/id.js'), ]) return dateLocale } @@ -275,9 +274,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesIt}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/it'), - import('@formatjs/intl-pluralrules/locale-data/it'), - import('@formatjs/intl-numberformat/locale-data/it'), - import('@formatjs/intl-displaynames/locale-data/it'), + import('@formatjs/intl-pluralrules/locale-data/it.js'), + import('@formatjs/intl-numberformat/locale-data/it.js'), + import('@formatjs/intl-displaynames/locale-data/it.js'), ]) return dateLocale } @@ -285,9 +284,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesJa}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/ja'), - import('@formatjs/intl-pluralrules/locale-data/ja'), - import('@formatjs/intl-numberformat/locale-data/ja'), - import('@formatjs/intl-displaynames/locale-data/ja'), + import('@formatjs/intl-pluralrules/locale-data/ja.js'), + import('@formatjs/intl-numberformat/locale-data/ja.js'), + import('@formatjs/intl-displaynames/locale-data/ja.js'), ]) return dateLocale } @@ -295,9 +294,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesKm}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/km'), - import('@formatjs/intl-pluralrules/locale-data/km'), - import('@formatjs/intl-numberformat/locale-data/km'), - import('@formatjs/intl-displaynames/locale-data/km'), + import('@formatjs/intl-pluralrules/locale-data/km.js'), + import('@formatjs/intl-numberformat/locale-data/km.js'), + import('@formatjs/intl-displaynames/locale-data/km.js'), ]) return dateLocale } @@ -305,18 +304,18 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesKo}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/ko'), - import('@formatjs/intl-pluralrules/locale-data/ko'), - import('@formatjs/intl-numberformat/locale-data/ko'), - import('@formatjs/intl-displaynames/locale-data/ko'), + import('@formatjs/intl-pluralrules/locale-data/ko.js'), + import('@formatjs/intl-numberformat/locale-data/ko.js'), + import('@formatjs/intl-displaynames/locale-data/ko.js'), ]) return dateLocale } case AppLanguage.ne: { i18n.loadAndActivate({locale, messages: messagesNe}) await Promise.all([ - import('@formatjs/intl-pluralrules/locale-data/ne'), - import('@formatjs/intl-numberformat/locale-data/ne'), - import('@formatjs/intl-displaynames/locale-data/ne'), + import('@formatjs/intl-pluralrules/locale-data/ne.js'), + import('@formatjs/intl-numberformat/locale-data/ne.js'), + import('@formatjs/intl-displaynames/locale-data/ne.js'), ]) return undefined } @@ -324,9 +323,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesNl}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/nl'), - import('@formatjs/intl-pluralrules/locale-data/nl'), - import('@formatjs/intl-numberformat/locale-data/nl'), - import('@formatjs/intl-displaynames/locale-data/nl'), + import('@formatjs/intl-pluralrules/locale-data/nl.js'), + import('@formatjs/intl-numberformat/locale-data/nl.js'), + import('@formatjs/intl-displaynames/locale-data/nl.js'), ]) return dateLocale } @@ -334,9 +333,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesPl}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/pl'), - import('@formatjs/intl-pluralrules/locale-data/pl'), - import('@formatjs/intl-numberformat/locale-data/pl'), - import('@formatjs/intl-displaynames/locale-data/pl'), + import('@formatjs/intl-pluralrules/locale-data/pl.js'), + import('@formatjs/intl-numberformat/locale-data/pl.js'), + import('@formatjs/intl-displaynames/locale-data/pl.js'), ]) return dateLocale } @@ -344,9 +343,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesPt_BR}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/pt-BR'), - import('@formatjs/intl-pluralrules/locale-data/pt'), - import('@formatjs/intl-numberformat/locale-data/pt'), - import('@formatjs/intl-displaynames/locale-data/pt'), + import('@formatjs/intl-pluralrules/locale-data/pt.js'), + import('@formatjs/intl-numberformat/locale-data/pt.js'), + import('@formatjs/intl-displaynames/locale-data/pt.js'), ]) return dateLocale } @@ -354,9 +353,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesPt_PT}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/pt'), - import('@formatjs/intl-pluralrules/locale-data/pt-PT'), - import('@formatjs/intl-numberformat/locale-data/pt-PT'), - import('@formatjs/intl-displaynames/locale-data/pt-PT'), + import('@formatjs/intl-pluralrules/locale-data/pt-PT.js'), + import('@formatjs/intl-numberformat/locale-data/pt-PT.js'), + import('@formatjs/intl-displaynames/locale-data/pt-PT.js'), ]) return dateLocale } @@ -364,9 +363,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesRo}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/ro'), - import('@formatjs/intl-pluralrules/locale-data/ro'), - import('@formatjs/intl-numberformat/locale-data/ro'), - import('@formatjs/intl-displaynames/locale-data/ro'), + import('@formatjs/intl-pluralrules/locale-data/ro.js'), + import('@formatjs/intl-numberformat/locale-data/ro.js'), + import('@formatjs/intl-displaynames/locale-data/ro.js'), ]) return dateLocale } @@ -374,9 +373,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesRu}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/ru'), - import('@formatjs/intl-pluralrules/locale-data/ru'), - import('@formatjs/intl-numberformat/locale-data/ru'), - import('@formatjs/intl-displaynames/locale-data/ru'), + import('@formatjs/intl-pluralrules/locale-data/ru.js'), + import('@formatjs/intl-numberformat/locale-data/ru.js'), + import('@formatjs/intl-displaynames/locale-data/ru.js'), ]) return dateLocale } @@ -384,9 +383,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesSv}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/sv'), - import('@formatjs/intl-pluralrules/locale-data/sv'), - import('@formatjs/intl-numberformat/locale-data/sv'), - import('@formatjs/intl-displaynames/locale-data/sv'), + import('@formatjs/intl-pluralrules/locale-data/sv.js'), + import('@formatjs/intl-numberformat/locale-data/sv.js'), + import('@formatjs/intl-displaynames/locale-data/sv.js'), ]) return dateLocale } @@ -394,9 +393,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesTh}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/th'), - import('@formatjs/intl-pluralrules/locale-data/th'), - import('@formatjs/intl-numberformat/locale-data/th'), - import('@formatjs/intl-displaynames/locale-data/th'), + import('@formatjs/intl-pluralrules/locale-data/th.js'), + import('@formatjs/intl-numberformat/locale-data/th.js'), + import('@formatjs/intl-displaynames/locale-data/th.js'), ]) return dateLocale } @@ -404,9 +403,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesTr}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/tr'), - import('@formatjs/intl-pluralrules/locale-data/tr'), - import('@formatjs/intl-numberformat/locale-data/tr'), - import('@formatjs/intl-displaynames/locale-data/tr'), + import('@formatjs/intl-pluralrules/locale-data/tr.js'), + import('@formatjs/intl-numberformat/locale-data/tr.js'), + import('@formatjs/intl-displaynames/locale-data/tr.js'), ]) return dateLocale } @@ -414,9 +413,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesUk}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/uk'), - import('@formatjs/intl-pluralrules/locale-data/uk'), - import('@formatjs/intl-numberformat/locale-data/uk'), - import('@formatjs/intl-displaynames/locale-data/uk'), + import('@formatjs/intl-pluralrules/locale-data/uk.js'), + import('@formatjs/intl-numberformat/locale-data/uk.js'), + import('@formatjs/intl-displaynames/locale-data/uk.js'), ]) return dateLocale } @@ -424,9 +423,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesVi}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/vi'), - import('@formatjs/intl-pluralrules/locale-data/vi'), - import('@formatjs/intl-numberformat/locale-data/vi'), - import('@formatjs/intl-displaynames/locale-data/vi'), + import('@formatjs/intl-pluralrules/locale-data/vi.js'), + import('@formatjs/intl-numberformat/locale-data/vi.js'), + import('@formatjs/intl-displaynames/locale-data/vi.js'), ]) return dateLocale } @@ -434,9 +433,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesZh_CN}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/zh-CN'), - import('@formatjs/intl-pluralrules/locale-data/zh'), - import('@formatjs/intl-numberformat/locale-data/zh'), - import('@formatjs/intl-displaynames/locale-data/zh'), + import('@formatjs/intl-pluralrules/locale-data/zh.js'), + import('@formatjs/intl-numberformat/locale-data/zh.js'), + import('@formatjs/intl-displaynames/locale-data/zh.js'), ]) return dateLocale } @@ -444,9 +443,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesZh_HK}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/zh-HK'), - import('@formatjs/intl-pluralrules/locale-data/zh'), - import('@formatjs/intl-numberformat/locale-data/zh'), - import('@formatjs/intl-displaynames/locale-data/zh'), + import('@formatjs/intl-pluralrules/locale-data/zh.js'), + import('@formatjs/intl-numberformat/locale-data/yue-Hant.js'), + import('@formatjs/intl-displaynames/locale-data/yue-Hant.js'), ]) return dateLocale } @@ -454,9 +453,9 @@ export async function dynamicActivate(locale: AppLanguage) { i18n.loadAndActivate({locale, messages: messagesZh_TW}) const [{default: dateLocale}] = await Promise.all([ import('date-fns/locale/zh-TW'), - import('@formatjs/intl-pluralrules/locale-data/zh'), - import('@formatjs/intl-numberformat/locale-data/zh'), - import('@formatjs/intl-displaynames/locale-data/zh'), + import('@formatjs/intl-pluralrules/locale-data/zh.js'), + import('@formatjs/intl-numberformat/locale-data/zh-Hant.js'), + import('@formatjs/intl-displaynames/locale-data/zh-Hant.js'), ]) return dateLocale } diff --git a/tsconfig.json b/tsconfig.json index 8d76de8a00..c3f559d917 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,8 +8,6 @@ "paths": { "#/*": ["./src/*"], "crypto": ["./src/platform/crypto.ts"], - "multiformats/cid": ["./node_modules/multiformats/types/src/cid.d.ts"], - "multiformats/hashes/hasher": ["./node_modules/multiformats/types/src/hashes/hasher.d.ts"] }, "plugins": [ {