aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrunobar79 <brunobar79@gmail.com>2018-07-03 06:35:53 +0800
committerbrunobar79 <brunobar79@gmail.com>2018-07-03 06:35:53 +0800
commitcc11a623972acf707291d7b42d9dc2f8d7006e20 (patch)
tree4a8300286f6b1033d7c4233e041672d7916d8310
parent61fcec78f831da070a47981b890c644ea75c044d (diff)
downloadtangerine-wallet-browser-cc11a623972acf707291d7b42d9dc2f8d7006e20.tar
tangerine-wallet-browser-cc11a623972acf707291d7b42d9dc2f8d7006e20.tar.gz
tangerine-wallet-browser-cc11a623972acf707291d7b42d9dc2f8d7006e20.tar.bz2
tangerine-wallet-browser-cc11a623972acf707291d7b42d9dc2f8d7006e20.tar.lz
tangerine-wallet-browser-cc11a623972acf707291d7b42d9dc2f8d7006e20.tar.xz
tangerine-wallet-browser-cc11a623972acf707291d7b42d9dc2f8d7006e20.tar.zst
tangerine-wallet-browser-cc11a623972acf707291d7b42d9dc2f8d7006e20.zip
remove gulp eslint and cleanup gulpfile
-rw-r--r--gulpfile.js29
-rw-r--r--package.json5
2 files changed, 2 insertions, 32 deletions
diff --git a/gulpfile.js b/gulpfile.js
index 4dca7089f..ea810cd77 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -13,21 +13,15 @@ const zip = require('gulp-zip')
const assign = require('lodash.assign')
const livereload = require('gulp-livereload')
const del = require('del')
-const eslint = require('gulp-eslint')
const fs = require('fs')
const path = require('path')
const manifest = require('./app/manifest.json')
-const replace = require('gulp-replace')
const mkdirp = require('mkdirp')
-const asyncEach = require('async/each')
-const exec = require('child_process').exec
const sass = require('gulp-sass')
const autoprefixer = require('gulp-autoprefixer')
const gulpStylelint = require('gulp-stylelint')
const stylefmt = require('gulp-stylefmt')
const uglify = require('gulp-uglify-es').default
-const babel = require('gulp-babel')
-const debug = require('gulp-debug')
const pify = require('pify')
const gulpMultiProcess = require('gulp-multi-process')
const endOfStream = pify(require('end-of-stream'))
@@ -212,29 +206,6 @@ gulp.task('dev:copy',
)
)
-// lint js
-
-const lintTargets = ['app/**/*.json', 'app/**/*.js', '!app/scripts/vendor/**/*.js', 'ui/**/*.js', 'old-ui/**/*.js', 'mascara/src/*.js', 'mascara/server/*.js', '!node_modules/**', '!dist/firefox/**', '!docs/**', '!app/scripts/chromereload.js', '!mascara/test/jquery-3.1.0.min.js']
-
-gulp.task('lint', function () {
- // Ignoring node_modules, dist/firefox, and docs folders:
- return gulp.src(lintTargets)
- .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())
- // To have the process exit with an error code (1) on
- // lint error, return the stream and pipe to failAfterError last.
- .pipe(eslint.failAfterError())
-});
-
-gulp.task('lint:fix', function () {
- return gulp.src(lintTargets)
- .pipe(eslint(Object.assign(fs.readFileSync(path.join(__dirname, '.eslintrc')), {fix: true})))
- .pipe(eslint.format())
- .pipe(eslint.failAfterError())
-});
-
// scss compilation and autoprefixing tasks
gulp.task('build:scss', createScssBuildTask({
diff --git a/package.json b/package.json
index b18686e2d..2a3ecfd06 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,8 @@
"test:mascara:build:tests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js",
"ganache:start": "ganache-cli -m 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'",
"sentry:publish": "node ./development/sentry-publish.js",
- "lint": "gulp lint",
- "lint:fix": "gulp lint:fix",
+ "lint": "eslint .",
+ "lint:fix": "eslint . --fix",
"ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
"mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
"watch": "mocha watch --recursive \"test/unit/**/*.js\"",
@@ -239,7 +239,6 @@
"gifencoder": "^1.1.0",
"gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed",
"gulp-babel": "^7.0.0",
- "gulp-eslint": "^4.0.0",
"gulp-json-editor": "^2.2.1",
"gulp-livereload": "^3.8.1",
"gulp-multi-process": "^1.3.1",