Merge pull request #422 from thornbill/expo-46

jellyfin · Mar 18, 2023 · f666436 · f666436
2 parents 0d3456d + 155795b
commit f666436
Show file tree

Hide file tree

Showing 7 changed files with 4,142 additions and 5,992 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -6,6 +6,7 @@
 module.exports = function(api) {
 	api.cache(true);
 	return {
-		presets: [ 'babel-preset-expo' ]
+		presets: [ 'babel-preset-expo' ],
+		plugins: [ 'react-native-reanimated/plugin' ]
 	};
 };
diff --git a/components/__tests__/__snapshots__/NativeShellWebView.test.js.snap b/components/__tests__/__snapshots__/NativeShellWebView.test.js.snap
@@ -3,6 +3,8 @@
 exports[`NativeShellWebView should render correctly 1`] = `
 <RCTScrollView
   collapsable={false}
+  handlerTag={1}
+  handlerType="NativeViewGestureHandler"
   onGestureHandlerEvent={[Function]}
   onGestureHandlerStateChange={[Function]}
   onLayout={[Function]}

diff --git a/components/__tests__/__snapshots__/RefreshWebView.test.js.snap b/components/__tests__/__snapshots__/RefreshWebView.test.js.snap
@@ -3,6 +3,8 @@
 exports[`RefreshWebView should render 1`] = `
 <RCTScrollView
   collapsable={false}
+  handlerTag={1}
+  handlerType="NativeViewGestureHandler"
   onGestureHandlerEvent={[Function]}
   onGestureHandlerStateChange={[Function]}
   onLayout={[Function]}
@@ -39,7 +41,7 @@ exports[`RefreshWebView should render 1`] = `
         injectedJavaScriptBeforeContentLoadedForMainFrameOnly={true}
         injectedJavaScriptForMainFrameOnly={true}
         javaScriptEnabled={true}
-        messagingEnabled={false}
+        messagingEnabled={true}
         onContentProcessDidTerminate={[Function]}
         onHttpError={[Function]}
         onLoadingError={[Function]}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,51 +42,51 @@
     "@react-navigation/native-stack": "^6.5.0",
     "@react-navigation/stack": "^6.0.9",
     "compare-versions": "^3.6.0",
-    "expo": "^45.0.0",
-    "expo-asset": "~8.5.0",
-    "expo-av": "~11.2.3",
-    "expo-constants": "~13.1.1",
-    "expo-device": "~4.2.0",
-    "expo-file-system": "~14.0.0",
-    "expo-font": "~10.1.0",
-    "expo-keep-awake": "~10.1.1",
-    "expo-localization": "~13.0.0",
-    "expo-screen-orientation": "~4.2.0",
-    "expo-splash-screen": "~0.15.1",
-    "expo-status-bar": "~1.3.0",
-    "expo-web-browser": "~10.2.1",
+    "expo": "^46.0.0",
+    "expo-asset": "~8.6.3",
+    "expo-av": "~12.0.4",
+    "expo-constants": "~13.2.4",
+    "expo-device": "~4.3.0",
+    "expo-file-system": "~14.1.0",
+    "expo-font": "~10.2.0",
+    "expo-keep-awake": "~10.2.0",
+    "expo-localization": "~13.1.0",
+    "expo-screen-orientation": "~4.3.0",
+    "expo-splash-screen": "~0.16.2",
+    "expo-status-bar": "~1.4.0",
+    "expo-web-browser": "~11.0.0",
     "i18next": "^21.2.4",
     "mobx": "^5.15.4",
     "mobx-react-lite": "^2.2.2",
     "mobx-sync-lite": "^3.1.0",
     "mobx-task": "^2.0.1",
     "normalize-url": "^7.0.2",
     "prop-types": "^15.7.2",
-    "react": "17.0.2",
+    "react": "18.0.0",
     "react-i18next": "^11.7.0",
     "react-lifecycles-compat": "^3.0.4",
-    "react-native": "0.68.2",
+    "react-native": "0.69.6",
     "react-native-elements": "^3.4.2",
-    "react-native-gesture-handler": "~2.2.1",
+    "react-native-gesture-handler": "~2.5.0",
     "react-native-get-random-values": "~1.8.0",
-    "react-native-reanimated": "~2.8.0",
-    "react-native-safe-area-context": "4.2.4",
-    "react-native-screens": "~3.11.1",
+    "react-native-reanimated": "~2.9.1",
+    "react-native-safe-area-context": "4.3.1",
+    "react-native-screens": "~3.15.0",
     "react-native-url-polyfill": "^1.3.0",
-    "react-native-webview": "11.18.1",
+    "react-native-webview": "11.23.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.9",
+    "@babel/core": "^7.18.6",
     "@babel/eslint-parser": "^7.12.1",
     "@testing-library/jest-native": "^4.0.0",
     "@testing-library/react-native": "^7.2.0",
     "@types/jest": "^27.0.2",
-    "@types/react": "~17.0.21",
+    "@types/react": "~18.0.0",
     "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^5.16.0",
     "@typescript-eslint/parser": "^4.33.0",
-    "babel-preset-expo": "~9.1.0",
+    "babel-preset-expo": "~9.2.0",
     "domexception": "^4.0.0",
     "eslint": "^7.4.0",
     "eslint-plugin-compat": "^3.9.0",
@@ -96,12 +96,12 @@
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-react": "^7.14.3",
     "eslint-plugin-react-native": "^3.10.0",
-    "expo-cli": "^6.0.6",
+    "expo-cli": "^6.3.2",
     "jest": "^26.6.3",
-    "jest-expo": "^45.0.0",
+    "jest-expo": "^46.0.0",
     "jest-fetch-mock": "^3.0.3",
     "node-abort-controller": "^3.0.1",
-    "typescript": "~4.3.5"
+    "typescript": "^4.6.3"
   },
   "private": true,
   "engines": {

diff --git a/screens/__tests__/__snapshots__/ErrorScreen.test.js.snap b/screens/__tests__/__snapshots__/ErrorScreen.test.js.snap
@@ -31,6 +31,8 @@ exports[`ErrorScreen should render correctly 1`] = `
         "flex": 1,
       }
     }
+    handlerTag={1}
+    handlerType="NativeViewGestureHandler"
     onGestureHandlerEvent={[Function]}
     onGestureHandlerStateChange={[Function]}
     refreshControl={

diff --git a/utils/__tests__/Device.test.js b/utils/__tests__/Device.test.js
@@ -28,7 +28,7 @@ describe('Device', () => {
 
 	describe('getSafeDeviceName()', () => {
 		it('should return safe device names unchanged', () => {
-			expect(getSafeDeviceName()).toBe('Test Phone');
+			expect(getSafeDeviceName()).toBe(Constants.deviceName);
 		});
 
 		it('should change the iOS default apostrophe to an ascii single quote', () => {