Fix android logging with polyfill

TryQuiet · May 15, 2024 · 84696a7 · 84696a7
1 parent d5fecbd
commit 84696a7
Show file tree

Hide file tree

Showing 6 changed files with 208 additions and 3 deletions.
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -108,9 +108,8 @@
     "dotenv": "8.2.0",
     "events": "^3.2.0",
     "express": "^4.17.1",
-    "fetch-retry": "^6.0.0",
-    "node-fetch": "^3.3.0",
     "fastq": "^1.17.1",
+    "fetch-retry": "^6.0.0",
     "get-port": "^5.1.1",
     "go-ipfs": "npm:mocked-go-ipfs@0.17.0",
     "http-server": "^0.12.3",
@@ -124,6 +123,7 @@
     "libp2p": "0.42.2",
     "luxon": "^3.4.4",
     "multiaddr": "^10.0.1",
+    "node-fetch": "^3.3.0",
     "orbit-db": "0.29.0",
     "orbit-db-access-controllers": "^0.4.0",
     "orbit-db-identity-provider": "0.5.0",

diff --git a/packages/common/package-lock.json b/packages/common/package-lock.json
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -30,6 +30,9 @@
     "typescript": "^4.9.3"
   },
   "dependencies": {
+    "@formatjs/intl-datetimeformat": "^6.12.3",
+    "@formatjs/intl-getcanonicallocales": "^2.3.0",
+    "@formatjs/intl-locale": "^3.4.5",
     "@quiet/logger": "^2.0.2-alpha.0",
     "@quiet/types": "^2.0.2-alpha.1",
     "cross-env": "^5.2.0",

diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
@@ -13,3 +13,4 @@ export * from './auth'
 export * from './messages'
 export * from './compare'
 export * from './dir'
+export * from './polyfill'
diff --git a/packages/common/src/polyfill.ts b/packages/common/src/polyfill.ts
@@ -0,0 +1,20 @@
+import { shouldPolyfill as shouldPolyfillCanon } from '@formatjs/intl-getcanonicallocales/should-polyfill'
+import { shouldPolyfill as shouldPolyfillLocale } from '@formatjs/intl-locale/should-polyfill'
+import { shouldPolyfill as shouldPolyFillFormat } from '@formatjs/intl-datetimeformat/should-polyfill'
+
+function polyfill() {
+  if (shouldPolyfillCanon()) {
+    require('@formatjs/intl-getcanonicallocales/polyfill')
+  }
+
+  if (shouldPolyfillLocale()) {
+    require('@formatjs/intl-locale/polyfill')
+  }
+
+  if (shouldPolyFillFormat()) {
+    require('@formatjs/intl-datetimeformat/polyfill')
+    require('@formatjs/intl-datetimeformat/locale-data/en')
+  }
+}
+
+polyfill()
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
@@ -40,7 +40,6 @@
     "events": "^1.1.1",
     "fast-text-encoding": "^1.0.6",
     "i18next": "^20.2.2",
-    "react-intl": "^6.6.6",
     "jdenticon": "^3.2.0",
     "loadash": "^1.0.0",
     "luxon": "^3.4.4",
@@ -49,6 +48,7 @@
     "react": "18.2.0",
     "react-dom": "18.1.0",
     "react-i18next": "^11.8.15",
+    "react-intl": "^6.6.6",
     "react-linkify": "^1.0.0-alpha",
     "react-native": "0.73.2",
     "react-native-blob-util": "^0.19.6",