From 9ae324ee5127beaaf3a53bfd930fe7155dae3323 Mon Sep 17 00:00:00 2001
From: Magomed Khamidov <53529533+KosmosKey@users.noreply.github.com>
Date: Fri, 6 Oct 2023 20:55:38 +0100
Subject: [PATCH 1/8] fix: common-js module

---
 packages/rainbowkit/src/locales/index.ts   | 57 +++++++++++-----------
 packages/rainbowkit/src/types/i18n-js.d.ts |  1 +
 2 files changed, 30 insertions(+), 28 deletions(-)
 create mode 100644 packages/rainbowkit/src/types/i18n-js.d.ts

diff --git a/packages/rainbowkit/src/locales/index.ts b/packages/rainbowkit/src/locales/index.ts
index 85a0948f78..5489302e1f 100644
--- a/packages/rainbowkit/src/locales/index.ts
+++ b/packages/rainbowkit/src/locales/index.ts
@@ -1,4 +1,5 @@
-import { I18n } from 'i18n-js';
+import type * as I18nTypes from 'i18n-js';
+import { I18n } from 'i18n-js/dist/require';
 import ar_AR from './ar_AR.json';
 import en_US from './en_US.json';
 import es_419 from './es_419.json';
@@ -42,33 +43,33 @@ export type Locale =
   | 'zh-CN';
 
 // biome-ignore format: locale keys
