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

[beta] Bump react-qr-reader (#7943)

Browse Source 
* [beta] Update react-qr-reader

* Explicit webrtc-adapter dependency (package-lock workaround)

* iframe with allow (QR, new Chrome policy)
This commit is contained in:
Jaco Greeff 2018-02-19 14:28:31 +01:00 committed by Rando
parent 6a29fea23c
commit 9d697c5d0a
4 changed files with 103 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
js-old/package-lock.json generated
View File

@ -7522,7 +7522,7 @@
}
},
"jsqr": {
"version": "git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b"
"version": "git+https://github.com/cozmo/jsQR.git#1fb946a235abdc7709f04cd0e4aa316a3b6eae70"
},
"jsx-ast-utils": {
"version": "1.4.1",
@ -10576,13 +10576,29 @@
}
},
"react-qr-reader": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-1.1.3.tgz",
"integrity": "sha512-ruBF8KaSwUW9nbzjO4rA7/HOCGYZuNUz9od7uBRy8SRBi24nwxWWmwa2z8R6vPGDRglA0y2Qk1aVBuC1olTnHw==",
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-2.0.1.tgz",
"integrity": "sha512-J/VuCq/udEqry7Z4nXGTbguetfSdRJr1Cv0lYKbVKIW1blfhB0Xe6OjO+5Th5B8884+s40BDFwtqP67h7YTtYA==",
"requires": {
"jsqr": "git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b",
"jsqr": "git+https://github.com/cozmo/jsQR.git#1fb946a235abdc7709f04cd0e4aa316a3b6eae70",
"prop-types": "15.6.0",
"webrtc-adapter": "2.1.0"
"webrtc-adapter": "5.0.6"
},
"dependencies": {
"sdp": {
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/sdp/-/sdp-2.6.0.tgz",
"integrity": "sha512-/q5nUDSqvfh+P5pvb4Ez1IsF6F9aLLgslHrSDSltqvUuS7raTY9ROjbGJTyvGSYRs99FY59c8Od1lT7WVaiNAw=="
},
"webrtc-adapter": {
"version": "5.0.6",
"resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-5.0.6.tgz",
"integrity": "sha512-dh2hPQFOPP0tLEYlFxtGI5vuQmRqkOdYni5wMKUHIx5I2dw0TJ1HdG7P+UechRWt6TvwPWhtbjVNQcQf1KXJmQ==",
"requires": {
"rtcpeerconnection-shim": "1.2.8",
"sdp": "2.6.0"
}
}
}
},
"react-redux": {
@ -11221,6 +11237,21 @@
"resolved": "https://registry.npmjs.org/rlp/-/rlp-2.0.0.tgz",
"integrity": "sha1-nbOE/0uJqPYVY9kjldhiWxjzr7A="
},
"rtcpeerconnection-shim": {
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.8.tgz",
"integrity": "sha512-5Sx90FGru1sQw9aGOM+kHU4i6mbP8eJPgxliu2X3Syhg8qgDybx8dpDTxUwfJvPnubXFnZeRNl59DWr4AttJKQ==",
"requires": {
"sdp": "2.6.0"
},
"dependencies": {
"sdp": {
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/sdp/-/sdp-2.6.0.tgz",
"integrity": "sha512-/q5nUDSqvfh+P5pvb4Ez1IsF6F9aLLgslHrSDSltqvUuS7raTY9ROjbGJTyvGSYRs99FY59c8Od1lT7WVaiNAw=="
}
}
},
"rucksack-css": {
"version": "0.9.1",
"resolved": "https://registry.npmjs.org/rucksack-css/-/rucksack-css-0.9.1.tgz",
@ -11304,9 +11335,9 @@
"integrity": "sha1-Jiw28CMc+nZU4jY/o5TNLexm83g="
},
"sdp": {
"version": "1.5.4",
"resolved": "https://registry.npmjs.org/sdp/-/sdp-1.5.4.tgz",
"integrity": "sha1-jgOPbdsUvXZa4fS1IW4SCUUR4NA="
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/sdp/-/sdp-2.6.0.tgz",
"integrity": "sha512-/q5nUDSqvfh+P5pvb4Ez1IsF6F9aLLgslHrSDSltqvUuS7raTY9ROjbGJTyvGSYRs99FY59c8Od1lT7WVaiNAw=="
},
"secp256k1": {
"version": "3.4.0",
@ -13171,11 +13202,12 @@
}
},
"webrtc-adapter": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-2.1.0.tgz",
"integrity": "sha1-YStbxs6Oc8nQZgA4oh+SVahnvz4=",
"version": "5.0.6",
"resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-5.0.6.tgz",
"integrity": "sha512-dh2hPQFOPP0tLEYlFxtGI5vuQmRqkOdYni5wMKUHIx5I2dw0TJ1HdG7P+UechRWt6TvwPWhtbjVNQcQf1KXJmQ==",
"requires": {
"sdp": "1.5.4"
"rtcpeerconnection-shim": "1.2.8",
"sdp": "2.6.0"
}
},
"websocket": {

3
js-old/package.json
View File

@ -179,7 +179,7 @@
"react-intl": "2.1.5",
"react-markdown": "2.4.4",
"react-portal": "3.0.0",
"react-qr-reader": "1.1.3",
"react-qr-reader": "2.0.1",
"react-redux": "4.4.6",
"react-router": "3.0.0",
"react-router-redux": "4.0.7",
@ -201,6 +201,7 @@
"utf8": "2.1.2",
"valid-url": "1.0.9",
"validator": "6.2.0",
"webrtc-adapter": "5.0.6",
"whatwg-fetch": "2.0.1",
"worker-loader": "^0.8.0",
"zxcvbn": "4.4.1"

88
js/package-lock.json generated
View File

@ -49,9 +49,9 @@
"dev": true,
"requires": {
"@parity/api": "2.1.15",
"@parity/mobx": "1.0.7",
"@parity/mobx": "1.1.2",
"@parity/ui": "3.0.22",
"mobx": "3.4.1",
"mobx": "3.5.1",
"mobx-react": "4.3.5",
"prop-types": "15.6.0",
"react": "16.2.0",
@ -62,19 +62,27 @@
"semantic-ui-react": "0.77.2"
},
"dependencies": {
"@parity/jsonrpc": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@parity/jsonrpc/-/jsonrpc-2.1.5.tgz",
"integrity": "sha512-M6aLgssTfqloNgVFuzxSQ3J5RJ5T9g4a4wka1QVumaud7e4ubFjuJgR0F+0aQ/H1zdiTSMDHSmoaeAp8UoE4fA==",
"dev": true
},
"@parity/mobx": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.0.7.tgz",
"integrity": "sha512-HC9VFcFnZ+h/YZWSiA2vIJcXK2yhLNFipPxAIMkDMClgNX9sOxrItmjmTfETAlHVM/axO2FIluLCd3VO/Xze8w==",
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.1.2.tgz",
"integrity": "sha512-ctAYYGYVVWwoPjn1TdWMdKZRLEGgcgUvSLUFrHbr+IBq3T+2fUedMLcIxGzEOatd/Y7s+YKvk9S1TcT954GH8g==",
"dev": true,
"requires": {
"@parity/ledger": "2.1.2"
"@parity/jsonrpc": "2.1.5",
"@parity/ledger": "2.1.2",
"@parity/shared": "2.2.23"
}
},
"mobx": {
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/mobx/-/mobx-3.4.1.tgz",
"integrity": "sha1-N6vl7ogtQBgo2fJsbBovR2FLu+8=",
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/mobx/-/mobx-3.5.1.tgz",
"integrity": "sha1-jmguxTXPROBABbnjfi32asyXWkI=",
"dev": true
},
"prop-types": {
@ -132,9 +140,9 @@
"dev": true,
"requires": {
"@parity/api": "2.1.15",
"@parity/mobx": "1.0.7",
"@parity/mobx": "1.1.2",
"@parity/ui": "3.0.22",
"mobx": "3.4.1",
"mobx": "3.5.1",
"mobx-react": "4.3.5",
"prop-types": "15.6.0",
"react": "16.2.0",
@ -145,19 +153,27 @@
"semantic-ui-react": "0.77.2"
},
"dependencies": {
"@parity/jsonrpc": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@parity/jsonrpc/-/jsonrpc-2.1.5.tgz",
"integrity": "sha512-M6aLgssTfqloNgVFuzxSQ3J5RJ5T9g4a4wka1QVumaud7e4ubFjuJgR0F+0aQ/H1zdiTSMDHSmoaeAp8UoE4fA==",
"dev": true
},
"@parity/mobx": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.0.7.tgz",
"integrity": "sha512-HC9VFcFnZ+h/YZWSiA2vIJcXK2yhLNFipPxAIMkDMClgNX9sOxrItmjmTfETAlHVM/axO2FIluLCd3VO/Xze8w==",
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.1.2.tgz",
"integrity": "sha512-ctAYYGYVVWwoPjn1TdWMdKZRLEGgcgUvSLUFrHbr+IBq3T+2fUedMLcIxGzEOatd/Y7s+YKvk9S1TcT954GH8g==",
"dev": true,
"requires": {
"@parity/ledger": "2.1.2"
"@parity/jsonrpc": "2.1.5",
"@parity/ledger": "2.1.2",
"@parity/shared": "2.2.23"
}
},
"mobx": {
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/mobx/-/mobx-3.4.1.tgz",
"integrity": "sha1-N6vl7ogtQBgo2fJsbBovR2FLu+8=",
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/mobx/-/mobx-3.5.1.tgz",
"integrity": "sha1-jmguxTXPROBABbnjfi32asyXWkI=",
"dev": true
},
"prop-types": {
@ -235,10 +251,10 @@
"dev": true,
"requires": {
"@parity/api": "2.1.15",
"@parity/mobx": "1.0.7",
"@parity/mobx": "1.1.2",
"@parity/ui": "3.0.22",
"format-number": "3.0.0",
"mobx": "3.4.1",
"mobx": "3.5.1",
"mobx-react": "4.3.5",
"prop-types": "15.6.0",
"react": "16.2.0",
@ -250,19 +266,27 @@
"semantic-ui-react": "0.77.0"
},
"dependencies": {
"@parity/jsonrpc": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@parity/jsonrpc/-/jsonrpc-2.1.5.tgz",
"integrity": "sha512-M6aLgssTfqloNgVFuzxSQ3J5RJ5T9g4a4wka1QVumaud7e4ubFjuJgR0F+0aQ/H1zdiTSMDHSmoaeAp8UoE4fA==",
"dev": true
},
"@parity/mobx": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.0.7.tgz",
"integrity": "sha512-HC9VFcFnZ+h/YZWSiA2vIJcXK2yhLNFipPxAIMkDMClgNX9sOxrItmjmTfETAlHVM/axO2FIluLCd3VO/Xze8w==",
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.1.2.tgz",
"integrity": "sha512-ctAYYGYVVWwoPjn1TdWMdKZRLEGgcgUvSLUFrHbr+IBq3T+2fUedMLcIxGzEOatd/Y7s+YKvk9S1TcT954GH8g==",
"dev": true,
"requires": {
"@parity/ledger": "2.1.2"
"@parity/jsonrpc": "2.1.5",
"@parity/ledger": "2.1.2",
"@parity/shared": "2.2.23"
}
},
"mobx": {
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/mobx/-/mobx-3.4.1.tgz",
"integrity": "sha1-N6vl7ogtQBgo2fJsbBovR2FLu+8=",
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/mobx/-/mobx-3.5.1.tgz",
"integrity": "sha1-jmguxTXPROBABbnjfi32asyXWkI=",
"dev": true
},
"prop-types": {
@ -9045,6 +9069,9 @@
"verror": "1.10.0"
}
},
"jsqr": {
"version": "git+https://github.com/cozmo/jsQR.git#1fb946a235abdc7709f04cd0e4aa316a3b6eae70"
},
"jsx-ast-utils": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
@ -12850,14 +12877,9 @@
"resolved": "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-2.0.1.tgz",
"integrity": "sha512-J/VuCq/udEqry7Z4nXGTbguetfSdRJr1Cv0lYKbVKIW1blfhB0Xe6OjO+5Th5B8884+s40BDFwtqP67h7YTtYA==",
"requires": {
"jsqr": "git+https://github.com/cozmo/jsQR.git#397a6eb8f90752cf640cb4bb67ba6f86e3bb5d1f",
"jsqr": "git+https://github.com/cozmo/jsQR.git#1fb946a235abdc7709f04cd0e4aa316a3b6eae70",
"prop-types": "15.5.10",
"webrtc-adapter": "5.0.6"
},
"dependencies": {
"jsqr": {
"version": "git+https://github.com/cozmo/jsQR.git#397a6eb8f90752cf640cb4bb67ba6f86e3bb5d1f"
}
}
},
"react-redux": {

1
js/src/Dapp/dapp.js
View File

@ -135,6 +135,7 @@ export default class Dapp extends Component {
return (
<iframe
allow='camera'
className={ styles.frame }
frameBorder={ 0 }
id='dappFrame'