Fix jshint.all and jscs.all processing.
Showing
2 changed files
with
11 additions
and
6 deletions
... | @@ -35,6 +35,9 @@ module.exports = function(grunt) { | ... | @@ -35,6 +35,9 @@ module.exports = function(grunt) { |
35 | options: { | 35 | options: { |
36 | validateIndentation: 4, | 36 | validateIndentation: 4, |
37 | }, | 37 | }, |
38 | all: [ | ||
39 | 'grunt-monty-python.js', | ||
40 | ], | ||
38 | }; | 41 | }; |
39 | config.punch = { | 42 | config.punch = { |
40 | }; | 43 | }; | ... | ... |
... | @@ -253,7 +253,7 @@ module.exports = function (grunt) { | ... | @@ -253,7 +253,7 @@ module.exports = function (grunt) { |
253 | _.each(arguments, function(item) { | 253 | _.each(arguments, function(item) { |
254 | if (_.isArray(item)) { | 254 | if (_.isArray(item)) { |
255 | items = items.concat(item); | 255 | items = items.concat(item); |
256 | } else if (item != null) { | 256 | } else if (item !== null) { |
257 | items.push(item); | 257 | items.push(item); |
258 | } | 258 | } |
259 | }); | 259 | }); |
... | @@ -265,9 +265,11 @@ module.exports = function (grunt) { | ... | @@ -265,9 +265,11 @@ module.exports = function (grunt) { |
265 | } | 265 | } |
266 | initConfig[name] = { | 266 | initConfig[name] = { |
267 | options: mpConfig[name].options, | 267 | options: mpConfig[name].options, |
268 | all: [ | 268 | all: { |
269 | 'Gruntfile.js', | 269 | files: [ |
270 | ], | 270 | {src: 'Gruntfile.js'}, |
271 | ], | ||
272 | }, | ||
271 | main: { | 273 | main: { |
272 | options: _.extend({}, mpConfig[name].browserOptions, browserOptions), | 274 | options: _.extend({}, mpConfig[name].browserOptions, browserOptions), |
273 | files: makeFilesSpec('', mpConfig.mainDirs), | 275 | files: makeFilesSpec('', mpConfig.mainDirs), |
... | @@ -281,7 +283,7 @@ module.exports = function (grunt) { | ... | @@ -281,7 +283,7 @@ module.exports = function (grunt) { |
281 | files: makeFilesSpec(mpConfig.viewDir, mpConfig.viewDirs), | 283 | files: makeFilesSpec(mpConfig.viewDir, mpConfig.viewDirs), |
282 | }, | 284 | }, |
283 | }; | 285 | }; |
284 | jscheckerAddExtra(mpConfig[name].all, initConfig[name], 'all'); | 286 | jscheckerAddExtra(mpConfig[name].all, initConfig[name].all.files, 'src'); |
285 | jscheckerAddExtra(mpConfig[name].main, initConfig[name].main.files, 'src'); | 287 | jscheckerAddExtra(mpConfig[name].main, initConfig[name].main.files, 'src'); |
286 | jscheckerAddExtra(mpConfig[name].model, initConfig[name].model.files, 'src'); | 288 | jscheckerAddExtra(mpConfig[name].model, initConfig[name].model.files, 'src'); |
287 | jscheckerAddExtra(mpConfig[name].view, initConfig[name].view.files, 'src'); | 289 | jscheckerAddExtra(mpConfig[name].view, initConfig[name].view.files, 'src'); |
... | @@ -742,7 +744,7 @@ module.exports = function (grunt) { | ... | @@ -742,7 +744,7 @@ module.exports = function (grunt) { |
742 | } | 744 | } |
743 | fs.renameSync('dist/build', 'dist/' + target); | 745 | fs.renameSync('dist/build', 'dist/' + target); |
744 | if (fs.existsSync('dist/next-current')) { | 746 | if (fs.existsSync('dist/next-current')) { |
745 | fs.unlinkSync('dist/next-current'); | 747 | fs.unlinkSync('dist/next-current'); |
746 | } | 748 | } |
747 | fs.symlinkSync(target, 'dist/next-current'); | 749 | fs.symlinkSync(target, 'dist/next-current'); |
748 | fs.renameSync('dist/next-current', 'dist/current'); | 750 | fs.renameSync('dist/next-current', 'dist/current'); | ... | ... |
-
Please register or sign in to post a comment