react-native-asset 2.0.1 → 2.1.0

package/README.md

@@ -18,13 +18,27 @@
   yarn global add react-native-asset
   ```
 * Add assets to your `react-native.config.js` as you would with `react-native link`
-  ```json
+  ```js
   ...
-   "assets": [
+   assets: [
       "./src/font",
-      "./src/mp3"
-    ]
+      "./src/mp3",
+    ];
   ```
+* Add platform-specific assets to your `react-native.config.js` like so:
+  ```js
+  ...
+  assets: [
+    "./src/mp3",
+  ],
+  iosAssets: [
+    "./src/font/ios",
+  ],
+  androidAssets: [
+    "./src/font/android",
+  ],
+  ```
+
 * Run the command and linking + unlinking is automatic!
   ```bash
   react-native-asset

package/lib/cli.js

@@ -43,8 +43,15 @@ const {
 // Using dynamic require for config file, is written in js
 // eslint-disable-next-line import/no-dynamic-require
 const reactNativeConfig = require(path.resolve(rootPath, 'react-native.config.js'));
-const reactNativeConfigAssets = reactNativeConfig.assets || [];
-const mutualAssets = reactNativeConfigAssets.concat(assets !== undefined ? assets : []);
+const mutualAssets = (reactNativeConfig.assets || []).concat(assets || []);
+const mergediOSAssets = mutualAssets.concat(
+  reactNativeConfig.iosAssets || [],
+  iosAssets || [],
+);
+const mergedAndroidAssets = mutualAssets.concat(
+  reactNativeConfig.androidAssets || [],
+  androidAssets || [],
+);
 
 linkAssets({
   rootPath,
@@ -52,11 +59,11 @@ linkAssets({
   platforms: {
     ios: {
       enabled: !(androidAssets && !iosAssets), // when given android but not ios, ok if both not
-      assets: iosAssets || mutualAssets,
+      assets: mergediOSAssets,
     },
     android: {
       enabled: !(iosAssets && !androidAssets), // when given ios but not android, ok if both not
-      assets: androidAssets || mutualAssets,
+      assets: mergedAndroidAssets,
     },
   },
 });

package/lib/index.js

@@ -7,12 +7,15 @@ const cleanAssetsAndroid = require('./clean-assets/android');
 const getManifest = require('./manifest/index');
 const log = require('npmlog');
 const sha1File = require('sha1-file');
+const _ = require('lodash');
 const getConfig = require('./get-config');
 
 const cwd = process.cwd();
 
 const unl = (val, otherwise) => ((val !== undefined) ? val : otherwise);
 
+const clearDuplicated = files => _.uniqBy(files, f => path.parse(f.path).base);
+
 const filesToIgnore = [
   '.DS_Store',
   'Thumbs.db',
@@ -87,8 +90,11 @@ const linkPlatform = ({
       });
     }
   };
+
   assetsPaths.forEach(loadAsset);
 
+  assets = clearDuplicated(assets);
+
   const fileFilters = []
     .concat(Object.keys(linkOptionsPerExt).map(fileExt => ({
       name: fileExt,
@@ -205,8 +211,25 @@ module.exports = ({
     {},
   );
 
+  const imageOptions = {
+    android: {
+      path: path.resolve(androidPath, 'app', 'src', 'main', 'res', 'drawable'),
+    },
+    ios: {
+      addFont: false,
+    },
+  };
+
+  const imageTypes = ['png', 'jpg', 'gif'];
+
+  const imageLinkOptions = imageTypes.reduce(
+    (result, imageFiles) => ({ ...result, [imageFiles]: imageOptions }),
+    {},
+  );
+
   const linkOptionsPerExt = {
     ...fontsLinkOptions,
+    ...imageLinkOptions,
     mp3: {
       android: {
         path: path.resolve(androidPath, 'app', 'src', 'main', 'res', 'raw'),
@@ -253,6 +276,9 @@ module.exports = ({
       linkOptionsPerExt: {
         otf: linkOptionsPerExt.otf.android,
         ttf: linkOptionsPerExt.ttf.android,
+        png: linkOptionsPerExt.png.android,
+        jpg: linkOptionsPerExt.jpg.android,
+        gif: linkOptionsPerExt.gif.android,
         mp3: linkOptionsPerExt.mp3.android,
       },
       otherLinkOptions: otherLinkOptions.android,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-asset",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Linking and unlinking of assets in your react-native app, works for fonts and sounds",
   "main": "lib/index.js",
   "bin": "lib/cli.js",
@@ -32,11 +32,12 @@
   },
   "homepage": "https://github.com/unimonkiez/react-native-asset#readme",
   "peerDependencies": {
-    "react-native": "^0.60.0"
+    "react-native": ">=0.60.0"
   },
   "dependencies": {
     "fs-extra": "^7.0.1",
     "npmlog": "^4.1.2",
+    "lodash": "4.17.21",
     "plist": "^3.0.1",
     "sha1-file": "^1.0.4",
     "xcode": "^2.0.0"