Skip to content

Commit

Permalink
MDL-54889 jshint: stop using for everything but shifter
Browse files Browse the repository at this point in the history
Now jshint has been replaced by eslint.
  • Loading branch information
danpoltawski committed Jun 30, 2016
1 parent a382101 commit 5f4d957
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 32 deletions.
3 changes: 3 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// NOTE: We use eslint now. This file is used only by shifter. We keep the configuration
// here because shifter uses jshint after modules have been concating. Eslint can't
// currently do this.
{
"asi": false,
"bitwise": true,
Expand Down
8 changes: 1 addition & 7 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ module.exports = function(grunt) {

// Project configuration.
grunt.initConfig({
jshint: {
options: {jshintrc: '.jshintrc'},
amd: { src: amdSrc }
},
eslint: {
// Even though warnings dont stop the build we don't display warnings by default because
// at this moment we've got too many core warnings.
Expand Down Expand Up @@ -288,7 +284,6 @@ module.exports = function(grunt) {
var files = Object.keys(changedFiles);
grunt.config('eslint.amd.src', files);
grunt.config('eslint.yui.src', files);
grunt.config('jshint.amd.src', files);
grunt.config('uglify.amd.files', [{ expand: true, src: files, rename: uglifyRename }]);
grunt.config('shifter.options.paths', files);
changedFiles = Object.create(null);
Expand All @@ -301,7 +296,6 @@ module.exports = function(grunt) {

// Register NPM tasks.
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-eslint');
Expand All @@ -310,7 +304,7 @@ module.exports = function(grunt) {
grunt.registerTask('shifter', 'Run Shifter against the current directory', tasks.shifter);
grunt.registerTask('ignorefiles', 'Generate ignore files for linters', tasks.ignorefiles);
grunt.registerTask('yui', ['eslint:yui', 'shifter']);
grunt.registerTask('amd', ['eslint:amd', 'jshint', 'uglify']);
grunt.registerTask('amd', ['eslint:amd', 'uglify']);
grunt.registerTask('js', ['amd', 'yui']);

// Register CSS taks.
Expand Down
28 changes: 4 additions & 24 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"devDependencies": {
"async": "^1.5.2",
"grunt": "0.4.5",
"grunt-contrib-jshint": "0.11.3",
"grunt-contrib-less": "1.1.0",
"grunt-contrib-uglify": "0.11.0",
"grunt-contrib-watch": "0.6.1",
Expand Down

0 comments on commit 5f4d957

Please sign in to comment.