Skip to content

Commit 5f4d957

Browse files
committed
MDL-54889 jshint: stop using for everything but shifter
Now jshint has been replaced by eslint.
1 parent a382101 commit 5f4d957

File tree

4 files changed

+8
-32
lines changed

4 files changed

+8
-32
lines changed

.jshintrc

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// NOTE: We use eslint now. This file is used only by shifter. We keep the configuration
2+
// here because shifter uses jshint after modules have been concating. Eslint can't
3+
// currently do this.
14
{
25
"asi": false,
36
"bitwise": true,

Gruntfile.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ module.exports = function(grunt) {
101101

102102
// Project configuration.
103103
grunt.initConfig({
104-
jshint: {
105-
options: {jshintrc: '.jshintrc'},
106-
amd: { src: amdSrc }
107-
},
108104
eslint: {
109105
// Even though warnings dont stop the build we don't display warnings by default because
110106
// at this moment we've got too many core warnings.
@@ -288,7 +284,6 @@ module.exports = function(grunt) {
288284
var files = Object.keys(changedFiles);
289285
grunt.config('eslint.amd.src', files);
290286
grunt.config('eslint.yui.src', files);
291-
grunt.config('jshint.amd.src', files);
292287
grunt.config('uglify.amd.files', [{ expand: true, src: files, rename: uglifyRename }]);
293288
grunt.config('shifter.options.paths', files);
294289
changedFiles = Object.create(null);
@@ -301,7 +296,6 @@ module.exports = function(grunt) {
301296

302297
// Register NPM tasks.
303298
grunt.loadNpmTasks('grunt-contrib-uglify');
304-
grunt.loadNpmTasks('grunt-contrib-jshint');
305299
grunt.loadNpmTasks('grunt-contrib-less');
306300
grunt.loadNpmTasks('grunt-contrib-watch');
307301
grunt.loadNpmTasks('grunt-eslint');
@@ -310,7 +304,7 @@ module.exports = function(grunt) {
310304
grunt.registerTask('shifter', 'Run Shifter against the current directory', tasks.shifter);
311305
grunt.registerTask('ignorefiles', 'Generate ignore files for linters', tasks.ignorefiles);
312306
grunt.registerTask('yui', ['eslint:yui', 'shifter']);
313-
grunt.registerTask('amd', ['eslint:amd', 'jshint', 'uglify']);
307+
grunt.registerTask('amd', ['eslint:amd', 'uglify']);
314308
grunt.registerTask('js', ['amd', 'yui']);
315309

316310
// Register CSS taks.

npm-shrinkwrap.json

+4-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"devDependencies": {
66
"async": "^1.5.2",
77
"grunt": "0.4.5",
8-
"grunt-contrib-jshint": "0.11.3",
98
"grunt-contrib-less": "1.1.0",
109
"grunt-contrib-uglify": "0.11.0",
1110
"grunt-contrib-watch": "0.6.1",

0 commit comments

Comments
 (0)