From 25d8ccd1112d75394b91071ff7eba13283aaf898 Mon Sep 17 00:00:00 2001 From: Oleg Gaidarenko Date: Wed, 22 Jun 2016 19:41:57 +0400 Subject: [PATCH] Build: Improve ESLint configuration (#3188) * Bump eslint-config-jquery package to 0.1.4 version * Add subtask "dist" to "eslint" task and add it to the build task list * Make gitignore globs more flexible for the "dist" folder Fixes gh-3169 --- .gitignore | 5 ++++- Gruntfile.js | 3 ++- package.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 676ce1739..300adf912 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,10 @@ npm-debug.log -/dist/jquery* +# Ignore everything in dist folder except for eslint config +/dist/* +!/dist/.eslintrc + /node_modules /test/node_smoke_tests/lib/ensure_iterability.js diff --git a/Gruntfile.js b/Gruntfile.js index 8f8408d83..62adbda39 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -109,6 +109,7 @@ module.exports = function( grunt ) { quiet: true }, all: ".", + dist: "dist/jquery.js", dev: [ "src/**/*.js", "Gruntfile.js", "test/**/*.js", "build/**/*.js" ] }, testswarm: { @@ -201,7 +202,7 @@ module.exports = function( grunt ) { ] ); - grunt.registerTask( "default", [ "dev", "test_fast", "compare_size" ] ); + grunt.registerTask( "default", [ "dev", "eslint:dist", "test_fast", "compare_size" ] ); grunt.registerTask( "precommit_lint", [ "newer:jsonlint", "newer:eslint:all" ] ); }; diff --git a/package.json b/package.json index 5f099251c..329fd1d86 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "commitplease": "2.3.1", "core-js": "2.2.2", "cross-spawn": "2.2.3", - "eslint-config-jquery": "0.1.2", + "eslint-config-jquery": "0.1.6", "grunt": "1.0.1", "grunt-babel": "6.0.0", "grunt-cli": "1.2.0", -- 2.39.5