status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bignumber.js dependency clash 

```
warning Pattern ["bignumber.js@github:status-im/bignumber.js#master"] is trying to unpack in the same destination "/home/pedro/.cache/yarn/v4/npm-bignumber-js-4.0.2-cc066a0a3d6bfe0c436c9957f4ea8344bf963c89/node_modules/bignumber.js" as pattern ["bignumber.js@https://github.com/status-im/bignumber.js.git"]. This could result in non-deterministic behavior, skipping.
```
This commit is contained in:
Pedro Pombeiro 2019-01-14 10:42:29 +01:00
parent 7c8256234d
commit c9c39828fc
No known key found for this signature in database
GPG Key ID: A65DEB11E4BBC647
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
desktop_files/package.json.orig
View File

@ -28,16 +28,10 @@
"../../../../../resources/fonts/Inter-UI-Regular.otf"
],
"dependencies": {
"@babel/core": "7.0.1",
"@babel/generator": "7.0.0",
"@babel/helper-builder-react-jsx": "7.0.0",
"@babel/plugin-transform-block-scoping": "7.0.0",
"@babel/preset-env": "7.1.0",
"@babel/register": "7.0.0",
"assert": "1.4.1",
"asyncstorage-down": "4.0.1",
"babel-preset-react-native": "5.0.2",
"bignumber.js": "github:status-im/bignumber.js#master",
"bignumber.js": "git+https://github.com/status-im/bignumber.js.git#v4.0.2-status",
"buffer": "3.6.0",
"chance": "1.0.12",
"create-react-class": "15.6.2",
@ -85,7 +79,7 @@
"react-native-webview-bridge": "github:status-im/react-native-webview-bridge#react-native-0.49-desktop",
"realm": "git+https://github.com/status-im/realm-js.git#heads/v2.20.1",
"rn-snoopy": "github:status-im/rn-snoopy",
"status-conan": "git+https://github.com/status-im/status-conan.git#master",
"status-conan": "git+https://github.com/status-im/status-conan.git#v1.0.0",
"string_decoder": "0.10.31",
"text-encoding": "^0.6.4",
"url": "0.10.3",
@ -93,6 +87,12 @@
"web3-utils": "1.0.0-beta.36"
},
"devDependencies": {
"@babel/core": "7.0.1",
"@babel/generator": "7.0.0",
"@babel/helper-builder-react-jsx": "7.0.0",
"@babel/plugin-transform-block-scoping": "7.0.0",
"@babel/preset-env": "7.1.0",
"@babel/register": "7.0.0",
"patch-package": "^5.1.1"
},
"optionalDependencies": {

10
desktop_files/yarn.lock
View File

@ -1863,9 +1863,9 @@ big-integer@^1.6.7:
resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.40.tgz#02e4cd4d6e266c4d9ece2469c05cb6439149fc78"
integrity sha512-CjhtJp0BViLzP1ZkEnoywjgtFQXS2pomKjAJtIISTCnuHILkLcAXLdFLG/nxsHc4s9kJfc+82Xpg8WNyhfACzQ==
"bignumber.js@github:status-im/bignumber.js#master":
"bignumber.js@git+https://github.com/status-im/bignumber.js.git#v4.0.2-status":
version "4.0.2"
resolved "https://codeload.github.com/status-im/bignumber.js/tar.gz/cc066a0a3d6bfe0c436c9957f4ea8344bf963c89"
resolved "git+https://github.com/status-im/bignumber.js.git#cc066a0a3d6bfe0c436c9957f4ea8344bf963c89"
binaryextensions@~1.0.0:
version "1.0.1"
@ -8223,7 +8223,7 @@ static-extend@^0.1.1:
define-property "^0.2.5"
object-copy "^0.1.0"
"status-conan@git+https://github.com/status-im/status-conan.git#master":
"status-conan@git+https://github.com/status-im/status-conan.git#v1.0.0":
version "1.0.0"
resolved "git+https://github.com/status-im/status-conan.git#47a1b8264cd321ed3122762e9a07a6df1dea5d8e"
@ -9110,9 +9110,9 @@ web3-utils@1.0.0-beta.36:
"web3@https://github.com/status-im/web3.js.git#features/pairing-message":
version "0.20.1"
resolved "https://github.com/status-im/web3.js.git#5fd0b24fd10ce55183a5253a370840540a07db1e"
resolved "https://github.com/status-im/web3.js.git#dad342dc95f7d5a888411ed57c9618937e2b6ebd"
dependencies:
bignumber.js "github:status-im/bignumber.js#master"
bignumber.js "git+https://github.com/status-im/bignumber.js.git#v4.0.2-status"
crypto-js "^3.1.4"
utf8 "^2.1.1"
xhr2 "*"

6
mobile_files/package.json.orig
View File

@ -14,8 +14,7 @@
"@tradle/react-native-http": "2.0.1",
"assert": "1.4.1",
"asyncstorage-down": "4.0.1",
"babel-preset-react-native": "5.0.2",
"bignumber.js": "git+https://github.com/status-im/bignumber.js.git",
"bignumber.js": "git+https://github.com/status-im/bignumber.js.git#v4.0.2-status",
"buffer": "3.6.0",
"chance": "1.0.12",
"create-react-class": "15.6.2",
@ -68,5 +67,8 @@
"url": "0.10.3",
"web3": "git+https://github.com/status-im/web3.js.git#features/pairing-message",
"web3-utils": "1.0.0-beta.36"
},
"devDependencies": {
"@babel/core": "7.0.0-beta.47"
}
}

2
mobile_files/yarn.lock
View File

@ -2080,7 +2080,7 @@ big-integer@^1.6.7:
resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.40.tgz#02e4cd4d6e266c4d9ece2469c05cb6439149fc78"
integrity sha512-CjhtJp0BViLzP1ZkEnoywjgtFQXS2pomKjAJtIISTCnuHILkLcAXLdFLG/nxsHc4s9kJfc+82Xpg8WNyhfACzQ==
"bignumber.js@git+https://github.com/status-im/bignumber.js.git", "bignumber.js@git+https://github.com/status-im/bignumber.js.git#v4.0.2-status":
"bignumber.js@git+https://github.com/status-im/bignumber.js.git#v4.0.2-status":
version "4.0.2"
resolved "git+https://github.com/status-im/bignumber.js.git#cc066a0a3d6bfe0c436c9957f4ea8344bf963c89"