react-native-vector-image 0.4.5 → 0.5.0

package/README.md

@@ -12,19 +12,19 @@
 ## Installation
 
 ```sh
-yarn add react-native-vector-image @klarna/react-native-vector-drawable
+yarn add react-native-vector-image
 ```
 
+For expo, see [`@zamplyy/react-native-vector-image-plugin`](https://github.com/zamplyy/react-native-vector-image-plugin).
+
 ### Android
 
 Edit `android/app/build.gradle` to look like this (without the +):
 
 ```diff
-project.ext.react = [
-    enableHermes: false,  // clean and rebuild if changing
-]
-
-apply from: "../../node_modules/react-native/react.gradle"
+apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
+apply plugin: "com.facebook.react"
 + apply from: "../../node_modules/react-native-vector-image/strip_svgs.gradle"
 ```
 
@@ -35,8 +35,10 @@ Open your project in Xcode, select the _Build Phases_ tab, and edit the `Bundle
 ```diff
 set -e
 
-export NODE_BINARY=node
-../node_modules/react-native/scripts/react-native-xcode.sh
+WITH_ENVIRONMENT="$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh"
+REACT_NATIVE_XCODE="$REACT_NATIVE_PATH/scripts/react-native-xcode.sh"
+
+/bin/sh -c "$WITH_ENVIRONMENT $REACT_NATIVE_XCODE"
 + ../node_modules/react-native-vector-image/strip_svgs.sh
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-vector-image",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "Native vector images generated from SVG",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -42,13 +42,11 @@
     "tempy": "^1.0.1",
     "yargs": "^16.2.0"
   },
-  "peerDependencies": {
-    "@klarna/react-native-vector-drawable": ">=0.4.0"
-  },
   "devDependencies": {
     "jest": "^26.6.3",
-    "metro": ">=0.58.0",
-    "metro-config": ">=0.58.0",
+    "metro": ">=0.83.3",
+    "metro-config": ">=0.83.3",
     "prettier": "^2.2.1"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }

package/src/cli/getAssets.js

@@ -1,6 +1,6 @@
-const Server = require('metro/src/Server');
+const { default: Server } = require('metro/private/Server');
 const { loadConfig } = require('metro-config');
-const output = require('metro/src/shared/output/bundle');
+const output = require('metro/private/shared/output/bundle');
 
 const getBabelTransformerPath = () => {
   try {
@@ -10,7 +10,7 @@ const getBabelTransformerPath = () => {
     // to ensure backwards compatibility with old RN versions (RN < 73)
     return require.resolve('metro-react-native-babel-transformer');
   }
-}
+};
 
 async function getAssets(options) {
   const args = {

package/src/index.js

@@ -1,10 +1,10 @@
 import React from 'react';
-import AssetRegistry from 'react-native/Libraries/Image/AssetRegistry';
-import { VectorImageCompat } from './VectorImageCompat';
+import { Image } from 'react-native';
+import { getAssetByID } from '@react-native/assets-registry/registry';
 import getResourceName from './getResourceName';
 
 export default function VectorImage({ source, style, ...props }) {
-  const asset = AssetRegistry.getAssetByID(source);
+  const asset = getAssetByID(source);
   if (!asset) {
     console.warn(
       `No asset registered for source "${source}", you may have to generate assets and recompile`
@@ -13,7 +13,7 @@ export default function VectorImage({ source, style, ...props }) {
   }
   const resourceName = getResourceName(asset);
   return (
-    <VectorImageCompat
+    <Image
       source={{ uri: resourceName }}
       style={[{ width: asset.width, height: asset.height }, style]}
       {...props}

package/src/VectorImageCompat.android.js

@@ -1,6 +0,0 @@
-import React from 'react';
-import VectorDrawable from '@klarna/react-native-vector-drawable';
-
-export function VectorImageCompat({ source, ...props }) {
-  return <VectorDrawable resourceName={source.uri} {...props} />;
-}

package/src/VectorImageCompat.ios.js

@@ -1 +0,0 @@
-export { Image as VectorImageCompat } from 'react-native';