diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-04-03 06:03:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 06:03:54 +0800 |
| commit | fa66b78b8b2c2b8519e818744941cfb6dece92f8 (patch) | |
| tree | 0b0611471b57f48e868b423c66e0e524d375b081 /gulpfile.js | |
| parent | f0e4097972342ea9b8f0e40ef24a1b9ea33d1812 (diff) | |
| parent | 331b62a6a2450aa5be6881877f5312a70ea92e63 (diff) | |
| download | tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.tar tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.tar.gz tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.tar.bz2 tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.tar.lz tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.tar.xz tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.tar.zst tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.zip | |
Merge branch 'master' into lint-sys-fix
Diffstat (limited to 'gulpfile.js')
| -rw-r--r-- | gulpfile.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gulpfile.js b/gulpfile.js index e3d288276..cd01a9d5f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -207,9 +207,11 @@ 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(['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']) + 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). @@ -220,7 +222,7 @@ gulp.task('lint', function () { }); gulp.task('lint:fix', function () { - return gulp.src(['app/**/*.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']) + return gulp.src(lintTargets) .pipe(eslint(Object.assign(fs.readFileSync(path.join(__dirname, '.eslintrc')), {fix: true}))) .pipe(eslint.format()) .pipe(eslint.failAfterError()) |