From 75136e4c124ef2a307540594267983ba4c4f9302 Mon Sep 17 00:00:00 2001 From: Nitzan Yizhar Date: Fri, 15 Nov 2024 15:31:26 +0200 Subject: [PATCH 1/5] fixed optional dep CssUri --- src/optionalDependencies/SvgPackage.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/optionalDependencies/SvgPackage.ts b/src/optionalDependencies/SvgPackage.ts index 6ffffd73e4..74389e7aa6 100644 --- a/src/optionalDependencies/SvgPackage.ts +++ b/src/optionalDependencies/SvgPackage.ts @@ -1,6 +1,14 @@ let SvgPackage: any; try { SvgPackage = require('react-native-svg'); + let SvgCssUri; + try { + SvgCssUri = require('react-native-svg/css').SvgCssUri; + } catch (error) { + } + if (SvgCssUri) { + SvgPackage.SvgCssUri = SvgCssUri; + } // Sadly we cannot verify with require('react-native-svg-transformer'); } catch (error) {} From 369deb5a94ceda8f2630134394f7f1fbc1c2e831 Mon Sep 17 00:00:00 2001 From: Nitzan Yizhar Date: Mon, 18 Nov 2024 17:00:50 +0200 Subject: [PATCH 2/5] make it more readable --- src/optionalDependencies/SvgPackage.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/optionalDependencies/SvgPackage.ts b/src/optionalDependencies/SvgPackage.ts index 74389e7aa6..73be4f5e2d 100644 --- a/src/optionalDependencies/SvgPackage.ts +++ b/src/optionalDependencies/SvgPackage.ts @@ -1,15 +1,12 @@ let SvgPackage: any; +let SvgCssUriPackage14Higher; try { SvgPackage = require('react-native-svg'); - let SvgCssUri; - try { - SvgCssUri = require('react-native-svg/css').SvgCssUri; - } catch (error) { - } - if (SvgCssUri) { - SvgPackage.SvgCssUri = SvgCssUri; - } + SvgCssUriPackage14Higher = require('react-native-svg/css').SvgCssUri; // Sadly we cannot verify with require('react-native-svg-transformer'); } catch (error) {} +if (SvgCssUriPackage14Higher) { + SvgPackage.SvgCssUri = SvgCssUriPackage14Higher; +} export default SvgPackage; From 17d28f1531dabea7d8ec3afac05d04833a071e99 Mon Sep 17 00:00:00 2001 From: Nitzan Yizhar Date: Mon, 18 Nov 2024 17:08:15 +0200 Subject: [PATCH 3/5] changed the way cssuri is exported so it won't trigger the error --- src/components/svgImage/index.tsx | 3 +-- src/optionalDependencies/SvgPackage.ts | 8 +++----- src/optionalDependencies/index.ts | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/components/svgImage/index.tsx b/src/components/svgImage/index.tsx index 0de40c8373..096b25c2ae 100644 --- a/src/components/svgImage/index.tsx +++ b/src/components/svgImage/index.tsx @@ -1,9 +1,8 @@ import React from 'react'; import {isSvg, isSvgUri} from '../../utils/imageUtils'; -import {SvgPackage} from '../../optionalDependencies'; +import {SvgPackage, SvgCssUri} from '../../optionalDependencies'; const SvgXml = SvgPackage?.SvgXml; -const SvgCssUri = SvgPackage?.SvgCssUri; // const SvgProps = SvgPackage?.SvgProps; TODO: not sure how (or if) we can use their props export interface SvgImageProps { diff --git a/src/optionalDependencies/SvgPackage.ts b/src/optionalDependencies/SvgPackage.ts index 73be4f5e2d..542f38c5d5 100644 --- a/src/optionalDependencies/SvgPackage.ts +++ b/src/optionalDependencies/SvgPackage.ts @@ -1,12 +1,10 @@ let SvgPackage: any; -let SvgCssUriPackage14Higher; +let svgCssForPackage14Higher: any; try { SvgPackage = require('react-native-svg'); - SvgCssUriPackage14Higher = require('react-native-svg/css').SvgCssUri; + svgCssForPackage14Higher = require('react-native-svg/css'); // Sadly we cannot verify with require('react-native-svg-transformer'); } catch (error) {} -if (SvgCssUriPackage14Higher) { - SvgPackage.SvgCssUri = SvgCssUriPackage14Higher; -} +export const SvgCssUri = svgCssForPackage14Higher?.SvgCssUri ?? SvgPackage?.SvgCssUri; export default SvgPackage; diff --git a/src/optionalDependencies/index.ts b/src/optionalDependencies/index.ts index fa6c28eff6..13bdb8d69b 100644 --- a/src/optionalDependencies/index.ts +++ b/src/optionalDependencies/index.ts @@ -4,6 +4,6 @@ export {default as BlurViewPackage} from './BlurViewPackage'; export {default as MomentPackage} from './MomentPackage'; export {default as NetInfoPackage} from './NetInfoPackage'; export {default as HapticFeedbackPackage} from './HapticFeedbackPackage'; -export {default as SvgPackage} from './SvgPackage'; +export {default as SvgPackage, SvgCssUri} from './SvgPackage'; export {createShimmerPlaceholder} from './ShimmerPackage'; export {default as LinearGradientPackage} from './LinearGradientPackage'; From c4a001c8f53776151b3df5b399c7153fbb37ca08 Mon Sep 17 00:00:00 2001 From: Nitzan Yizhar Date: Tue, 19 Nov 2024 10:15:37 +0200 Subject: [PATCH 4/5] updated react-native-svg version to ^15.2.0 --- package.json | 2 +- yarn.lock | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2297522f45..0aa1cf7d00 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,7 @@ "react-native-navigation": "7.40.1", "react-native-reanimated": "3.8.1", "react-native-shimmer-placeholder": "^2.0.6", - "react-native-svg": "^13.7.0", + "react-native-svg": "^15.2.0", "react-native-svg-transformer": "1.5.0", "react-test-renderer": "18.2.0", "reassure": "^0.4.1", diff --git a/yarn.lock b/yarn.lock index 4e11f82b6f..ddedd3e142 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10269,16 +10269,17 @@ __metadata: languageName: node linkType: hard -"react-native-svg@npm:^13.7.0": - version: 13.14.1 - resolution: "react-native-svg@npm:13.14.1" +"react-native-svg@npm:^15.2.0": + version: 15.9.0 + resolution: "react-native-svg@npm:15.9.0" dependencies: css-select: ^5.1.0 css-tree: ^1.1.3 + warn-once: 0.1.1 peerDependencies: react: "*" react-native: "*" - checksum: 273f05f2cceabf09f3909f57108d10f56aeb38981146e5f7b72cdb8595fbfb524af891845d4240a629c2f91ed120ae603d9efd579f7fb88521769aec71811136 + checksum: a9fa366699d824d1cf43543d37e5d2d36551002b1878dae27618c2bbd7dbaccaad42586c382a32a56ba20df20b564777581a6139da48ed766eaed95c8267b9df languageName: node linkType: hard @@ -10359,7 +10360,7 @@ __metadata: react-native-reanimated: 3.8.1 react-native-redash: ^12.0.3 react-native-shimmer-placeholder: ^2.0.6 - react-native-svg: ^13.7.0 + react-native-svg: ^15.2.0 react-native-svg-transformer: 1.5.0 react-test-renderer: 18.2.0 reassure: ^0.4.1 @@ -12250,6 +12251,13 @@ __metadata: languageName: node linkType: hard +"warn-once@npm:0.1.1": + version: 0.1.1 + resolution: "warn-once@npm:0.1.1" + checksum: e6a5a1f5a8dba7744399743d3cfb571db4c3947897875d4962a7c5b1bf2195ab4518c838cb4cea652e71729f21bba2e98dc75686f5fccde0fabbd894e2ed0c0d + languageName: node + linkType: hard + "wcwidth@npm:^1.0.1": version: 1.0.1 resolution: "wcwidth@npm:1.0.1" From 914a0f87f42900ba1c2dac7eda6cdeb214e9efa2 Mon Sep 17 00:00:00 2001 From: Nitzan Yizhar Date: Tue, 19 Nov 2024 10:20:32 +0200 Subject: [PATCH 5/5] updated react-native-svg version to 15.2.0 (exact) --- package.json | 2 +- yarn.lock | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 0aa1cf7d00..f1d335291a 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,7 @@ "react-native-navigation": "7.40.1", "react-native-reanimated": "3.8.1", "react-native-shimmer-placeholder": "^2.0.6", - "react-native-svg": "^15.2.0", + "react-native-svg": "15.2.0", "react-native-svg-transformer": "1.5.0", "react-test-renderer": "18.2.0", "reassure": "^0.4.1", diff --git a/yarn.lock b/yarn.lock index ddedd3e142..dfbd45a8c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10269,17 +10269,16 @@ __metadata: languageName: node linkType: hard -"react-native-svg@npm:^15.2.0": - version: 15.9.0 - resolution: "react-native-svg@npm:15.9.0" +"react-native-svg@npm:15.2.0": + version: 15.2.0 + resolution: "react-native-svg@npm:15.2.0" dependencies: css-select: ^5.1.0 css-tree: ^1.1.3 - warn-once: 0.1.1 peerDependencies: react: "*" react-native: "*" - checksum: a9fa366699d824d1cf43543d37e5d2d36551002b1878dae27618c2bbd7dbaccaad42586c382a32a56ba20df20b564777581a6139da48ed766eaed95c8267b9df + checksum: 0075d3c5bcf6bbbebe064364ec72c02eeff3fc0f2b1ba127bde26a8ecedc190a7890a910a6a051687318fa80504a3bc335eee2bfd6846b90193ca1608bae821e languageName: node linkType: hard @@ -10360,7 +10359,7 @@ __metadata: react-native-reanimated: 3.8.1 react-native-redash: ^12.0.3 react-native-shimmer-placeholder: ^2.0.6 - react-native-svg: ^15.2.0 + react-native-svg: 15.2.0 react-native-svg-transformer: 1.5.0 react-test-renderer: 18.2.0 reassure: ^0.4.1 @@ -12251,13 +12250,6 @@ __metadata: languageName: node linkType: hard -"warn-once@npm:0.1.1": - version: 0.1.1 - resolution: "warn-once@npm:0.1.1" - checksum: e6a5a1f5a8dba7744399743d3cfb571db4c3947897875d4962a7c5b1bf2195ab4518c838cb4cea652e71729f21bba2e98dc75686f5fccde0fabbd894e2ed0c0d - languageName: node - linkType: hard - "wcwidth@npm:^1.0.1": version: 1.0.1 resolution: "wcwidth@npm:1.0.1"