Merge branch 'master' into feature/IOHKLE-204-migrate-new-ledgerjs-api

Author: DCRichards

README.md

@@ -29,7 +29,6 @@ applications. There are implementations for Node and Browser.
 | [`@ledgerhq/hw-transport`](/packages/hw-transport)                                   | [![npm](https://img.shields.io/npm/v/@ledgerhq/hw-transport.svg)](https://www.npmjs.com/package/@ledgerhq/hw-transport)                                   | The generic interface of the communication layer                                                    |
 | **internal utility libraries**                                                       |
 | [`@ledgerhq/currencies`](/packages/currencies)                                       | [![npm](https://img.shields.io/npm/v/@ledgerhq/currencies.svg)](https://www.npmjs.com/package/@ledgerhq/currencies)                                       | deal with crypto currencies                                                                         |
-| [`@ledgerhq/common`](/packages/common)                                               | [![npm](https://img.shields.io/npm/v/@ledgerhq/common.svg)](https://www.npmjs.com/package/@ledgerhq/common)                                               | internal library which share code across Ledger projects                                            |
 | **Development Tools**                                                                |
 | [`@ledgerhq/hw-http-proxy-devserver`](/packages/hw-http-proxy-devserver)             | [![npm](https://img.shields.io/npm/v/@ledgerhq/hw-http-proxy-devserver.svg)](https://www.npmjs.com/package/@ledgerhq/hw-http-proxy-devserver)             | HTTP server proxy to use with `hw-transport-node-hid` **NB: DEV & testing purpose only. DO NOT use in PROD**                           |
 | [`@ledgerhq/hw-hid-cli`](/packages/hw-hid-cli)                                       | [![npm](https://img.shields.io/npm/v/@ledgerhq/hw-hid-cli.svg)](https://www.npmjs.com/package/@ledgerhq/hw-hid-cli)                                       | CLI utility to send APDU to the device via node-hid                                                 |
@@ -82,15 +81,23 @@ yarn
 Build all packages
 
 ```bash
-yarn run build
+yarn build
+```
+
+### Watch
+
+Watch all packages change. Very useful during development to build only file that changes.
+
+```bash
+yarn watch
 ```
 
 ### Lint
 
 Lint all packages
 
 ```bash
-yarn run lint
+yarn lint
 ```
 
 ### Run Tests
@@ -109,13 +116,13 @@ Then run the test and accept the commands on the devices for the tests to
 continue.
 
 ```bash
-yarn run test-node
+yarn test-node
 ```
 
 You can also test on the web:
 
 ```bash
-yarn run test-browser
+yarn test-browser
 ```
 
 > make sure to configure your device app with "Browser support" set to "YES".

lerna.json

@@ -1,9 +1,9 @@
 {
-  "lerna": "2.6.0",
+  "lerna": "2.9.0",
   "packages": [
     "packages/*"
   ],
-  "version": "4.6.0",
+  "version": "4.10.1",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

package.json

@@ -31,19 +31,19 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "babel-runtime": "^6.26.0",
-    "browserify": "^15.1.0",
+    "browserify": "^16.1.1",
     "create-hash": "^1.1.3",
-    "documentation": "^5.3.5",
+    "documentation": "^6.1.0",
     "eslint": "^4.11.0",
     "eslint-config-prettier": "^2.7.0",
     "eslint-plugin-flowtype": "^2.42.0",
     "eslint-plugin-react": "^7.6.1",
-    "flow-bin": "^0.66.0",
+    "flow-bin": "^0.68.0",
     "flow-copy-source": "^1.2.2",
     "flow-mono-cli": "^1.3.0",
-    "flow-typed": "^2.3.0",
-    "lerna": "2.8.0",
+    "flow-typed": "^2.4.0",
+    "lerna": "2.9.0",
     "prettier": "^1.10.2",
-    "uglify-js": "^3.3.9"
+    "uglify-js": "^3.3.15"
   }
 }

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/common",
-  "version": "4.2.0",
+  "version": "4.7.3",
   "description": "Ledger Hardware Wallet Common",
   "keywords": [
     "Ledger",
@@ -23,20 +23,20 @@
   "license": "Apache-2.0",
   "dependencies": {
     "fbjs": "^0.8.16",
-    "invariant": "^2.2.2",
+    "invariant": "^2.2.4",
     "lodash": "^4.17.4",
     "normalizr-gre": "^3.2.4",
     "prop-types": "^15.5.10",
-    "query-string": "^5.0.0",
+    "query-string": "^6.0.0",
     "react": "^16.0.0",
     "react-redux": "^5.0.5",
     "redux": "^3.7.2",
     "redux-thunk": "^2.2.0"
   },
   "devDependencies": {
     "babel-jest": "^22.0.4",
-    "flow-bin": "^0.66.0",
-    "flow-typed": "^2.3.0",
+    "flow-bin": "^0.68.0",
+    "flow-typed": "^2.4.0",
     "jest": "^22.1.3",
     "react-test-renderer": "^16.2.0"
   },

packages/common/src/formatters/error.js

@@ -1,8 +1,8 @@
 //@flow
 
-export default (error: ?Error | string) => {
+export default (error: mixed) => {
   if (typeof error === "string") return error;
-  const genStr = ((error && error.message) || "").toString();
+  const genStr = String((error && error.message) || "");
   // u2f-api lib https://github.com/grantila/u2f-api/blob/1e75b41fd5d9d001e6ad2be2eda6b9b41d137a81/lib/u2f-api.js#L98
   if (error && typeof error.metaData === "object" && error.metaData) {
     const metaData = error.metaData;

packages/create-dapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-dapp",
-  "version": "4.1.0",
+  "version": "4.7.3",
   "description": "Create React Ethereum apps, ready to use with Ledger and MetaMask",
   "keywords": [
     "dapp",

packages/currencies/.flowconfig

@@ -4,6 +4,7 @@
 
 [libs]
 flow-typed
+flow
 
 [lints]
 

packages/currencies/.gitignore

@@ -0,0 +1,2 @@
+src/data/icons/react
+src/data/icons/reactNative

packages/currencies/flow/react-native-svg.js

@@ -0,0 +1,4 @@
+//@flow
+declare module "react-native-svg" {
+  declare module.exports: any;
+}

packages/currencies/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/currencies",
-  "version": "4.5.0",
+  "version": "4.10.1",
   "description": "Ledger Hardware Wallet currencies dataset",
   "keywords": [],
   "main": "lib/index.js",
@@ -23,15 +23,18 @@
   },
   "devDependencies": {
     "babel-jest": "^20.0.0",
-    "flow-bin": "^0.66.0",
-    "flow-typed": "^2.3.0",
-    "jest": "^20.0.0"
+    "flow-bin": "^0.68.0",
+    "flow-typed": "^2.4.0",
+    "glob": "^7.1.2",
+    "jest": "^20.0.0",
+    "path": "^0.12.7",
+    "svgr": "^1.9.0"
   },
   "scripts": {
     "flow": "flow",
     "test": "cd ../.. && export PATH=$(yarn bin):$PATH && cd - && jest",
-    "clean": "rm -rf lib/",
-    "build": "cd ../.. && export PATH=$(yarn bin):$PATH && cd - && babel --source-maps -d lib src && flow-copy-source -v src lib",
-    "watch": "cd ../.. && export PATH=$(yarn bin):$PATH && cd - && babel --watch --source-maps -d lib src & flow-copy-source -w -v src lib"
+    "clean": "rm -rf lib/ src/data/icons/react src/data/icons/reactNative",
+    "build": "node scripts/buildReactIcons.js && cd ../.. && export PATH=$(yarn bin):$PATH && cd - && babel --source-maps -d lib src && flow-copy-source -v src lib",
+    "watch": "node scripts/buildReactIcons.js && cd ../.. && export PATH=$(yarn bin):$PATH && cd - && babel --watch --source-maps -d lib src & flow-copy-source -w -v src lib"
   }
 }