From c5d7464e616992afd854cbcfe80417f794bb6f20 Mon Sep 17 00:00:00 2001 From: gbuomprisco Date: Fri, 8 Nov 2024 14:34:28 +0800 Subject: [PATCH] 1. Hoist i18n dependencies 2. Updated react-i18next 3. Updated Prettier plugins to use import.meta.resolve, so we don't have issues with hoisting --- .npmrc | 4 +- apps/web/package.json | 2 +- package.json | 4 +- packages/billing/gateway/package.json | 2 +- packages/features/accounts/package.json | 2 +- packages/features/auth/package.json | 2 +- packages/features/notifications/package.json | 2 +- packages/features/team-accounts/package.json | 2 +- packages/i18n/package.json | 2 +- packages/ui/package.json | 2 +- pnpm-lock.yaml | 52 ++++++++------------ tooling/prettier/index.mjs | 4 +- 12 files changed, 35 insertions(+), 45 deletions(-) diff --git a/.npmrc b/.npmrc index f652df954..8d7762846 100644 --- a/.npmrc +++ b/.npmrc @@ -2,4 +2,6 @@ peer-legacy-deps=true dedupe-peer-dependents=true use-lockfile-v6=true resolution-mode=highest -package-manager-strict=false \ No newline at end of file +package-manager-strict=false +public-hoist-pattern[]=*i18next* +public-hoist-pattern[]=*eslint* \ No newline at end of file diff --git a/apps/web/package.json b/apps/web/package.json index 3daaf7fc2..fc34dbeea 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -66,7 +66,7 @@ "react": "19.0.0-rc-45804af1-20241021", "react-dom": "19.0.0-rc-45804af1-20241021", "react-hook-form": "^7.53.1", - "react-i18next": "^15.1.0", + "react-i18next": "^15.1.1", "recharts": "2.13.3", "sonner": "^1.7.0", "tailwind-merge": "^2.5.4", diff --git a/package.json b/package.json index ef0cd834e..d5d385d34 100644 --- a/package.json +++ b/package.json @@ -49,9 +49,7 @@ "react": "19.0.0-rc-45804af1-20241021", "react-dom": "19.0.0-rc-45804af1-20241021", "@types/react": "npm:types-react@19.0.0-rc.1", - "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1", - "i18next": "23.16.4", - "react-i18next": "15.1.0" + "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1" } } } diff --git a/packages/billing/gateway/package.json b/packages/billing/gateway/package.json index 7d9f5d3c5..dec5381d6 100644 --- a/packages/billing/gateway/package.json +++ b/packages/billing/gateway/package.json @@ -34,7 +34,7 @@ "next": "15.0.3", "react": "19.0.0-rc-45804af1-20241021", "react-hook-form": "^7.53.1", - "react-i18next": "^15.1.0", + "react-i18next": "^15.1.1", "zod": "^3.23.8" }, "eslintConfig": { diff --git a/packages/features/accounts/package.json b/packages/features/accounts/package.json index c6de957e7..fe2836afc 100644 --- a/packages/features/accounts/package.json +++ b/packages/features/accounts/package.json @@ -44,7 +44,7 @@ "react": "19.0.0-rc-45804af1-20241021", "react-dom": "19.0.0-rc-45804af1-20241021", "react-hook-form": "^7.53.1", - "react-i18next": "^15.1.0", + "react-i18next": "^15.1.1", "sonner": "^1.7.0", "zod": "^3.23.8" }, diff --git a/packages/features/auth/package.json b/packages/features/auth/package.json index 946f43e91..0b62ca84a 100644 --- a/packages/features/auth/package.json +++ b/packages/features/auth/package.json @@ -34,7 +34,7 @@ "lucide-react": "^0.454.0", "next": "15.0.3", "react-hook-form": "^7.53.1", - "react-i18next": "^15.1.0", + "react-i18next": "^15.1.1", "sonner": "^1.7.0", "zod": "^3.23.8" }, diff --git a/packages/features/notifications/package.json b/packages/features/notifications/package.json index d205f1690..edc2835e3 100644 --- a/packages/features/notifications/package.json +++ b/packages/features/notifications/package.json @@ -26,7 +26,7 @@ "lucide-react": "^0.454.0", "react": "19.0.0-rc-45804af1-20241021", "react-dom": "19.0.0-rc-45804af1-20241021", - "react-i18next": "^15.1.0" + "react-i18next": "^15.1.1" }, "prettier": "@kit/prettier-config", "eslintConfig": { diff --git a/packages/features/team-accounts/package.json b/packages/features/team-accounts/package.json index e359f1bb1..5dfa1543a 100644 --- a/packages/features/team-accounts/package.json +++ b/packages/features/team-accounts/package.json @@ -44,7 +44,7 @@ "react": "19.0.0-rc-45804af1-20241021", "react-dom": "19.0.0-rc-45804af1-20241021", "react-hook-form": "^7.53.1", - "react-i18next": "^15.1.0", + "react-i18next": "^15.1.1", "sonner": "^1.7.0", "zod": "^3.23.8" }, diff --git a/packages/i18n/package.json b/packages/i18n/package.json index e9027b08c..0b1e6c0de 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -25,7 +25,7 @@ "next": "15.0.3", "react": "19.0.0-rc-45804af1-20241021", "react-dom": "19.0.0-rc-45804af1-20241021", - "react-i18next": "^15.1.0" + "react-i18next": "^15.1.1" }, "dependencies": { "i18next": "23.16.4", diff --git a/packages/ui/package.json b/packages/ui/package.json index a188224ac..fe2c13f4a 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -55,7 +55,7 @@ "prettier": "^3.3.3", "react-day-picker": "^8.10.1", "react-hook-form": "^7.53.1", - "react-i18next": "^15.1.0", + "react-i18next": "^15.1.1", "sonner": "^1.7.0", "tailwindcss": "3.4.14", "tailwindcss-animate": "^1.0.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e632bea96..f8b816d47 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,8 +10,6 @@ overrides: react-dom: 19.0.0-rc-45804af1-20241021 '@types/react': npm:types-react@19.0.0-rc.1 '@types/react-dom': npm:types-react-dom@19.0.0-rc.1 - i18next: 23.16.4 - react-i18next: 15.1.0 importers: @@ -156,8 +154,8 @@ importers: specifier: ^7.53.1 version: 7.53.1(react@19.0.0-rc-45804af1-20241021) react-i18next: - specifier: 15.1.0 - version: 15.1.0(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) + specifier: ^15.1.1 + version: 15.1.1(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) recharts: specifier: 2.13.3 version: 2.13.3(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) @@ -331,8 +329,8 @@ importers: specifier: ^7.53.1 version: 7.53.1(react@19.0.0-rc-45804af1-20241021) react-i18next: - specifier: 15.1.0 - version: 15.1.0(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) + specifier: ^15.1.1 + version: 15.1.1(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) zod: specifier: ^3.23.8 version: 3.23.8 @@ -675,8 +673,8 @@ importers: specifier: ^7.53.1 version: 7.53.1(react@19.0.0-rc-45804af1-20241021) react-i18next: - specifier: 15.1.0 - version: 15.1.0(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) + specifier: ^15.1.1 + version: 15.1.1(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) sonner: specifier: ^1.7.0 version: 1.7.0(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) @@ -801,8 +799,8 @@ importers: specifier: ^7.53.1 version: 7.53.1(react@19.0.0-rc-45804af1-20241021) react-i18next: - specifier: 15.1.0 - version: 15.1.0(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) + specifier: ^15.1.1 + version: 15.1.1(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) sonner: specifier: ^1.7.0 version: 1.7.0(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) @@ -849,8 +847,8 @@ importers: specifier: 19.0.0-rc-45804af1-20241021 version: 19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021) react-i18next: - specifier: 15.1.0 - version: 15.1.0(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) + specifier: ^15.1.1 + version: 15.1.1(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) packages/features/team-accounts: dependencies: @@ -937,8 +935,8 @@ importers: specifier: ^7.53.1 version: 7.53.1(react@19.0.0-rc-45804af1-20241021) react-i18next: - specifier: 15.1.0 - version: 15.1.0(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) + specifier: ^15.1.1 + version: 15.1.1(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) sonner: specifier: ^1.7.0 version: 1.7.0(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) @@ -986,8 +984,8 @@ importers: specifier: 19.0.0-rc-45804af1-20241021 version: 19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021) react-i18next: - specifier: 15.1.0 - version: 15.1.0(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) + specifier: ^15.1.1 + version: 15.1.1(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) packages/mailers/core: devDependencies: @@ -1429,8 +1427,8 @@ importers: specifier: ^7.53.1 version: 7.53.1(react@19.0.0-rc-45804af1-20241021) react-i18next: - specifier: 15.1.0 - version: 15.1.0(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) + specifier: ^15.1.1 + version: 15.1.1(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) sonner: specifier: ^1.7.0 version: 1.7.0(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021) @@ -3994,9 +3992,6 @@ packages: '@types/eslint@8.56.12': resolution: {integrity: sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==} - '@types/eslint@9.6.1': - resolution: {integrity: sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==} - '@types/estree-jsx@1.0.5': resolution: {integrity: sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==} @@ -6667,10 +6662,10 @@ packages: peerDependencies: react: 19.0.0-rc-45804af1-20241021 - react-i18next@15.1.0: - resolution: {integrity: sha512-zj3nJynMnZsy2gPZiOTC7XctCY5eQGqT3tcKMmfJWC9FMvgd+960w/adq61j8iPzpwmsXejqID9qC3Mqu1Xu2Q==} + react-i18next@15.1.1: + resolution: {integrity: sha512-R/Vg9wIli2P3FfeI8o1eNJUJue5LWpFsQePCHdQDmX0Co3zkr6kdT8gAseb/yGeWbNz1Txc4bKDQuZYsC0kQfw==} peerDependencies: - i18next: 23.16.4 + i18next: '>= 23.2.3' react: 19.0.0-rc-45804af1-20241021 react-dom: '*' react-native: '*' @@ -10992,7 +10987,7 @@ snapshots: '@types/eslint-scope@3.7.7': dependencies: - '@types/eslint': 9.6.1 + '@types/eslint': 8.56.12 '@types/estree': 1.0.6 '@types/eslint@8.56.12': @@ -11000,11 +10995,6 @@ snapshots: '@types/estree': 1.0.6 '@types/json-schema': 7.0.15 - '@types/eslint@9.6.1': - dependencies: - '@types/estree': 1.0.6 - '@types/json-schema': 7.0.15 - '@types/estree-jsx@1.0.5': dependencies: '@types/estree': 1.0.6 @@ -14134,7 +14124,7 @@ snapshots: dependencies: react: 19.0.0-rc-45804af1-20241021 - react-i18next@15.1.0(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021): + react-i18next@15.1.1(i18next@23.16.4)(react-dom@19.0.0-rc-45804af1-20241021(react@19.0.0-rc-45804af1-20241021))(react@19.0.0-rc-45804af1-20241021): dependencies: '@babel/runtime': 7.26.0 html-parse-stringify: 3.0.1 diff --git a/tooling/prettier/index.mjs b/tooling/prettier/index.mjs index 84e88de2a..e4652d0f4 100644 --- a/tooling/prettier/index.mjs +++ b/tooling/prettier/index.mjs @@ -27,8 +27,8 @@ const config = { importOrderSeparation: true, importOrderSortSpecifiers: true, plugins: [ - '@trivago/prettier-plugin-sort-imports', - 'prettier-plugin-tailwindcss', + import.meta.resolve('@trivago/prettier-plugin-sort-imports'), + import.meta.resolve('prettier-plugin-tailwindcss'), ], };