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

Bump dependencies (#1478) 

* Upgrade dependencies without breaking changes

* Update electron and gnosis dependencies with minor changes

* Upgrade dependencies with minor changes and remove unnecessary electron dependency

* Upgrade truffle-contract to latest @truffle/contract
This commit is contained in:
Daniel Sanchez 2020-10-15 17:01:12 +02:00 committed by GitHub
parent 14e94ad877
commit eab0e73ac6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 762 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-overrides.js
View File

@ -5,7 +5,7 @@ module.exports = function override(config) {
config.plugins = []
}
config.plugins.push(
new webpack.ContextReplacementPlugin(/truffle-(contract|interface-adapter)/, (data) => {
new webpack.ContextReplacementPlugin(/@truffle\/(contract|interface-adapter)/, (data) => {
delete data.dependencies[0].critical
return data
}),

41
package.json
View File

@ -164,37 +164,38 @@
]
},
"dependencies": {
"@gnosis.pm/safe-apps-sdk": "0.4.0",
"@gnosis.pm/safe-apps-sdk": "0.4.2",
"@gnosis.pm/safe-contracts": "1.1.1-dev.2",
"@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#1bf397f",
"@gnosis.pm/util-contracts": "2.0.6",
"@ledgerhq/hw-transport-node-hid": "5.22.0",
"@ledgerhq/hw-transport-node-hid": "5.26.0",
"@material-ui/core": "4.11.0",
"@material-ui/icons": "4.9.1",
"@material-ui/lab": "4.0.0-alpha.56",
"@openzeppelin/contracts": "3.1.0",
"@truffle/contract": "4.2.25",
"async-sema": "^3.1.0",
"axios": "0.20.0",
"bignumber.js": "9.0.0",
"bnc-onboard": "1.13.1",
"bignumber.js": "9.0.1",
"bnc-onboard": "1.13.2",
"classnames": "^2.2.6",
"concurrently": "^5.3.0",
"connected-react-router": "6.8.0",
"coveralls": "^3.1.0",
"currency-flags": "2.1.2",
"date-fns": "2.15.0",
"date-fns": "2.16.1",
"detect-port": "^1.3.0",
"electron-is-dev": "^1.2.0",
"electron-log": "4.2.4",
"electron-settings": "^4.0.2",
"electron-updater": "4.3.4",
"electron-updater": "4.3.5",
"eth-sig-util": "^2.5.3",
"ethereum-blockies-base64": "^1.0.2",
"ethereumjs-abi": "0.6.8",
"exponential-backoff": "^3.1.0",
"express": "^4.17.1",
"final-form": "^4.20.1",
"final-form-calculate": "^1.3.1",
"final-form-calculate": "^1.3.2",
"history": "4.10.1",
"immortal-db": "^1.1.0",
"immutable": "^4.0.0-rc.12",
@ -203,16 +204,15 @@
"lodash.memoize": "^4.1.2",
"material-ui-search-bar": "^1.0.0",
"notistack": "https://github.com/gnosis/notistack.git#v0.9.4",
"open": "^7.2.0",
"polished": "3.6.7",
"qrcode.react": "1.0.0",
"query-string": "6.13.1",
"query-string": "6.13.5",
"react": "16.13.1",
"react-dom": "16.13.1",
"react-final-form": "^6.5.1",
"react-final-form-listeners": "^1.0.2",
"react-ga": "3.1.2",
"react-hot-loader": "4.12.21",
"react-hot-loader": "4.13.0",
"react-qr-reader": "^2.2.1",
"react-redux": "7.2.1",
"react-router-dom": "5.2.0",
@ -225,7 +225,6 @@
"reselect": "^4.0.0",
"semver": "7.3.2",
"styled-components": "^5.2.0",
"truffle-contract": "4.0.31",
"web3": "1.2.9",
"web3-core": "^1.2.11",
"web3-eth-contract": "^1.2.11",
@ -243,12 +242,12 @@
"@types/history": "4.6.2",
"@types/jest": "^26.0.14",
"@types/lodash.memoize": "^4.1.6",
"@types/node": "14.11.2",
"@types/react": "^16.9.49",
"@types/node": "^14.11.8",
"@types/react": "^16.9.52",
"@types/react-dom": "^16.9.6",
"@types/react-redux": "^7.1.9",
"@types/react-router-dom": "^5.1.5",
"@types/styled-components": "^5.1.3",
"@types/react-router-dom": "^5.1.6",
"@types/styled-components": "^5.1.4",
"@typescript-eslint/eslint-plugin": "3.9.1",
"@typescript-eslint/parser": "3.9.1",
"autoprefixer": "9.8.6",
@ -256,18 +255,18 @@
"dotenv": "^8.2.0",
"dotenv-expand": "^5.1.0",
"electron": "9.3.1",
"electron-builder": "22.8.0",
"electron-builder": "22.8.1",
"electron-notarize": "1.0.0",
"eslint": "6.8.0",
"eslint-config-prettier": "6.11.0",
"eslint-plugin-import": "2.22.0",
"eslint-config-prettier": "6.12.0",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.6",
"eslint-plugin-react": "^7.21.4",
"eslint-plugin-sort-destructure-keys": "1.3.5",
"ethereumjs-abi": "0.6.8",
"husky": "^4.2.5",
"lint-staged": "10.4.0",
"husky": "^4.3.0",
"lint-staged": "^10.4.0",
"node-sass": "^4.14.1",
"prettier": "2.1.2",
"react-app-rewired": "^2.1.6",

9
public/electron.js
View File

@ -1,6 +1,5 @@
const electron = require('electron')
const express = require('express')
const open = require('open')
const log = require('electron-log')
const fs = require('fs')
const Menu = electron.Menu
@ -8,9 +7,7 @@ const https = require('https')
const detect = require('detect-port')
const autoUpdater = require('./auto-updater')
const app = electron.app
const session = electron.session
const BrowserWindow = electron.BrowserWindow
const { app, session, BrowserWindow, shell } = electron
const path = require('path')
const isDev = require('electron-is-dev')
@ -72,7 +69,7 @@ function getOpenedWindow(url, options) {
show: false,
})
win.webContents.on('new-window', function (event, url) {
if (url.includes('trezor') && url.includes('bridge')) open(url)
if (url.includes('trezor') && url.includes('bridge')) shell.openExternal(url)
})
win.once('ready-to-show', () => win.show())
@ -124,7 +121,7 @@ function createWindow(port = DEFAULT_PORT) {
}
event.newGuest = win
} else open(url)
} else shell.openExternal(url)
})
mainWindow.webContents.on('did-finish-load', () => {

2
src/logic/contracts/safeContracts.ts
View File

@ -1,5 +1,5 @@
import { AbiItem } from 'web3-utils'
import contract from 'truffle-contract'
import contract from '@truffle/contract/index.js'
import Web3 from 'web3'
import ProxyFactorySol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafeProxyFactory.json'
import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'

2
src/logic/tokens/store/actions/fetchTokens.ts
View File

@ -3,7 +3,7 @@ import HumanFriendlyToken from '@gnosis.pm/util-contracts/build/contracts/HumanF
import ERC20Detailed from '@openzeppelin/contracts/build/contracts/ERC20Detailed.json'
import ERC721 from '@openzeppelin/contracts/build/contracts/ERC721.json'
import { List } from 'immutable'
import contract from 'truffle-contract'
import contract from '@truffle/contract/index.js'
import saveTokens from './saveTokens'

915
yarn.lock
View File

File diff suppressed because it is too large Load Diff