Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 7f4d24c

Browse files
mgolIgorMinar
authored andcommitted
chore(npm): update npm dependencies
Some of previous dependencies versions (e.g. Karma) didn't work with Node 0.11.14, see: karma-runner/karma#1182 The only dependencies not updated in this commit are: 1. grunt-jscs-checker: its rules have changed a lot so it will require more work to use the newer version 2. gulp-jshint: the update breaks docs linting, it requires investigation Closes #9571
1 parent 399a7af commit 7f4d24c

File tree

3 files changed

+842
-308
lines changed

3 files changed

+842
-308
lines changed

Gruntfile.js

+12-10
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,13 @@ module.exports = function(grunt) {
4646
base: '.',
4747
keepalive: true,
4848
middleware: function(connect, options){
49+
var base = Array.isArray(options.base) ? options.base[options.base.length - 1] : options.base;
4950
return [
5051
util.conditionalCsp(),
5152
util.rewrite(),
5253
connect.favicon('images/favicon.ico'),
53-
connect.static(options.base),
54-
connect.directory(options.base)
54+
connect.static(base),
55+
connect.directory(base)
5556
];
5657
}
5758
}
@@ -64,6 +65,7 @@ module.exports = function(grunt) {
6465
port: 8000,
6566
hostname: '0.0.0.0',
6667
middleware: function(connect, options){
68+
var base = Array.isArray(options.base) ? options.base[options.base.length - 1] : options.base;
6769
return [
6870
function(req, resp, next) {
6971
// cache get requests to speed up tests on travis
@@ -75,7 +77,7 @@ module.exports = function(grunt) {
7577
},
7678
util.conditionalCsp(),
7779
connect.favicon('images/favicon.ico'),
78-
connect.static(options.base)
80+
connect.static(base)
7981
];
8082
}
8183
}
@@ -287,14 +289,14 @@ module.exports = function(grunt) {
287289
}
288290
},
289291

290-
shell:{
291-
"promises-aplus-tests":{
292-
options:{
293-
//stdout:true,
294-
stderr:true,
295-
failOnError:true
292+
shell: {
293+
"promises-aplus-tests": {
294+
options: {
295+
stdout: false,
296+
stderr: true,
297+
failOnError: true
296298
},
297-
command:path.normalize('./node_modules/.bin/promises-aplus-tests tmp/promises-aplus-adapter++.js')
299+
command: path.normalize('./node_modules/.bin/promises-aplus-tests tmp/promises-aplus-adapter++.js')
298300
}
299301
},
300302

0 commit comments

Comments
 (0)