Skip to content

Commit

Permalink
Lint and update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
chaitanyapotti committed May 18, 2021
1 parent b30e833 commit e14735e
Show file tree
Hide file tree
Showing 8 changed files with 1,023 additions and 939 deletions.
3 changes: 3 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
> 1%
last 2 versions
not dead
9 changes: 6 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@
"airbnb-base",
"prettier"
],
"plugins": ["prettier", "babel", "promise", "import", "simple-import-sort"],
"parser": "babel-eslint",
"plugins": ["prettier", "@babel", "promise", "import", "simple-import-sort"],
"parser": "@babel/eslint-parser",
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 9
"ecmaVersion": 11,
"babelOptions": {
"configFile": "./babel.config.json"
}
},
"rules": {
"no-restricted-syntax": 0,
Expand Down
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
File renamed without changes.
1,898 changes: 990 additions & 908 deletions package-lock.json

Large diffs are not rendered by default.

45 changes: 19 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"prepack": "npm run build",
"test:e2e": "node ./test/e2e/puppeteer.js",
"test:e2e:headful": "node ./test/e2e/puppeteer.js false",
"test:build-embed": "mocha --exit ./test/compile/Web3Test.js"
"test:build-embed": "mocha --exit ./test/compile/Web3Test.js",
"prepare": "husky install"
},
"peerDependencies": {
"@babel/runtime": "7.x"
Expand All @@ -30,7 +31,7 @@
"@chaitanyapotti/random-id": "^1.0.3",
"@toruslabs/fetch-node-details": "^2.6.1",
"@toruslabs/http-helpers": "^1.3.7",
"@toruslabs/torus.js": "^2.3.0",
"@toruslabs/torus.js": "^2.3.1",
"create-hash": "^1.2.0",
"deepmerge": "^4.2.2",
"eth-rpc-errors": "^4.0.3",
Expand All @@ -46,18 +47,20 @@
"safe-event-emitter": "^1.0.1"
},
"devDependencies": {
"@babel/cli": "^7.13.16",
"@babel/core": "^7.14.0",
"@babel/cli": "^7.14.3",
"@babel/core": "^7.14.3",
"@babel/eslint-parser": "^7.14.3",
"@babel/eslint-plugin": "^7.13.16",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-object-rest-spread": "^7.13.8",
"@babel/plugin-transform-runtime": "^7.13.15",
"@babel/preset-env": "^7.14.0",
"@babel/plugin-proposal-object-rest-spread": "^7.14.2",
"@babel/plugin-transform-runtime": "^7.14.3",
"@babel/preset-env": "^7.14.2",
"@babel/runtime-corejs3": "^7.14.0",
"assert": "^2.0.0",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.2.2",
"cross-env": "^7.0.3",
"eslint": "^7.25.0",
"eslint": "^7.26.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^8.3.0",
"eslint-config-standard": "^16.0.2",
Expand All @@ -70,12 +73,12 @@
"eslint-plugin-promise": "^5.1.0",
"eslint-plugin-simple-import-sort": "^7.0.0",
"express": "^4.17.1",
"husky": "^4.3.8",
"lint-staged": "^10.5.4",
"mocha": "^8.3.2",
"husky": "^6.0.0",
"lint-staged": "^11.0.0",
"mocha": "^8.4.0",
"parallel-webpack": "^2.6.0",
"prettier": "^2.2.1",
"puppeteer": "^9.0.0",
"prettier": "^2.3.0",
"puppeteer": "^9.1.1",
"rimraf": "^3.0.2",
"uglifyify": "^5.0.2",
"webpack": "^4.44.1",
Expand All @@ -100,23 +103,13 @@
"url": "https://github.com/torusresearch/torus-embed/issues"
},
"homepage": "https://github.com/torusresearch/torus-embed#readme",
"browserslist": [
"> 1%",
"last 2 versions",
"not ie <= 8"
],
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.js": [
"npm run lint:js --",
"prettier --write 'src/**/*.js'"
"eslint --cache --fix",
"prettier --write"
],
"*.{json}": [
"prettier --write 'src/**/*.json'"
"prettier --write"
]
}
}
2 changes: 0 additions & 2 deletions scripts/update.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#! /bin/sh
git checkout binance && git pull
git checkout master && git pull
git checkout develop
git merge binance
git merge master --strategy-option theirs -m "Merged master"
git push

0 comments on commit e14735e

Please sign in to comment.