aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Gaidarenko <markelog@gmail.com>2016-06-22 19:41:57 +0400
committerGitHub <noreply@github.com>2016-06-22 19:41:57 +0400
commit25d8ccd1112d75394b91071ff7eba13283aaf898 (patch)
tree19dd5f7d17989f054ab90f15635fdbbd6ab0afb5
parent58c6ca9822afa42d3b40cca8edb0abe90a2bcb34 (diff)
downloadjquery-25d8ccd1112d75394b91071ff7eba13283aaf898.tar.gz
jquery-25d8ccd1112d75394b91071ff7eba13283aaf898.zip
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
-rw-r--r--.gitignore5
-rw-r--r--Gruntfile.js3
-rw-r--r--package.json2
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",