Skip to content

Commit

Permalink
Merge pull request #600 from department-of-veterans-affairs/cu/597-na…
Browse files Browse the repository at this point in the history
…rin-update-expo-sdk-52

[CU] Update Expo to SDK 52
  • Loading branch information
narin authored Dec 5, 2024
2 parents 8554132 + 18866ab commit 287ed77
Show file tree
Hide file tree
Showing 4 changed files with 1,664 additions and 1,493 deletions.
1 change: 1 addition & 0 deletions packages/components/app.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"expo": {
"newArchEnabled": true,
"scheme": "mobile-components",
"web": {
"bundler": "metro"
Expand Down
45 changes: 22 additions & 23 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@department-of-veterans-affairs/mobile-component-library",
"version": "0.28.0",
"version": "0.28.1-alpha.1",
"description": "VA Design System Mobile Component Library",
"main": "src/index.tsx",
"scripts": {
Expand Down Expand Up @@ -39,10 +39,9 @@
},
"homepage": "https://department-of-veterans-affairs.github.io/va-mobile-library",
"dependencies": {
"@os-team/i18next-react-native-language-detector": "^1.0.34",
"i18next": "^23.12.2",
"react-i18next": "^15.0.0",
"react-native-svg": "15.2.0",
"react-native-svg": "15.8.0",
"react-native-toast-notifications": "^3.4.0",
"styled-components": "^6.1.12"
},
Expand All @@ -55,17 +54,17 @@
"react-native-safe-area-context": "^4.10.5"
},
"devDependencies": {
"@babel/core": "^7.24.9",
"@babel/core": "^7.25.2",
"@babel/plugin-transform-react-jsx": "^7.24.7",
"@babel/preset-env": "^7.24.8",
"@babel/preset-typescript": "^7.24.7",
"@department-of-veterans-affairs/mobile-assets": "0.14.0",
"@department-of-veterans-affairs/mobile-tokens": "0.20.0",
"@expo/metro-runtime": "~3.2.1",
"@expo/metro-runtime": "~4.0.0",
"@expo/webpack-config": "~19.0.1",
"@react-native-async-storage/async-storage": "1.23.1",
"@react-native-community/datetimepicker": "8.0.1",
"@react-native-community/slider": "4.5.2",
"@react-native-community/datetimepicker": "8.2.0",
"@react-native-community/slider": "4.5.5",
"@storybook/addon-actions": "7.6.20",
"@storybook/addon-controls": "7.6.20",
"@storybook/addon-designs": "^7.0.9",
Expand All @@ -82,34 +81,34 @@
"@svgr/webpack": "^8.1.0",
"@testing-library/react-native": "^12.5.1",
"@types/jest": "^29.5.12",
"@types/react": "~18.2.79",
"@types/react": "~18.3.12",
"@types/react-test-renderer": "^18.3.0",
"@types/styled-components-react-native": "^5.2.5",
"babel-jest": "^29.7.0",
"babel-loader": "^9.1.3",
"babel-plugin-react-docgen-typescript": "^1.5.1",
"babel-plugin-react-native-web": "^0.19.12",
"copy-webpack-plugin": "^12.0.2",
"expo": "^51.0.22",
"expo-constants": "~16.0.2",
"expo-font": "~12.0.9",
"expo-linking": "~6.3.1",
"expo-splash-screen": "~0.27.5",
"expo-status-bar": "~1.12.1",
"expo": "~52.0.14",
"expo-constants": "~17.0.3",
"expo-font": "~13.0.1",
"expo-linking": "~7.0.3",
"expo-splash-screen": "~0.29.13",
"expo-status-bar": "~2.0.0",
"gh-pages": "^6.1.1",
"jest": "^29.7.0",
"jest-expo": "~51.0.3",
"jest-expo": "~52.0.2",
"jest-styled-components": "^7.2.0",
"metro-react-native-babel-preset": "^0.77.0",
"react": "^18.2.0",
"react-dom": "18.2.0",
"react-native": "0.74.3",
"react-native-gesture-handler": "~2.16.1",
"react-native-reanimated": "3.10.1",
"react-native-safe-area-context": "4.10.5",
"react-native-screens": "3.31.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-native": "0.76.3",
"react-native-gesture-handler": "~2.20.2",
"react-native-reanimated": "~3.16.1",
"react-native-safe-area-context": "4.12.0",
"react-native-screens": "~4.1.0",
"react-native-svg-transformer": "^1.5.0",
"react-native-web": "~0.19.12",
"react-native-web": "~0.19.13",
"react-test-renderer": "^18.3.1",
"storybook": "7.6.20",
"storybook-dark-mode": "^3.0.3",
Expand Down
8 changes: 1 addition & 7 deletions packages/components/src/utils/translation/i18n.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { initReactI18next } from 'react-i18next'
import RNLanguageDetector from '@os-team/i18next-react-native-language-detector'
import i18n from 'i18next'

import * as enTranslation from './en.json'
Expand All @@ -8,12 +7,7 @@ export const resources = {
en: { translation: enTranslation },
}

// Initialize the internationalization library

// Use RNLanguageDetector only if mobile
if (process.env.STORYBOOK_WEB !== 'true') {
i18n.use(RNLanguageDetector)
}
// TODO: Detect language on mobile (ticket #599)

// If i18n is already initialized (in app), add our translations to the common namespace
if (i18n.isInitializing || i18n.isInitialized) {
Expand Down
Loading

0 comments on commit 287ed77

Please sign in to comment.