Permalink
Browse files

Update dependencies.

  • Loading branch information...
f1ames authored and Comandeer committed Jan 16, 2017
1 parent 2a95098 commit ab343ec5348824064e1122d6f51b0eb75365f1be
Showing with 13 additions and 15 deletions.
  1. +2 −2 .jscsrc
  2. +1 −1 .jshintrc
  3. +4 −7 dev/tasks/utils/tools.js
  4. +2 −1 gruntfile.js
  5. +4 −4 package.json
View
@@ -53,6 +53,6 @@
},
"validateIndentation": {
"value": "\t",
"allExcept": [ "comments" ]
"allExcept": [ "comments", "emptyLines" ]
}
}
}
View
@@ -22,4 +22,4 @@
"validthis": true,
"predef": [ "CKEDITOR", "assert", "arrayAssert", "bender", "JSON", "objectAssert", "resume", "sinon", "wait", "YUITest" ]
}
}
View
@@ -125,18 +125,15 @@ module.exports = {
* @returns {String} The command output.
*/
shExec: function( command ) {
var sh = require( 'shelljs' );
sh.config.silent = true;
var ret = sh.exec( command );
var sh = require( 'shelljs' ),
ret = sh.exec( command, { silent: true } );
if ( ret.code ) {
throw new Error(
'Error while executing `' + command + '`:\n\n' +
ret.output
ret.stdout
);
}
return ret.output;
return ret.stdout;
}
};
View
@@ -18,7 +18,8 @@ module.exports = function( grunt ) {
'samples/toolbarconfigurator/lib/**',
'tests/adapters/jquery/_assets/**',
'tests/core/dom/_assets/**',
'tests/core/selection/_helpers/rangy.js'
'tests/core/selection/_helpers/rangy.js',
'tests/plugins/pastefromword/generated/_lib/q.js'
];
// Basic configuration which will be overloaded by the tasks.
View
@@ -9,17 +9,17 @@
"benderjs-sinon": "^0.3.1",
"benderjs-yui": "^0.3.2",
"benderjs-yui-beautified": "0.0.5",
"grunt": "^0",
"grunt": "^1.0.1",
"grunt-contrib-imagemin": "^1.0.0",
"grunt-jscs": "^2.0.0",
"grunt-jscs": "^3.0.1",
"grunt-contrib-jshint": "^1.0.0",
"grunt-contrib-less": "^1.0.0",
"grunt-contrib-watch": "^1.0.0",
"grunt-contrib-concat": "^1.0.0",
"grunt-jsduck": "^1.0.1",
"grunt-githooks": "^0.5.0",
"grunt-githooks": "^0.6.0",
"less": "^2.5.0",
"shelljs": "~0.6",
"shelljs": "^0.7.6",
"cksource-samples-framework": "^1.0.1"
},
"scripts": {

0 comments on commit ab343ec

Please sign in to comment.