Skip to content

Commit

Permalink
Merge pull request JoinColony#820 from JoinColony/greenkeeper/@colony…
Browse files Browse the repository at this point in the history
…/eslint-config-colony-8.0.1

Update @colony/eslint-config-colony to the latest version 🚀
  • Loading branch information
area authored Mar 18, 2020
2 parents 53d2110 + 5df5f9f commit f16c34b
Show file tree
Hide file tree
Showing 6 changed files with 202 additions and 78 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2

job_common: &job_common
docker:
- image: circleci/node:10.12-stretch
- image: circleci/node:10.19-stretch
working_directory: ~/colonyNetwork
job_python: &job_python
docker:
Expand All @@ -19,9 +19,9 @@ step_restore_cache: &step_restore_cache
- node-modules-{{ checksum "yarn.lock" }}
step_setup_global_packages: &step_setup_global_packages
run:
name: "Set up global packages" # Can remove --ignore-engines once node is bumped to 10.13.0
name: "Set up global packages"
command: |
yarn --pure-lockfile --network-concurrency 1 --ignore-engines
yarn --pure-lockfile --network-concurrency 1
git submodule update --remote --init
yarn run provision:token:contracts
step_pull_solc_docker: &step_pull_solc_docker
Expand Down
4 changes: 2 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"import/no-extraneous-dependencies": [2, {"devDependencies": ["**/*.js"]}],
"max-len": [2, { "code": 150, "ignoreComments": true }],
"prettier/prettier": ["error", {"printWidth": 150}],
"flowtype/require-valid-file-annotation": "off",
"import/named": "off",
"func-names": "off",
"no-console": "off",
"no-unused-expressions": "off",
"eslint-comments/no-unlimited-disable": "off",
Expand All @@ -25,6 +25,6 @@
"space-infix-ops": ["error"]
},
"parserOptions": {
"ecmaVersion": 2017
"ecmaVersion": 2018
}
}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.12
10.19
2 changes: 1 addition & 1 deletion helpers/test-data-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
import { getTokenArgs, web3GetAccounts, getChildSkillIndex } from "./test-helper";
import { executeSignedTaskChange, executeSignedRoleAssignment } from "./task-review-signing";

const { setupColonyVersionResolver, setupUpgradableTokenLocking } = require("../helpers/upgradable-contracts");
const { setupColonyVersionResolver, setupUpgradableTokenLocking } = require("./upgradable-contracts");

const IColony = artifacts.require("IColony");
const IMetaColony = artifacts.require("IMetaColony");
Expand Down
15 changes: 6 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,18 @@
"@babel/register": "^7.8.3",
"@codechecks/client": "^0.1.5",
"@colony/colony-js-contract-loader-fs": "1.12.0",
"@colony/eslint-config-colony": "8.0.0",
"@colony/eslint-config-colony": "8.0.1",
"async-request": "^1.2.0",
"babel-eslint": "^10.0.1",
"babel-plugin-istanbul": "^6.0.0",
"bignumber.js": "^9.0.0",
"bn-chai": "^1.0.1",
"bn.js": "^4.11.8",
"chai": "^4.2.0",
"eslint": "5.16.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-config-prettier": "^6.0.0",
"eslint-import-resolver-jest": "^3.0.0",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.1.0",
"eslint-config-prettier": "^6.10.0",
"eslint-plugin-eslint-comments": "^3.1.2",
"eslint-plugin-flowtype": "^4.5.2",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-prettier": "^3.1.2",
"eth-ens-namehash": "^2.0.8",
"eth-gas-reporter": "^0.2.15",
Expand All @@ -93,7 +90,7 @@
"ethlint": "^1.2.4",
"find-in-files": "^0.5.0",
"ganache-cli": "^6.7.0",
"husky": "^4.0.2",
"husky": "^4.2.3",
"istanbul": "^0.4.5",
"jsonfile": "^6.0.0",
"mocha": "^7.0.1",
Expand Down
Loading

0 comments on commit f16c34b

Please sign in to comment.