diff --git a/.eslintrc.js b/.eslintrc.js index 57f76fd..fd9298a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,17 +1 @@ -module.exports = { - env: { - es6: true, - node: true, - }, - extends: ['airbnb'], - plugins: ['chai-friendly'], - rules: { - 'no-unused-expressions': 0, - 'chai-friendly/no-unused-expressions': 2, - 'linebreak-style': ['error', 'unix'], - 'no-param-reassign': ['error', { props: false }], - 'func-style': ['error', 'declaration', { allowArrowFunctions: true }], - 'no-use-before-define': ['error', { functions: false }], - 'consistent-return': 0, - }, -}; +module.exports = { extends: 'coderdojo' }; diff --git a/package.json b/package.json index 392db8d..e559daf 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,8 @@ "devDependencies": { "chai": "^4.1.1", "code": "^1.5.0", - "eslint": "^4.5.0", - "eslint-config-airbnb": "^15.1.0", + "eslint": "^4.6.0", + "eslint-config-coderdojo": "^1.0.5", "eslint-plugin-chai-friendly": "^0.4.0", "eslint-plugin-import": "^2.7.0", "eslint-plugin-jsx-a11y": "^5.1.1", diff --git a/yarn.lock b/yarn.lock index aae39d9..b614351 100644 --- a/yarn.lock +++ b/yarn.lock @@ -696,8 +696,8 @@ error-ex@^1.2.0: is-arrayish "^0.2.1" es-abstract@^1.7.0: - version "1.8.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.8.1.tgz#fd85a3bdfa67786ce7be7e1584678e119cd70c04" + version "1.8.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.8.2.tgz#25103263dc4decbda60e0c737ca32313518027ee" dependencies: es-to-primitive "^1.1.1" function-bind "^1.1.1" @@ -737,6 +737,12 @@ eslint-config-airbnb@^15.1.0: dependencies: eslint-config-airbnb-base "^11.3.0" +eslint-config-coderdojo@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/eslint-config-coderdojo/-/eslint-config-coderdojo-1.0.5.tgz#1083df24ac80ac2fe2ddf6f3bc7ee1c1ba098afc" + dependencies: + eslint-config-airbnb "^15.1.0" + eslint-config-hapi@10.x.x: version "10.1.0" resolved "https://registry.yarnpkg.com/eslint-config-hapi/-/eslint-config-hapi-10.1.0.tgz#e65720917575da292c4ffe8d59ad9aa4e5b0a2ac" @@ -815,7 +821,7 @@ eslint-scope@^3.7.1: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint@4.5.x, eslint@^4.5.0: +eslint@4.5.x: version "4.5.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.5.0.tgz#bb75d3b8bde97fb5e13efcd539744677feb019c3" dependencies: @@ -857,6 +863,48 @@ eslint@4.5.x, eslint@^4.5.0: table "^4.0.1" text-table "~0.2.0" +eslint@^4.6.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.6.1.tgz#ddc7fc7fd70bf93205b0b3449bb16a1e9e7d4950" + dependencies: + ajv "^5.2.0" + babel-code-frame "^6.22.0" + chalk "^2.1.0" + concat-stream "^1.6.0" + cross-spawn "^5.1.0" + debug "^2.6.8" + doctrine "^2.0.0" + eslint-scope "^3.7.1" + espree "^3.5.0" + esquery "^1.0.0" + estraverse "^4.2.0" + esutils "^2.0.2" + file-entry-cache "^2.0.0" + functional-red-black-tree "^1.0.1" + glob "^7.1.2" + globals "^9.17.0" + ignore "^3.3.3" + imurmurhash "^0.1.4" + inquirer "^3.0.6" + is-resolvable "^1.0.0" + js-yaml "^3.9.1" + json-stable-stringify "^1.0.1" + levn "^0.3.0" + lodash "^4.17.4" + minimatch "^3.0.2" + mkdirp "^0.5.1" + natural-compare "^1.4.0" + optionator "^0.8.2" + path-is-inside "^1.0.2" + pluralize "^4.0.0" + progress "^2.0.0" + require-uncached "^1.0.3" + semver "^5.3.0" + strip-ansi "^4.0.0" + strip-json-comments "~2.0.1" + table "^4.0.1" + text-table "~0.2.0" + espree@3.5.x, espree@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.0.tgz#98358625bdd055861ea27e2867ea729faf463d8d" @@ -948,8 +996,8 @@ fast-levenshtein@~2.0.4: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" fbjs@^0.8.9: - version "0.8.14" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.14.tgz#d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c" + version "0.8.15" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.15.tgz#4f0695fdfcc16c37c0b07facec8cb4c4091685b9" dependencies: core-js "^1.0.0" isomorphic-fetch "^2.1.1" @@ -1315,10 +1363,14 @@ http-signature@~1.1.0: jsprim "^1.2.2" sshpk "^1.7.0" -iconv-lite@^0.4.11, iconv-lite@^0.4.17, iconv-lite@~0.4.13: +iconv-lite@^0.4.11, iconv-lite@^0.4.17: version "0.4.18" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2" +iconv-lite@~0.4.13: + version "0.4.19" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" + ignore-by-default@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" @@ -2026,8 +2078,8 @@ no-arrowception@1.x.x: resolved "https://registry.yarnpkg.com/no-arrowception/-/no-arrowception-1.0.0.tgz#5bf3e95eb9c41b57384a805333daa3b734ee327a" node-fetch@^1.0.1: - version "1.7.2" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.2.tgz#c54e9aac57e432875233525f3c891c4159ffefd7" + version "1.7.3" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" dependencies: encoding "^0.1.11" is-stream "^1.0.1"