Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Thunnini committed Oct 16, 2020
2 parents edd89a3 + 73f1cd9 commit 0ed16f8
Show file tree
Hide file tree
Showing 33 changed files with 2,003 additions and 328 deletions.
398 changes: 315 additions & 83 deletions package-lock.json

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"scripts": {
"build": "cross-env NODE_ENV=production webpack",
"dev": "cross-env NODE_ENV=development webpack",
"test": "mocha --timeout 30000 -r ts-node/register 'src/**/*.spec.ts'",
"dev:analyzer": "cross-env NODE_ENV=development ANALYZER=true webpack",
"test": "cross-env TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha --timeout 30000 -r ts-node/register 'src/**/*.spec.ts'",
"lint-test": "eslint \"src/**/*\" webpack.config.js && prettier --check \"src/**/*\" webpack.config.js",
"lint-fix": "eslint --fix \"src/**/*\" webpack.config.js && prettier --write \"src/**/*\" webpack.config.js"
},
Expand All @@ -17,7 +18,9 @@
"author": "chainapsis",
"license": "Apache-2.0",
"dependencies": {
"@chainapsis/cosmosjs": "git+https://github.com/chainapsis/cosmosjs-dist.git#00d97d0",
"@chainapsis/cosmosjs": "git+https://github.com/chainapsis/cosmosjs-dist.git#9e94261",
"@cosmjs/encoding": "^0.23.0",
"@cosmjs/launchpad": "^0.23.0",
"@ensdomains/resolver": "^0.2.4",
"@fortawesome/fontawesome-free": "^5.11.2",
"@ledgerhq/hw-transport-webhid": "^5.23.0",
Expand All @@ -28,6 +31,7 @@
"bignumber.js": "^9.0.0",
"bip39": "^3.0.2",
"buffer": "^5.4.3",
"chart.js": "^2.9.3",
"classnames": "^2.2.6",
"delay": "^4.4.0",
"ethereum-ens": "^0.8.0",
Expand All @@ -41,6 +45,7 @@
"qrcode": "^1.4.4",
"query-string": "^6.8.3",
"react": "^16.9.0",
"react-chartjs-2": "^2.10.0",
"react-dom": "^16.9.0",
"react-hook-form": "^3.29.3",
"react-intl": "^3.9.3",
Expand All @@ -56,6 +61,7 @@
},
"devDependencies": {
"@types/aes-js": "^3.1.0",
"@types/chart.js": "^2.9.25",
"@types/chrome": "0.0.88",
"@types/classnames": "^2.2.9",
"@types/firefox-webext-browser": "^70.0.1",
Expand Down Expand Up @@ -95,6 +101,7 @@
"ts-node": "^8.5.2",
"typescript": "^3.7.2",
"webpack": "^4.39.2",
"webpack-bundle-analyzer": "^3.9.0",
"webpack-cli": "^3.3.7",
"webpack-dev-server": "^3.8.2",
"write-file-webpack-plugin": "^4.5.1"
Expand Down
Loading

0 comments on commit 0ed16f8

Please sign in to comment.