grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[stable] Bump react-qr-reader (#7941)

Browse Source 
* Bump react-qr-reader

* Explicit add webrtc-adapter, non-napa qrcode-generator
This commit is contained in:
Jaco Greeff 2018-02-19 15:36:06 +01:00 committed by Rando
parent 78acefd35c
commit 6c50f9007a
3 changed files with 960 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

970
js/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

8
js/package.json
View File

@ -26,7 +26,6 @@
"Promise" "Promise"
], ],
"scripts": { "scripts": {
"install": "napa",
"analize": "npm run analize:lib && npm run analize:dll && npm run analize:app", "analize": "npm run analize:lib && npm run analize:dll && npm run analize:app",
"analize:app": "WPANALIZE=1 webpack --config webpack/app --json > .build/analize.app.json && cat .build/analize.app.json | webpack-bundle-size-analyzer", "analize:app": "WPANALIZE=1 webpack --config webpack/app --json > .build/analize.app.json && cat .build/analize.app.json | webpack-bundle-size-analyzer",
"analize:lib": "WPANALIZE=1 webpack --config webpack/libraries --json > .build/analize.lib.json && cat .build/analize.lib.json | webpack-bundle-size-analyzer", "analize:lib": "WPANALIZE=1 webpack --config webpack/libraries --json > .build/analize.lib.json && cat .build/analize.lib.json | webpack-bundle-size-analyzer",
@ -64,9 +63,6 @@
"test:npm": "(cd .npmjs && npm i) && node test/npmParity && node test/npmJsonRpc && (rm -rf .npmjs/node_modules)", "test:npm": "(cd .npmjs && npm i) && node test/npmParity && node test/npmJsonRpc && (rm -rf .npmjs/node_modules)",
"prepush": "npm run lint:cached" "prepush": "npm run lint:cached"
}, },
"napa": {
"qrcode-generator": "kazuhikoarase/qrcode-generator"
},
"devDependencies": { "devDependencies": {
"babel-cli": "6.23.0", "babel-cli": "6.23.0",
"babel-core": "6.23.1", "babel-core": "6.23.1",
@ -196,6 +192,7 @@
"promise-worker": "1.1.1", "promise-worker": "1.1.1",
"push.js": "0.0.11", "push.js": "0.0.11",
"qs": "6.3.0", "qs": "6.3.0",
"qrcode-generator": "1.3.1",
"react": "15.4.2", "react": "15.4.2",
"react-ace": "4.1.0", "react-ace": "4.1.0",
"react-addons-css-transition-group": "15.4.2", "react-addons-css-transition-group": "15.4.2",
@ -209,7 +206,7 @@
"react-intl": "2.1.5", "react-intl": "2.1.5",
"react-markdown": "2.4.4", "react-markdown": "2.4.4",
"react-portal": "3.0.0", "react-portal": "3.0.0",
"react-qr-reader": "1.1.3", "react-qr-reader": "2.0.1",
"react-redux": "4.4.6", "react-redux": "4.4.6",
"react-router": "3.0.0", "react-router": "3.0.0",
"react-router-redux": "4.0.7", "react-router-redux": "4.0.7",
@ -232,6 +229,7 @@
"valid-url": "1.0.9", "valid-url": "1.0.9",
"validator": "6.2.0", "validator": "6.2.0",
"web3": "0.17.0-beta", "web3": "0.17.0-beta",
"webrtc-adapter": "5.0.6",
"whatwg-fetch": "2.0.1", "whatwg-fetch": "2.0.1",
"worker-loader": "^0.8.0", "worker-loader": "^0.8.0",
"yarn": "^0.21.3", "yarn": "^0.21.3",

2
js/src/ui/QrCode/qrCode.js
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import qrcode from 'qrcode-generator/js/qrcode'; import qrcode from 'qrcode-generator/qrcode';
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { calculateType } from './qrSize'; import { calculateType } from './qrSize';