From c85fd0ba994bfa5dc3479514808b217483ac580c Mon Sep 17 00:00:00 2001 From: Gleidson Daniel Silva Date: Tue, 31 May 2022 13:08:18 -0300 Subject: [PATCH] Chore: Update react-native-fast-image from 8.2.0 to 8.5.11 (#4210) * upgrade react-native-fast-image * change import to react-native-fast-image * bump version * update path from lib * fix import --- app/containers/Avatar/Avatar.tsx | 2 +- app/containers/EmojiPicker/CustomEmoji.tsx | 2 +- app/containers/EmojiPicker/index.tsx | 2 +- .../MessageBox/CommandsPreview/Item.tsx | 2 +- app/containers/ServerItem/index.tsx | 2 +- app/containers/UIKit/Image.tsx | 2 +- app/containers/UIKit/MultiSelect/Chips.tsx | 2 +- app/containers/UIKit/MultiSelect/Items.tsx | 2 +- app/containers/markdown/new/Image.tsx | 2 +- app/containers/message/Image.tsx | 2 +- app/containers/message/Reply.tsx | 2 +- app/containers/message/Urls.tsx | 2 +- app/containers/message/interfaces.ts | 2 +- app/definitions/IEmoji.ts | 2 +- .../ImageViewer/ImageComponent.ts | 4 +- app/views/SettingsView/index.tsx | 2 +- app/views/WorkspaceView/ServerAvatar.tsx | 2 +- ios/Podfile.lock | 72 +++++++++---------- package.json | 2 +- yarn.lock | 9 ++- 20 files changed, 59 insertions(+), 60 deletions(-) diff --git a/app/containers/Avatar/Avatar.tsx b/app/containers/Avatar/Avatar.tsx index 57ab49b2..7ed3fceb 100644 --- a/app/containers/Avatar/Avatar.tsx +++ b/app/containers/Avatar/Avatar.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { View } from 'react-native'; -import FastImage from '@rocket.chat/react-native-fast-image'; +import FastImage from 'react-native-fast-image'; import Touchable from 'react-native-platform-touchable'; import { settings as RocketChatSettings } from '@rocket.chat/sdk'; diff --git a/app/containers/EmojiPicker/CustomEmoji.tsx b/app/containers/EmojiPicker/CustomEmoji.tsx index c96ee7ae..2792390c 100644 --- a/app/containers/EmojiPicker/CustomEmoji.tsx +++ b/app/containers/EmojiPicker/CustomEmoji.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import FastImage from '@rocket.chat/react-native-fast-image'; +import FastImage from 'react-native-fast-image'; import { ICustomEmoji } from '../../definitions/IEmoji'; diff --git a/app/containers/EmojiPicker/index.tsx b/app/containers/EmojiPicker/index.tsx index 08ef6a60..4fc35a0f 100644 --- a/app/containers/EmojiPicker/index.tsx +++ b/app/containers/EmojiPicker/index.tsx @@ -5,7 +5,7 @@ import { dequal } from 'dequal'; import { connect } from 'react-redux'; import orderBy from 'lodash/orderBy'; import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord'; -import { ImageStyle } from '@rocket.chat/react-native-fast-image'; +import { ImageStyle } from 'react-native-fast-image'; import TabBar from './TabBar'; import EmojiCategory from './EmojiCategory'; diff --git a/app/containers/MessageBox/CommandsPreview/Item.tsx b/app/containers/MessageBox/CommandsPreview/Item.tsx index 51bedfb2..4e323ea8 100644 --- a/app/containers/MessageBox/CommandsPreview/Item.tsx +++ b/app/containers/MessageBox/CommandsPreview/Item.tsx @@ -1,4 +1,4 @@ -import FastImage from '@rocket.chat/react-native-fast-image'; +import FastImage from 'react-native-fast-image'; import React, { useContext, useState } from 'react'; import { TouchableOpacity } from 'react-native'; diff --git a/app/containers/ServerItem/index.tsx b/app/containers/ServerItem/index.tsx index 156c7f03..f85c0990 100644 --- a/app/containers/ServerItem/index.tsx +++ b/app/containers/ServerItem/index.tsx @@ -1,7 +1,7 @@ import React from 'react'; // @ts-ignore // TODO: Remove on react-native update import { Pressable, Text, View } from 'react-native'; -import FastImage from '@rocket.chat/react-native-fast-image'; +import FastImage from 'react-native-fast-image'; import { IServerInfo } from '../../definitions'; import Check from '../Check'; diff --git a/app/containers/UIKit/Image.tsx b/app/containers/UIKit/Image.tsx index b55dc460..42ebc31b 100644 --- a/app/containers/UIKit/Image.tsx +++ b/app/containers/UIKit/Image.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { StyleSheet, View } from 'react-native'; -import FastImage from '@rocket.chat/react-native-fast-image'; +import FastImage from 'react-native-fast-image'; import { BlockContext } from '@rocket.chat/ui-kit'; import ImageContainer from '../message/Image'; diff --git a/app/containers/UIKit/MultiSelect/Chips.tsx b/app/containers/UIKit/MultiSelect/Chips.tsx index 72604f66..49b011bb 100644 --- a/app/containers/UIKit/MultiSelect/Chips.tsx +++ b/app/containers/UIKit/MultiSelect/Chips.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Text, View } from 'react-native'; import Touchable from 'react-native-platform-touchable'; -import FastImage from '@rocket.chat/react-native-fast-image'; +import FastImage from 'react-native-fast-image'; import { themes } from '../../../lib/constants'; import { textParser } from '../utils'; diff --git a/app/containers/UIKit/MultiSelect/Items.tsx b/app/containers/UIKit/MultiSelect/Items.tsx index 1b53f2ea..70cabc06 100644 --- a/app/containers/UIKit/MultiSelect/Items.tsx +++ b/app/containers/UIKit/MultiSelect/Items.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { FlatList, Text } from 'react-native'; import Touchable from 'react-native-platform-touchable'; -import FastImage from '@rocket.chat/react-native-fast-image'; +import FastImage from 'react-native-fast-image'; import Check from '../../Check'; import * as List from '../../List'; diff --git a/app/containers/markdown/new/Image.tsx b/app/containers/markdown/new/Image.tsx index 2c2c0f74..d21ed921 100644 --- a/app/containers/markdown/new/Image.tsx +++ b/app/containers/markdown/new/Image.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Image as ImageProps } from '@rocket.chat/message-parser'; import { createImageProgress } from 'react-native-image-progress'; import * as Progress from 'react-native-progress'; -import FastImage from '@rocket.chat/react-native-fast-image'; +import FastImage from 'react-native-fast-image'; import { TSupportedThemes, useTheme } from '../../../theme'; import { themes } from '../../../lib/constants'; diff --git a/app/containers/message/Image.tsx b/app/containers/message/Image.tsx index 8d7e169a..79524a11 100644 --- a/app/containers/message/Image.tsx +++ b/app/containers/message/Image.tsx @@ -1,6 +1,6 @@ import React, { useContext } from 'react'; import { StyleProp, TextStyle, View } from 'react-native'; -import FastImage from '@rocket.chat/react-native-fast-image'; +import FastImage from 'react-native-fast-image'; import { dequal } from 'dequal'; import { createImageProgress } from 'react-native-image-progress'; import * as Progress from 'react-native-progress'; diff --git a/app/containers/message/Reply.tsx b/app/containers/message/Reply.tsx index 895d8aee..c3cde1cb 100644 --- a/app/containers/message/Reply.tsx +++ b/app/containers/message/Reply.tsx @@ -2,7 +2,7 @@ import React, { useContext, useState } from 'react'; import { StyleSheet, Text, View } from 'react-native'; import moment from 'moment'; import { dequal } from 'dequal'; -import FastImage from '@rocket.chat/react-native-fast-image'; +import FastImage from 'react-native-fast-image'; import Touchable from './Touchable'; import Markdown from '../markdown'; diff --git a/app/containers/message/Urls.tsx b/app/containers/message/Urls.tsx index c0c15f47..cd948366 100644 --- a/app/containers/message/Urls.tsx +++ b/app/containers/message/Urls.tsx @@ -1,7 +1,7 @@ import React, { useContext } from 'react'; import { StyleSheet, Text, View } from 'react-native'; import Clipboard from '@react-native-clipboard/clipboard'; -import FastImage from '@rocket.chat/react-native-fast-image'; +import FastImage from 'react-native-fast-image'; import { dequal } from 'dequal'; import Touchable from './Touchable'; diff --git a/app/containers/message/interfaces.ts b/app/containers/message/interfaces.ts index a8dcb8fc..fbf78de3 100644 --- a/app/containers/message/interfaces.ts +++ b/app/containers/message/interfaces.ts @@ -1,6 +1,6 @@ import { MarkdownAST } from '@rocket.chat/message-parser'; import { StyleProp, TextStyle } from 'react-native'; -import { ImageStyle } from '@rocket.chat/react-native-fast-image'; +import { ImageStyle } from 'react-native-fast-image'; import { IUserChannel } from '../markdown/interfaces'; import { TGetCustomEmoji } from '../../definitions/IEmoji'; diff --git a/app/definitions/IEmoji.ts b/app/definitions/IEmoji.ts index 38bbf235..04972d8b 100644 --- a/app/definitions/IEmoji.ts +++ b/app/definitions/IEmoji.ts @@ -1,6 +1,6 @@ import Model from '@nozbe/watermelondb/Model'; import { StyleProp } from 'react-native'; -import { ImageStyle } from '@rocket.chat/react-native-fast-image'; +import { ImageStyle } from 'react-native-fast-image'; export interface IEmoji { content: string; diff --git a/app/presentation/ImageViewer/ImageComponent.ts b/app/presentation/ImageViewer/ImageComponent.ts index 68d57577..cdc0559c 100644 --- a/app/presentation/ImageViewer/ImageComponent.ts +++ b/app/presentation/ImageViewer/ImageComponent.ts @@ -1,6 +1,6 @@ import React from 'react'; import { Image } from 'react-native'; -import { FastImageProps } from '@rocket.chat/react-native-fast-image'; +import { FastImageProps } from 'react-native-fast-image'; import { types } from './types'; @@ -10,7 +10,7 @@ export const ImageComponent = (type?: string): React.ComponentType 6.1) - nanopb (~> 1.30905.0) - - GoogleUtilities/AppDelegateSwizzler (6.7.1): + - GoogleUtilities/AppDelegateSwizzler (6.7.2): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (6.7.1): + - GoogleUtilities/Environment (6.7.2): - PromisesObjC (~> 1.2) - - GoogleUtilities/Logger (6.7.1): + - GoogleUtilities/Logger (6.7.2): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (6.7.1): + - GoogleUtilities/MethodSwizzler (6.7.2): - GoogleUtilities/Logger - - GoogleUtilities/Network (6.7.1): + - GoogleUtilities/Network (6.7.2): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (6.7.1)" - - GoogleUtilities/Reachability (6.7.1): + - "GoogleUtilities/NSData+zlib (6.7.2)" + - GoogleUtilities/Reachability (6.7.2): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (6.7.1): + - GoogleUtilities/UserDefaults (6.7.2): - GoogleUtilities/Logger - hermes-engine (0.7.2) - JitsiMeetSDK (3.6.0) - KeyCommands (2.0.3): - React - libevent (2.1.12) - - libwebp (1.1.0): - - libwebp/demux (= 1.1.0) - - libwebp/mux (= 1.1.0) - - libwebp/webp (= 1.1.0) - - libwebp/demux (1.1.0): + - libwebp (1.2.1): + - libwebp/demux (= 1.2.1) + - libwebp/mux (= 1.2.1) + - libwebp/webp (= 1.2.1) + - libwebp/demux (1.2.1): - libwebp/webp - - libwebp/mux (1.1.0): + - libwebp/mux (1.2.1): - libwebp/demux - - libwebp/webp (1.1.0) + - libwebp/webp (1.2.1) - MMKV (1.2.10): - MMKVCore (~> 1.2.10) - - MMKVCore (1.2.12) + - MMKVCore (1.2.13) - nanopb (1.30905.0): - nanopb/decode (= 1.30905.0) - nanopb/encode (= 1.30905.0) - nanopb/decode (1.30905.0) - nanopb/encode (1.30905.0) - OpenSSL-Universal (1.1.180) - - PromisesObjC (1.2.9) + - PromisesObjC (1.2.12) - RCT-Folly (2020.01.13.00): - boost-for-react-native - DoubleConversion @@ -518,10 +518,10 @@ PODS: - React-Core - RNDeviceInfo (8.4.8): - React-Core - - RNFastImage (8.2.0): - - React - - SDWebImage (~> 5.0) - - SDWebImageWebPCoder (~> 0.4.1) + - RNFastImage (8.5.11): + - React-Core + - SDWebImage (~> 5.12.5) + - SDWebImageWebPCoder (~> 0.8.4) - RNFBAnalytics (7.3.1): - Firebase/Analytics (~> 6.27.0) - React @@ -586,14 +586,14 @@ PODS: - React-Core - RNVectorIcons (8.1.0): - React-Core - - SDWebImage (5.8.4): - - SDWebImage/Core (= 5.8.4) - - SDWebImage/Core (5.8.4) - - SDWebImageWebPCoder (0.4.1): + - SDWebImage (5.12.5): + - SDWebImage/Core (= 5.12.5) + - SDWebImage/Core (5.12.5) + - SDWebImageWebPCoder (0.8.4): - libwebp (~> 1.0) - - SDWebImage/Core (~> 5.5) + - SDWebImage/Core (~> 5.10) - simdjson (0.9.6-fix2) - - TOCropViewController (2.5.3) + - TOCropViewController (2.6.1) - UMAppLoader (2.2.0) - UMCore (7.1.2) - UMReactNativeAdapter (6.3.9): @@ -960,7 +960,7 @@ SPEC CHECKSUMS: EXVideoThumbnails: 442c3abadb51a81551a3b53705b7560de390e6f7 EXWebBrowser: 76783ba5dcb8699237746ecf41a9643d428a4cc5 FBLazyVector: c9b6dfcde9b3d497793c40d4ccbfbfb05092e0df - FBReactNativeSpec: addc4f0e6ab00dc628fe91de8bfca4601762673a + FBReactNativeSpec: c39f7fc0cd6cc64f0a2a5beffc64b1aa5d42740e Firebase: 919186c8e119dd9372a45fd1dd17a8a942bc1892 FirebaseAnalytics: 5fa308e1b13f838d0f6dc74719ac2a72e8c5afc4 FirebaseCore: 8cd4f8ea22075e0ee582849b1cf79d8816506085 @@ -978,17 +978,17 @@ SPEC CHECKSUMS: GoogleAppMeasurement: 8cd1f289d60e629cf16ab03363b9e89c776b9651 GoogleDataTransport: 9a8a16f79feffc7f42096743de2a7c4815e84020 GoogleDataTransportCCTSupport: 489c1265d2c85b68187a83a911913d190012158d - GoogleUtilities: e121a3867449ce16b0e35ddf1797ea7a389ffdf2 + GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3 hermes-engine: 7d97ba46a1e29bacf3e3c61ecb2804a5ddd02d4f JitsiMeetSDK: 476329f72a866f714d2802bafe1729de6d644ccf KeyCommands: f66c535f698ed14b3d3a4e58859d79a827ea907e libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - libwebp: 946cb3063cea9236285f7e9a8505d806d30e07f3 + libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc MMKV: 76033b9ace2006623308910a3afcc0e25eba3140 - MMKVCore: df0565f6b58463604731a68ba6cd89bc0b2d1d55 + MMKVCore: 3388952ded307e41b3ed8a05892736a236ed1b8e nanopb: c43f40fadfe79e8b8db116583945847910cbabc9 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b - PromisesObjC: b48e0338dbbac2207e611750777895f7a5811b75 + PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97 RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c RCTRequired: 908e7c492c5403cd74fc849bda4dbb13faaa07d7 RCTTypeSafety: 7d9dfd02b51d4b77ea76dff3172f9839fe5f599a @@ -1040,7 +1040,7 @@ SPEC CHECKSUMS: RNCPicker: 914b557e20b3b8317b084aca9ff4b4edb95f61e4 RNDateTimePicker: 7658208086d86d09e1627b5c34ba0cf237c60140 RNDeviceInfo: 0400a6d0c94186d1120c3cbd97b23abc022187a9 - RNFastImage: f40d202ea2367239f71bc7cf11315f4bebab85b4 + RNFastImage: 945abf54742505d790d9024d230c69b1e866bc88 RNFBAnalytics: dae6d7b280ba61c96e1bbdd34aca3154388f025e RNFBApp: 6fd8a7e757135d4168bf033a8812c241af7363a0 RNFBCrashlytics: 88de72c2476b5868a892d9523b89b86c527c540e @@ -1053,10 +1053,10 @@ SPEC CHECKSUMS: RNScreens: c526239bbe0e957b988dacc8d75ac94ec9cb19da RNSVG: 302bfc9905bd8122f08966dc2ce2d07b7b52b9f8 RNVectorIcons: 31cebfcf94e8cf8686eb5303ae0357da64d7a5a4 - SDWebImage: cf6922231e95550934da2ada0f20f2becf2ceba9 - SDWebImageWebPCoder: 36f8f47bd9879a8aea6044765c1351120fd8e3a8 + SDWebImage: 0905f1b7760fc8ac4198cae0036600d67478751e + SDWebImageWebPCoder: f93010f3f6c031e2f8fb3081ca4ee6966c539815 simdjson: 85016870cd17207312b718ef6652eb6a1cd6a2b0 - TOCropViewController: 20a14b6a7a098308bf369e7c8d700dc983a974e6 + TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863 UMAppLoader: 21af63390e55c82e037fb9752d93114a80ecf16e UMCore: ce3a4faa010239063b8343895b29a6d97b01069d UMReactNativeAdapter: d03cefd0e4e4179ab8c490408589f1c8a6c8b785 diff --git a/package.json b/package.json index 15e371ef..9478d1a7 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,6 @@ "@react-navigation/native": "5.9.4", "@react-navigation/stack": "5.14.5", "@rocket.chat/message-parser": "0.30.0", - "@rocket.chat/react-native-fast-image": "^8.2.0", "@rocket.chat/sdk": "RocketChat/Rocket.Chat.js.SDK#mobile", "@rocket.chat/ui-kit": "^0.31.11", "bytebuffer": "^5.0.1", @@ -89,6 +88,7 @@ "react-native-document-picker": "8.1.0", "react-native-easy-grid": "^0.2.2", "react-native-easy-toast": "^1.2.0", + "react-native-fast-image": "RocketChat/react-native-fast-image.git#bump-version", "react-native-file-viewer": "^2.1.4", "react-native-gesture-handler": "^1.10.3", "react-native-image-crop-picker": "RocketChat/react-native-image-crop-picker", diff --git a/yarn.lock b/yarn.lock index b0bff0f0..7fa36822 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4023,11 +4023,6 @@ resolved "https://registry.yarnpkg.com/@rocket.chat/message-parser/-/message-parser-0.30.0.tgz#63a25aa7fa17724d55db80f95f7f8d6a99ae42ff" integrity sha512-pI7ajaojv+GqhQBMnFiBOWerE7zIlJywWFaLzJlIC/wsJ9LgX6YaKY2wqc909nkr+E4qZY1luJ61ErXGGSF9Zw== -"@rocket.chat/react-native-fast-image@^8.2.0": - version "8.2.0" - resolved "https://registry.yarnpkg.com/@rocket.chat/react-native-fast-image/-/react-native-fast-image-8.2.0.tgz#4f48858f95f40afcb10b39cee9b1239c150d6c51" - integrity sha512-NF5KlFt642ZucP/KHnYGBNYLD6O7bcrZMKfRQlH5Y3/1xpnPX1g4wuygtiV7XArMU1FopQT+qmCUPPj8IMDTcw== - "@rocket.chat/sdk@RocketChat/Rocket.Chat.js.SDK#mobile": version "1.3.0-mobile" resolved "https://codeload.github.com/RocketChat/Rocket.Chat.js.SDK/tar.gz/454b4ba784095057b8de862eb99340311b672e15" @@ -14862,6 +14857,10 @@ react-native-easy-toast@^1.2.0: dependencies: prop-types "^15.5.10" +react-native-fast-image@RocketChat/react-native-fast-image.git#bump-version: + version "8.5.12" + resolved "https://codeload.github.com/RocketChat/react-native-fast-image/tar.gz/8bdb187a4500e23ad1c95324a669c25361bbf685" + react-native-file-viewer@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/react-native-file-viewer/-/react-native-file-viewer-2.1.4.tgz#987b2902f0f0ac87b42f3ac3d3037c8ae98f17a6"