aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-06-22 03:40:09 +0800
committerDan Finlay <dan@danfinlay.com>2016-06-22 03:40:09 +0800
commit45506d6758e284aa6f5c128b12dea55f229f65e6 (patch)
tree2aeb64583c28356e781d2c49874dc7062a13f766
parent7b9a1197c8efe0a33d107c38e94871485831ec89 (diff)
downloadtangerine-wallet-browser-45506d6758e284aa6f5c128b12dea55f229f65e6.tar.gz
tangerine-wallet-browser-45506d6758e284aa6f5c128b12dea55f229f65e6.tar.zst
tangerine-wallet-browser-45506d6758e284aa6f5c128b12dea55f229f65e6.zip
Got eslint running correctly
-rw-r--r--.eslintrc (renamed from .eslint)20
-rw-r--r--.nvmrc1
-rw-r--r--gulpfile.js4
-rw-r--r--package.json1
4 files changed, 16 insertions, 10 deletions
diff --git a/.eslint b/.eslintrc
index ae59af478..c7e01d8ce 100644
--- a/.eslint
+++ b/.eslintrc
@@ -1,20 +1,26 @@
{
+ "parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 6,
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"impliedStrict": true,
+ "modules": true,
+ "blockBindings": true,
+ "arrowFunctions": true,
+ "objectLiteralShorthandMethods": true,
+ "objectLiteralShorthandProperties": true,
+ "templateStrings": true
},
},
"env": {
"es6": true,
- "node": true
+ "node": true,
+ "browser": true
},
"plugins": [
- "standard",
- "promise"
],
"globals": {
@@ -134,17 +140,13 @@
"space-infix-ops": 2,
"space-unary-ops": [2, { "words": true, "nonwords": false }],
"spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }],
+ "strict": 0,
"template-curly-spacing": [2, "never"],
"use-isnan": 2,
"valid-typeof": 2,
"wrap-iife": [2, "any"],
"yield-star-spacing": [2, "both"],
"yoda": [2, "never"],
-
- "standard/object-curly-even-spacing": [2, "either"],
- "standard/array-bracket-even-spacing": [2, "either"],
- "standard/computed-property-even-spacing": [2, "even"],
-
- "promise/param-names": 2
+ "prefer-const": 1
}
}
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000..e0ea36fee
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+6.0
diff --git a/gulpfile.js b/gulpfile.js
index 368446bff..4204d79b9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -10,6 +10,8 @@ var assign = require('lodash.assign')
var livereload = require('gulp-livereload')
var del = require('del')
var eslint = require('gulp-eslint')
+var fs = require('fs')
+var path = require('path')
// browser reload
@@ -55,7 +57,7 @@ gulp.task('copy:watch', function(){
gulp.task('lint', function () {
// Ignoring node_modules, dist, and docs folders:
return gulp.src(['app/**/*.js', 'ui/**/*.js', '!node_modules/**', '!dist/**', '!docs/**'])
- .pipe(eslint())
+ .pipe(eslint(fs.readFileSync(path.join(__dirname, '.eslintrc'))))
// eslint.format() outputs the lint results to the console.
// Alternatively use eslint.formatEach() (see Docs).
.pipe(eslint.format())
diff --git a/package.json b/package.json
index 6e8bf4c00..65d813da9 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
"xtend": "^4.0.1"
},
"devDependencies": {
+ "babel-eslint": "^6.0.5",
"babel-preset-es2015": "^6.6.0",
"babel-register": "^6.7.2",
"babelify": "^7.2.0",