-export const i18n = new I18n({
-  'ar': ar_AR,
-  'ar-AR': ar_AR,
-  'en': en_US,
-  'en-US': en_US,
-  'es': es_419,
-  'es-419': es_419,
-  'fr': fr_FR,
-  'fr-FR': fr_FR,
-  'hi': hi_IN,
-  'hi-IN': hi_IN,
-  'id': id_ID,
-  'id-ID': id_ID,
-  'ja': ja_JP,
-  'ja-JP': ja_JP,
-  'ko': ko_KR,
-  'ko-KR': ko_KR,
-  'pt': pt_BR,
-  'pt-BR': pt_BR,
-  'ru': ru_RU,
-  'ru-RU': ru_RU,
-  'th': th_TH,
-  'th-TH': th_TH,
-  'tr': tr_TR,
-  'tr-TR': tr_TR,
-  'zh': zh_CN,
-  'zh-CN': zh_CN,
+export const i18n: I18nTypes.I18n = new I18n({
+  ar: ar_AR,
+  "ar-AR": ar_AR,
+  en: en_US,
+  "en-US": en_US,
+  es: es_419,
+  "es-419": es_419,
+  fr: fr_FR,
+  "fr-FR": fr_FR,
+  hi: hi_IN,
+  "hi-IN": hi_IN,
+  id: id_ID,
+  "id-ID": id_ID,
+  ja: ja_JP,
+  "ja-JP": ja_JP,
+  ko: ko_KR,
+  "ko-KR": ko_KR,
+  pt: pt_BR,
+  "pt-BR": pt_BR,
+  ru: ru_RU,
+  "ru-RU": ru_RU,
+  th: th_TH,
+  "th-TH": th_TH,
+  tr: tr_TR,
+  "tr-TR": tr_TR,
+  zh: zh_CN,
+  "zh-CN": zh_CN,
 });
 
 i18n.defaultLocale = 'en-US';
diff --git a/packages/rainbowkit/src/types/i18n-js.d.ts b/packages/rainbowkit/src/types/i18n-js.d.ts
new file mode 100644
index 0000000000..3e4d64420f
--- /dev/null
+++ b/packages/rainbowkit/src/types/i18n-js.d.ts
@@ -0,0 +1 @@
+declare module 'i18n-js/dist/require';

From b3b2c4cdc7c55066944a2f16abffd59867f6e10a Mon Sep 17 00:00:00 2001
From: Magomed Khamidov <53529533+KosmosKey@users.noreply.github.com>
Date: Fri, 6 Oct 2023 21:42:54 +0100
Subject: [PATCH 2/8] CSR webpack i18n import fix

---
 packages/rainbowkit/src/locales/index.ts   | 3 ++-
 packages/rainbowkit/src/types/i18n-js.d.ts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/rainbowkit/src/locales/index.ts b/packages/rainbowkit/src/locales/index.ts
index 5489302e1f..c78acbb86e 100644
--- a/packages/rainbowkit/src/locales/index.ts
+++ b/packages/rainbowkit/src/locales/index.ts
@@ -1,5 +1,6 @@
 import type * as I18nTypes from 'i18n-js';
-import { I18n } from 'i18n-js/dist/require';
+// @ts-ignore
+import { I18n } from 'i18n-js/dist/require/index.js';
 import ar_AR from './ar_AR.json';
 import en_US from './en_US.json';
 import es_419 from './es_419.json';
diff --git a/packages/rainbowkit/src/types/i18n-js.d.ts b/packages/rainbowkit/src/types/i18n-js.d.ts
index 3e4d64420f..c95e4155ef 100644
--- a/packages/rainbowkit/src/types/i18n-js.d.ts
+++ b/packages/rainbowkit/src/types/i18n-js.d.ts
@@ -1 +1 @@
-declare module 'i18n-js/dist/require';
+declare module "i18n-js/dist/require";

From d69b3eb373dc811d6dd0003aebaac9dcc445a421 Mon Sep 17 00:00:00 2001
From: Magomed Khamidov <53529533+KosmosKey@users.noreply.github.com>
Date: Fri, 6 Oct 2023 21:43:15 +0100
Subject: [PATCH 3/8] format fix

---
 packages/rainbowkit/src/types/i18n-js.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rainbowkit/src/types/i18n-js.d.ts b/packages/rainbowkit/src/types/i18n-js.d.ts
index c95e4155ef..3e4d64420f 100644
--- a/packages/rainbowkit/src/types/i18n-js.d.ts
+++ b/packages/rainbowkit/src/types/i18n-js.d.ts
@@ -1 +1 @@
-declare module "i18n-js/dist/require";
+declare module 'i18n-js/dist/require';

From 582a622f3d528da37c071bfb8580a4bf424515ef Mon Sep 17 00:00:00 2001
From: Magomed Khamidov <53529533+KosmosKey@users.noreply.github.com>
Date: Fri, 6 Oct 2023 21:54:09 +0100
Subject: [PATCH 4/8] fix: use index.js (required by react webpack)

---
 packages/rainbowkit/src/locales/index.ts   | 1 -
 packages/rainbowkit/src/types/i18n-js.d.ts | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/rainbowkit/src/locales/index.ts b/packages/rainbowkit/src/locales/index.ts
index c78acbb86e..fc7d0c1d4f 100644
--- a/packages/rainbowkit/src/locales/index.ts
+++ b/packages/rainbowkit/src/locales/index.ts
@@ -1,5 +1,4 @@
 import type * as I18nTypes from 'i18n-js';
-// @ts-ignore
 import { I18n } from 'i18n-js/dist/require/index.js';
 import ar_AR from './ar_AR.json';
 import en_US from './en_US.json';
diff --git a/packages/rainbowkit/src/types/i18n-js.d.ts b/packages/rainbowkit/src/types/i18n-js.d.ts
index 3e4d64420f..e9060c1db0 100644
--- a/packages/rainbowkit/src/types/i18n-js.d.ts
+++ b/packages/rainbowkit/src/types/i18n-js.d.ts
@@ -1 +1 @@
-declare module 'i18n-js/dist/require';
+declare module 'i18n-js/dist/require/index.js';

From d332c97679897e300d56d31fd323ee88124f63fe Mon Sep 17 00:00:00 2001
From: Magomed Khamidov <53529533+KosmosKey@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:17:28 +0100
Subject: [PATCH 5/8] format:fix

---
 packages/rainbowkit/src/locales/index.ts | 57 ++++++++++++------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/packages/rainbowkit/src/locales/index.ts b/packages/rainbowkit/src/locales/index.ts
index fc7d0c1d4f..85a0948f78 100644
--- a/packages/rainbowkit/src/locales/index.ts
+++ b/packages/rainbowkit/src/locales/index.ts
@@ -1,5 +1,4 @@
-import type * as I18nTypes from 'i18n-js';
-import { I18n } from 'i18n-js/dist/require/index.js';
+import { I18n } from 'i18n-js';
 import ar_AR from './ar_AR.json';
 import en_US from './en_US.json';
 import es_419 from './es_419.json';
@@ -43,33 +42,33 @@ export type Locale =
   | 'zh-CN';
 
 // biome-ignore format: locale keys
-export const i18n: I18nTypes.I18n = new I18n({
-  ar: ar_AR,
-  "ar-AR": ar_AR,
-  en: en_US,
-  "en-US": en_US,
-  es: es_419,
-  "es-419": es_419,
-  fr: fr_FR,
-  "fr-FR": fr_FR,
-  hi: hi_IN,
-  "hi-IN": hi_IN,
-  id: id_ID,
-  "id-ID": id_ID,
-  ja: ja_JP,
-  "ja-JP": ja_JP,
-  ko: ko_KR,
-  "ko-KR": ko_KR,
-  pt: pt_BR,
-  "pt-BR": pt_BR,
-  ru: ru_RU,
-  "ru-RU": ru_RU,
-  th: th_TH,
-  "th-TH": th_TH,
-  tr: tr_TR,
-  "tr-TR": tr_TR,
-  zh: zh_CN,
-  "zh-CN": zh_CN,
+export const i18n = new I18n({
+  'ar': ar_AR,
+  'ar-AR': ar_AR,
+  'en': en_US,
+  'en-US': en_US,
+  'es': es_419,
+  'es-419': es_419,
+  'fr': fr_FR,
+  'fr-FR': fr_FR,
+  'hi': hi_IN,
+  'hi-IN': hi_IN,
+  'id': id_ID,
+  'id-ID': id_ID,
+  'ja': ja_JP,
+  'ja-JP': ja_JP,
+  'ko': ko_KR,
+  'ko-KR': ko_KR,
+  'pt': pt_BR,
+  'pt-BR': pt_BR,
+  'ru': ru_RU,
+  'ru-RU': ru_RU,
+  'th': th_TH,
+  'th-TH': th_TH,
+  'tr': tr_TR,
+  'tr-TR': tr_TR,
+  'zh': zh_CN,
+  'zh-CN': zh_CN,
 });
 
 i18n.defaultLocale = 'en-US';

From b7148bb73b2a7d74b00b68fa129e98c286f22766 Mon Sep 17 00:00:00 2001
From: Magomed Khamidov <53529533+KosmosKey@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:19:02 +0100
Subject: [PATCH 6/8] biome format:fix again

---
 packages/rainbowkit/src/locales/index.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/rainbowkit/src/locales/index.ts b/packages/rainbowkit/src/locales/index.ts
index 85a0948f78..f0295811c3 100644
--- a/packages/rainbowkit/src/locales/index.ts
+++ b/packages/rainbowkit/src/locales/index.ts
@@ -1,4 +1,6 @@
-import { I18n } from 'i18n-js';
+import type * as I18nTypes from 'i18n-js';
+// `index.js` required for CRA webpack builds
+import { I18n } from 'i18n-js/dist/require/index.js';
 import ar_AR from './ar_AR.json';
 import en_US from './en_US.json';
 import es_419 from './es_419.json';
@@ -42,7 +44,7 @@ export type Locale =
   | 'zh-CN';
 
 // biome-ignore format: locale keys
-export const i18n = new I18n({
+export const i18n: I18nTypes.I18n = new I18n({
   'ar': ar_AR,
   'ar-AR': ar_AR,
   'en': en_US,

From 6de4aa3e1d60dc5eb6d08c3ba8522e24f3ae44c3 Mon Sep 17 00:00:00 2001
From: Daniel Sinclair <d@niel.nyc>
Date: Fri, 6 Oct 2023 18:15:10 -0400
Subject: [PATCH 7/8] chore: refactor

---
 .../src/components/RainbowKitProvider/I18nContext.tsx         | 4 ++--
 packages/rainbowkit/src/global.d.ts                           | 2 ++
 packages/rainbowkit/src/locales/index.ts                      | 2 +-
 packages/rainbowkit/src/types/i18n-js.d.ts                    | 1 -
 4 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 packages/rainbowkit/src/types/i18n-js.d.ts

diff --git a/packages/rainbowkit/src/components/RainbowKitProvider/I18nContext.tsx b/packages/rainbowkit/src/components/RainbowKitProvider/I18nContext.tsx
index 3531234adb..e37c09ecc0 100644
--- a/packages/rainbowkit/src/components/RainbowKitProvider/I18nContext.tsx
+++ b/packages/rainbowkit/src/components/RainbowKitProvider/I18nContext.tsx
@@ -1,9 +1,9 @@
-import { I18n as _I18N } from 'i18n-js';
 import React, { ReactNode, createContext, useMemo } from 'react';
+
 import { Locale, i18n as _i18n } from '../../locales';
 import { detectedBrowserLocale } from '../../utils/locale';
 
-export const I18nContext = createContext<_I18N>(_i18n);
+export const I18nContext = createContext<typeof _i18n>(_i18n);
 
 interface I18nProviderProps {
   children: ReactNode;
diff --git a/packages/rainbowkit/src/global.d.ts b/packages/rainbowkit/src/global.d.ts
index 85a65c48e5..01f696eb10 100644
--- a/packages/rainbowkit/src/global.d.ts
+++ b/packages/rainbowkit/src/global.d.ts
@@ -7,3 +7,5 @@ declare module '*.png' {
   const dataUrl: string;
   export default dataUrl;
 }
+
+declare module 'i18n-js/dist/require/index.js';
diff --git a/packages/rainbowkit/src/locales/index.ts b/packages/rainbowkit/src/locales/index.ts
index f0295811c3..1a20593c9d 100644
--- a/packages/rainbowkit/src/locales/index.ts
+++ b/packages/rainbowkit/src/locales/index.ts
@@ -1,6 +1,6 @@
 import type * as I18nTypes from 'i18n-js';
-// `index.js` required for CRA webpack builds
 import { I18n } from 'i18n-js/dist/require/index.js';
+
 import ar_AR from './ar_AR.json';
 import en_US from './en_US.json';
 import es_419 from './es_419.json';
diff --git a/packages/rainbowkit/src/types/i18n-js.d.ts b/packages/rainbowkit/src/types/i18n-js.d.ts
deleted file mode 100644
index e9060c1db0..0000000000
--- a/packages/rainbowkit/src/types/i18n-js.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'i18n-js/dist/require/index.js';

From 456e29620ba03870959c82214d4431fdb5b92362 Mon Sep 17 00:00:00 2001
From: Daniel Sinclair <d@niel.nyc>
Date: Fri, 6 Oct 2023 18:23:27 -0400
Subject: [PATCH 8/8] chore: changeset

---
 .changeset/smooth-students-knock.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/smooth-students-knock.md

diff --git a/.changeset/smooth-students-knock.md b/.changeset/smooth-students-knock.md
new file mode 100644
index 0000000000..65f9d01a60
--- /dev/null
+++ b/.changeset/smooth-students-knock.md
@@ -0,0 +1,5 @@
+---
+"@rainbow-me/rainbowkit": patch
+---
+
+Fixed a dependency resolution issue for `ESModule` projects related to `i18n-js`