From 50f8a107a71f9b5dba9f6ded4c05bb6783229f94 Mon Sep 17 00:00:00 2001 From: himeshr Date: Tue, 23 Jul 2024 15:53:02 +0530 Subject: [PATCH] #1469 | Upgrade "react-native-video" to "5.2.1" --- makefiles/patches.mk | 1 - packages/openchs-android/package-lock.json | 28 ++++++++++--------- packages/openchs-android/package.json | 2 +- .../patches/react-native-video+5.2.0.patch | 27 ------------------ 4 files changed, 16 insertions(+), 42 deletions(-) delete mode 100644 packages/openchs-android/patches/react-native-video+5.2.0.patch diff --git a/makefiles/patches.mk b/makefiles/patches.mk index c4b026bb3..4cdc1ffc4 100644 --- a/makefiles/patches.mk +++ b/makefiles/patches.mk @@ -8,7 +8,6 @@ patch-history: cd packages/openchs-android && npx patch-package realm --include "build.gradle" cd packages/openchs-android && npx patch-package react-native-background-worker cd packages/openchs-android && npx patch-package react-native-smooth-pincode-input --include "index.js" - cd packages/openchs-android && npx patch-package react-native-video --include "Video.js" cd packages/openchs-android && npx patch-package react-native-video-player --include "index.js" cd packages/openchs-android && npx patch-package react-native-deprecated-custom-components --include "(Navigator.js)|(NavigatorBreadcrumbNavigationBar.js)|(NavigatorNavigationBar.js)" cd packages/openchs-android && npx patch-package react-native-background-job --include "build.gradle" diff --git a/packages/openchs-android/package-lock.json b/packages/openchs-android/package-lock.json index 2dfef8558..b09561a50 100644 --- a/packages/openchs-android/package-lock.json +++ b/packages/openchs-android/package-lock.json @@ -67,7 +67,7 @@ "react-native-smooth-pincode-input": "1.0.9", "react-native-svg": "12.4.3", "react-native-vector-icons": "9.2.0", - "react-native-video": "5.2.0", + "react-native-video": "5.2.1", "react-native-video-player": "0.12.0", "react-native-webview": "11.23.0", "react-native-zip-archive": "6.0.8", @@ -8379,9 +8379,9 @@ "dev": true }, "node_modules/eme-encryption-scheme-polyfill": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.1.1.tgz", - "integrity": "sha512-njD17wcUrbqCj0ArpLu5zWXtaiupHb/2fIUQGdInf83GlI+Q6mmqaPGLdrke4savKAu15J/z1Tg/ivDgl14g0g==" + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.1.5.tgz", + "integrity": "sha512-z9BKXV4TCYjmar0wiZLObZ0J8HE13VIg7Zq/iyPWdbEfROtxVXEJalknWKtBR5XNezzy15/zWS964TGbcAWlPg==" }, "node_modules/emittery": { "version": "0.10.2", @@ -18011,10 +18011,11 @@ } }, "node_modules/react-native-video": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/react-native-video/-/react-native-video-5.2.0.tgz", - "integrity": "sha512-5SK1lxyzrCkZF+WuxUxLR1Pt65E0rsWB1w1GrGxSLdC9zWYBumcmuHl+wPJ7UQvznjaH2Ze7uU1R3arejI7+WQ==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/react-native-video/-/react-native-video-5.2.1.tgz", + "integrity": "sha512-aJlr9MeTuQ0LpZ4n+EC9RvhoKeiPbLtI2Rxy8u7zo/wzGevbRpWHSBj9xZ5YDBXnAVXzuqyNIkGhdw7bfdIBZw==", "dependencies": { + "deprecated-react-native-prop-types": "^2.2.0", "keymirror": "^0.1.1", "prop-types": "^15.7.2", "shaka-player": "^2.5.9" @@ -29024,9 +29025,9 @@ } }, "eme-encryption-scheme-polyfill": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.1.1.tgz", - "integrity": "sha512-njD17wcUrbqCj0ArpLu5zWXtaiupHb/2fIUQGdInf83GlI+Q6mmqaPGLdrke4savKAu15J/z1Tg/ivDgl14g0g==" + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.1.5.tgz", + "integrity": "sha512-z9BKXV4TCYjmar0wiZLObZ0J8HE13VIg7Zq/iyPWdbEfROtxVXEJalknWKtBR5XNezzy15/zWS964TGbcAWlPg==" }, "emittery": { "version": "0.10.2", @@ -36562,10 +36563,11 @@ } }, "react-native-video": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/react-native-video/-/react-native-video-5.2.0.tgz", - "integrity": "sha512-5SK1lxyzrCkZF+WuxUxLR1Pt65E0rsWB1w1GrGxSLdC9zWYBumcmuHl+wPJ7UQvznjaH2Ze7uU1R3arejI7+WQ==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/react-native-video/-/react-native-video-5.2.1.tgz", + "integrity": "sha512-aJlr9MeTuQ0LpZ4n+EC9RvhoKeiPbLtI2Rxy8u7zo/wzGevbRpWHSBj9xZ5YDBXnAVXzuqyNIkGhdw7bfdIBZw==", "requires": { + "deprecated-react-native-prop-types": "^2.2.0", "keymirror": "^0.1.1", "prop-types": "^15.7.2", "shaka-player": "^2.5.9" diff --git a/packages/openchs-android/package.json b/packages/openchs-android/package.json index c7f12d491..9afbf0bf0 100644 --- a/packages/openchs-android/package.json +++ b/packages/openchs-android/package.json @@ -89,7 +89,7 @@ "react-native-smooth-pincode-input": "1.0.9", "react-native-svg": "12.4.3", "react-native-vector-icons": "9.2.0", - "react-native-video": "5.2.0", + "react-native-video": "5.2.1", "react-native-video-player": "0.12.0", "react-native-webview": "11.23.0", "react-native-zip-archive": "6.0.8", diff --git a/packages/openchs-android/patches/react-native-video+5.2.0.patch b/packages/openchs-android/patches/react-native-video+5.2.0.patch deleted file mode 100644 index 09654c75b..000000000 --- a/packages/openchs-android/patches/react-native-video+5.2.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/node_modules/react-native-video/Video.js b/node_modules/react-native-video/Video.js -index b492d48..2a09fdb 100644 ---- a/node_modules/react-native-video/Video.js -+++ b/node_modules/react-native-video/Video.js -@@ -1,11 +1,12 @@ - import React, { Component } from 'react'; - import PropTypes from 'prop-types'; --import { StyleSheet, requireNativeComponent, NativeModules, View, ViewPropTypes, Image, Platform, findNodeHandle } from 'react-native'; -+import { StyleSheet, requireNativeComponent, NativeModules, View, Image, Platform, findNodeHandle } from 'react-native'; - import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource'; - import TextTrackType from './TextTrackType'; - import FilterType from './FilterType'; - import DRMType from './DRMType'; - import VideoResizeMode from './VideoResizeMode.js'; -+const {ImagePropTypes, ViewPropTypes} = require('deprecated-react-native-prop-types'); - - const styles = StyleSheet.create({ - base: { -@@ -415,7 +416,7 @@ Video.propTypes = { - maxBitRate: PropTypes.number, - resizeMode: PropTypes.string, - poster: PropTypes.string, -- posterResizeMode: Image.propTypes.resizeMode, -+ posterResizeMode: ImagePropTypes.resizeMode, - repeat: PropTypes.bool, - automaticallyWaitsToMinimizeStalling: PropTypes.bool, - allowsExternalPlayback: PropTypes.bool,