react-native-asset 2.0.0 → 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
@@ -41,4 +55,4 @@ Instead this library writes `link-assets-manifest.json` to the root of `android`
 * `-n-u, --no-unlink` - Not to unlink assets which not longer exists, not recommanded.
 
 ## Backward compatability
-* to use react-native 0.59 and below, use version 1.14.0
+* to use react-native 0.59 and below, use version 1.1.4

package/lib/cli.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-const fs = require('fs-extra');
 const path = require('path');
 const linkAssets = require('./index');
 const getCliArgs = require('./cli-args');
@@ -41,9 +40,18 @@ const {
   androidAssets,
 } = cliArgs;
 
+// 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,
@@ -51,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,
@@ -137,6 +143,7 @@ const linkPlatform = ({
   });
 
   manifest.write(assets
+    .filter(filterFilesToIgnore)
     .map(asset => Object.assign(
       {},
       asset,
@@ -204,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'),
@@ -252,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/lib/react-native-lib/ios/getPlistPath.js

@@ -17,6 +17,6 @@ module.exports = function getPlistPath(project, sourceDir) {
 
   return path.join(
     sourceDir,
-    plistFile.replace(/"/g, '').replace('$(SRCROOT)', '')
+    plistFile.replace(/"/g, '').replace('$(SRCROOT)', ''),
   );
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-asset",
-  "version": "2.0.0",
+  "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"

package/.history/README_20190618130513.md

@@ -1,43 +0,0 @@
-# react-native-asset
-[![npm version](https://badge.fury.io/js/react-native-asset.svg)](https://badge.fury.io/js/react-native-asset)[![Build Status](https://travis-ci.org/unimonkiez/react-native-asset.svg?branch=master)](https://travis-ci.org/unimonkiez/react-native-asset)
-
-## Link and unlink assets to your react-native project with ease!
-
-## Advantages
-* `react-native link` only supports font files, this tool supports all assets.
-* Unlinking is automatic when you delete an asset, with `react-native link`, you need to unlink the files manually.
-* Proper link (and unlink) for `mp3` (to use with [`react-native-sound`](https://github.com/zmxv/react-native-sound#basic-usage)) and `ttf` files.
-
-### [Check out this starter-kit to use your assets with even more simplicity.](https://github.com/unimonkiez/react-platformula-boilerplate)
-
-## Usage
-* Install
-  ```bash
-  npm install -g react-native-asset
-  # or yarn
-  yarn global add react-native-asset
-  ```
-* Add assets to you package json as you would with `react-native link`
-  ```json
-  ...
-   "rnpm": {
-      "assets": [
-        "./src/font",
-        "./src/mp3"
-      ]
-   }
-  ```
-* Run the command and linking + unlinking is automatic!
-  ```bash
-  react-native-asset
-  ```
-## Explanation
-With `react-native link` you have to unlink the files manually, which is hard work.  
-Instead this library writes `link-assets-manifest.json` to the root of `android` and `ios` folders to keep track of the files which it added, for later removing it for you if missing from your `assets`!
-
-## Parameters
-* `-p, --path` - path to project, defaults to cwd.
-* `-a, --assets` - assets paths, for example `react-native-asset -a ./src/font ./src/mp3`.
-* `-ios-a, --ios-assets` - ios assets paths, will disable android linking
-* `-android-a, --android-assets` - android assets paths, will disable ios linking.
-* `-n-u, --no-unlink` - Not to unlink assets which not longer exists, not recommanded.

package/.history/README_20190719184449.md

@@ -1,41 +0,0 @@
-# react-native-asset
-[![npm version](https://badge.fury.io/js/react-native-asset.svg)](https://badge.fury.io/js/react-native-asset)[![Build Status](https://travis-ci.org/unimonkiez/react-native-asset.svg?branch=master)](https://travis-ci.org/unimonkiez/react-native-asset)
-
-## Link and unlink assets to your react-native project with ease!
-
-## Advantages
-* `react-native link` only supports font files, this tool supports all assets.
-* Unlinking is automatic when you delete an asset, with `react-native link`, you need to unlink the files manually.
-* Proper link (and unlink) for `mp3` (to use with [`react-native-sound`](https://github.com/zmxv/react-native-sound#basic-usage)) and `ttf` files.
-
-### [Check out this starter-kit to use your assets with even more simplicity.](https://github.com/unimonkiez/react-platformula-boilerplate)
-
-## Usage
-* Install
-  ```bash
-  npm install -g react-native-asset
-  # or yarn
-  yarn global add react-native-asset
-  ```
-* Add assets to your `react-native.config.js` as you would with `react-native link`
-  ```json
-  ...
-   "assets": [
-      "./src/font",
-      "./src/mp3"
-    ]
-  ```
-* Run the command and linking + unlinking is automatic!
-  ```bash
-  react-native-asset
-  ```
-## Explanation
-With `react-native link` you have to unlink the files manually, which is hard work.  
-Instead this library writes `link-assets-manifest.json` to the root of `android` and `ios` folders to keep track of the files which it added, for later removing it for you if missing from your `assets`!
-
-## Parameters
-* `-p, --path` - path to project, defaults to cwd.
-* `-a, --assets` - assets paths, for example `react-native-asset -a ./src/font ./src/mp3`.
-* `-ios-a, --ios-assets` - ios assets paths, will disable android linking
-* `-android-a, --android-assets` - android assets paths, will disable ios linking.
-* `-n-u, --no-unlink` - Not to unlink assets which not longer exists, not recommanded.

package/.history/README_20190719184543.md

@@ -1,44 +0,0 @@
-# react-native-asset
-[![npm version](https://badge.fury.io/js/react-native-asset.svg)](https://badge.fury.io/js/react-native-asset)[![Build Status](https://travis-ci.org/unimonkiez/react-native-asset.svg?branch=master)](https://travis-ci.org/unimonkiez/react-native-asset)
-
-## Link and unlink assets to your react-native project with ease!
-
-## Advantages
-* `react-native link` only supports font files, this tool supports all assets.
-* Unlinking is automatic when you delete an asset, with `react-native link`, you need to unlink the files manually.
-* Proper link (and unlink) for `mp3` (to use with [`react-native-sound`](https://github.com/zmxv/react-native-sound#basic-usage)) and `ttf` files.
-
-### [Check out this starter-kit to use your assets with even more simplicity.](https://github.com/unimonkiez/react-platformula-boilerplate)
-
-## Usage
-* Install
-  ```bash
-  npm install -g react-native-asset
-  # or yarn
-  yarn global add react-native-asset
-  ```
-* Add assets to your `react-native.config.js` as you would with `react-native link`
-  ```json
-  ...
-   "assets": [
-      "./src/font",
-      "./src/mp3"
-    ]
-  ```
-* Run the command and linking + unlinking is automatic!
-  ```bash
-  react-native-asset
-  ```
-## Explanation
-With `react-native link` you have to unlink the files manually, which is hard work.  
-Instead this library writes `link-assets-manifest.json` to the root of `android` and `ios` folders to keep track of the files which it added, for later removing it for you if missing from your `assets`!
-
-## Parameters
-* `-p, --path` - path to project, defaults to cwd.
-* `-a, --assets` - assets paths, for example `react-native-asset -a ./src/font ./src/mp3`.
-* `-ios-a, --ios-assets` - ios assets paths, will disable android linking
-* `-android-a, --android-assets` - android assets paths, will disable ios linking.
-* `-n-u, --no-unlink` - Not to unlink assets which not longer exists, not recommanded.
-
-## Backward compatability
-* to use react-native 0.59 and below, use version 1.14.0

package/.history/package_20190618130521.json

@@ -1,47 +0,0 @@
-{
-  "name": "react-native-asset",
-  "version": "1.1.4",
-  "description": "Linking and unlinking of assets in your react-native app, works for fonts and sounds",
-  "main": "lib/index.js",
-  "bin": "lib/cli.js",
-  "scripts": {
-    "lint": "eslint --ext .js,.jsx .",
-    "lint:error": "npm run lint -- --quiet",
-    "lint:fix": "npm run lint -- --fix",
-    "lint:report": "npm run lint -- --format html -o ./report.html",
-    "test": "jest",
-    "test:watch": "npm test -- --watch"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/unimonkiez/react-native-asset.git"
-  },
-  "keywords": [
-    "react-native",
-    "react",
-    "native",
-    "js",
-    "asset",
-    "assets",
-    "link"
-  ],
-  "author": "Yuval Saraf",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/unimonkiez/react-native-asset/issues"
-  },
-  "homepage": "https://github.com/unimonkiez/react-native-asset#readme",
-  "dependencies": {
-    "fs-extra": "^7.0.1",
-    "npmlog": "^4.1.2",
-    "plist": "^3.0.1",
-    "sha1-file": "^1.0.4",
-    "xcode": "^2.0.0"
-  },
-  "devDependencies": {
-    "eslint": "^4.16.0",
-    "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-plugin-import": "^2.8.0",
-    "jest": "^22.1.4"
-  }
-}

package/.history/package_20190719184302.json

@@ -1,50 +0,0 @@
-{
-  "name": "react-native-asset",
-  "version": "1.1.4",
-  "description": "Linking and unlinking of assets in your react-native app, works for fonts and sounds",
-  "main": "lib/index.js",
-  "bin": "lib/cli.js",
-  "scripts": {
-    "lint": "eslint --ext .js,.jsx .",
-    "lint:error": "npm run lint -- --quiet",
-    "lint:fix": "npm run lint -- --fix",
-    "lint:report": "npm run lint -- --format html -o ./report.html",
-    "test": "jest",
-    "test:watch": "npm test -- --watch"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/unimonkiez/react-native-asset.git"
-  },
-  "keywords": [
-    "react-native",
-    "react",
-    "native",
-    "js",
-    "asset",
-    "assets",
-    "link"
-  ],
-  "author": "Yuval Saraf",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/unimonkiez/react-native-asset/issues"
-  },
-  "homepage": "https://github.com/unimonkiez/react-native-asset#readme",
-  "peerDependencies": {
-    "react-native": "^0.60.0"
-  },
-  "dependencies": {
-    "fs-extra": "^7.0.1",
-    "npmlog": "^4.1.2",
-    "plist": "^3.0.1",
-    "sha1-file": "^1.0.4",
-    "xcode": "^2.0.0"
-  },
-  "devDependencies": {
-    "eslint": "^4.16.0",
-    "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-plugin-import": "^2.8.0",
-    "jest": "^22.1.4"
-  }
-}