From d9d8446f0235798dd3df5843bac803e2c204f328 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Wed, 2 Dec 2015 12:22:02 +0000 Subject: [PATCH 1/3] deps: jscs@2.6.0 & ember-suave@1.2.3 no issue - fixes an error that popped up after ember-suave's `brocolli-jscs` dependency moved to `2.6.0` which duplicated some of the rules that `ember-suave` used to implement --- core/client/package.json | 2 +- package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/client/package.json b/core/client/package.json index f233f8a007..556d585105 100644 --- a/core/client/package.json +++ b/core/client/package.json @@ -45,7 +45,7 @@ "ember-resolver": "2.0.3", "ember-simple-auth": "1.0.0", "ember-sinon": "0.3.0", - "ember-suave": "1.2.2", + "ember-suave": "1.2.3", "ember-watson": "0.7.0", "fs-extra": "0.16.3", "glob": "^4.0.5", diff --git a/package.json b/package.json index 5d4bfbdd80..e8535e8b53 100644 --- a/package.json +++ b/package.json @@ -90,6 +90,7 @@ "grunt-mocha-istanbul": "2.4.0", "grunt-shell": "1.1.2", "grunt-update-submodules": "0.4.1", + "jscs": "2.6.0", "jscs-jsdoc": "1.2.0", "matchdep": "0.3.0", "nock": "2.3.0", From 4a32098b6457c159e8df1d04a395e9728fd80f03 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Thu, 3 Dec 2015 17:23:17 +0000 Subject: [PATCH 2/3] Install client dependencies when running TEST_SUITE=lint build refs #6161 - run the client initialization tasks as part of the `TEST_SUITE=lint` to fix problems with missing `ember-suave` jscs preset --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 7b821e7c07..ebc940685a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -595,7 +595,7 @@ var _ = require('lodash'), } else if (process.env.TEST_SUITE === 'client') { grunt.task.run(['test-client']); } else if (process.env.TEST_SUITE === 'lint') { - grunt.task.run(['lint']); + grunt.task.run(['shell:ember:init', 'shell:bower', 'lint']); } else { grunt.task.run(['validate-all']); } From dbf6b598666044c61ee4133c719bdd57333f52fc Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Fri, 4 Dec 2015 10:12:16 +0000 Subject: [PATCH 3/3] deps: grunt-jscs@2.4.0 --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index e8535e8b53..0ea12e0e4c 100644 --- a/package.json +++ b/package.json @@ -85,12 +85,11 @@ "grunt-contrib-watch": "0.6.1", "grunt-docker": "0.0.10", "grunt-express-server": "0.5.1", - "grunt-jscs": "2.3.0", + "grunt-jscs": "2.4.0", "grunt-mocha-cli": "1.13.0", "grunt-mocha-istanbul": "2.4.0", "grunt-shell": "1.1.2", "grunt-update-submodules": "0.4.1", - "jscs": "2.6.0", "jscs-jsdoc": "1.2.0", "matchdep": "0.3.0", "nock": "2.3.0",