chore(npm): update npm dependencies

Some of previous dependencies versions (e.g. Karma) didn't work with
Node 0.11.14, see:
https://github.com/karma-runner/karma/pull/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
This commit is contained in:
Michał Gołębiowski
2014-10-11 21:58:38 +02:00
committed by Igor Minar
parent 399a7afafe
commit 7f4d24c6fa
3 changed files with 798 additions and 264 deletions

View File

@@ -46,12 +46,13 @@ module.exports = function(grunt) {
base: '.', base: '.',
keepalive: true, keepalive: true,
middleware: function(connect, options){ middleware: function(connect, options){
var base = Array.isArray(options.base) ? options.base[options.base.length - 1] : options.base;
return [ return [
util.conditionalCsp(), util.conditionalCsp(),
util.rewrite(), util.rewrite(),
connect.favicon('images/favicon.ico'), connect.favicon('images/favicon.ico'),
connect.static(options.base), connect.static(base),
connect.directory(options.base) connect.directory(base)
]; ];
} }
} }
@@ -64,6 +65,7 @@ module.exports = function(grunt) {
port: 8000, port: 8000,
hostname: '0.0.0.0', hostname: '0.0.0.0',
middleware: function(connect, options){ middleware: function(connect, options){
var base = Array.isArray(options.base) ? options.base[options.base.length - 1] : options.base;
return [ return [
function(req, resp, next) { function(req, resp, next) {
// cache get requests to speed up tests on travis // cache get requests to speed up tests on travis
@@ -75,7 +77,7 @@ module.exports = function(grunt) {
}, },
util.conditionalCsp(), util.conditionalCsp(),
connect.favicon('images/favicon.ico'), connect.favicon('images/favicon.ico'),
connect.static(options.base) connect.static(base)
]; ];
} }
} }
@@ -287,14 +289,14 @@ module.exports = function(grunt) {
} }
}, },
shell:{ shell: {
"promises-aplus-tests":{ "promises-aplus-tests": {
options:{ options: {
//stdout:true, stdout: false,
stderr:true, stderr: true,
failOnError:true failOnError: true
}, },
command:path.normalize('./node_modules/.bin/promises-aplus-tests tmp/promises-aplus-adapter++.js') command: path.normalize('./node_modules/.bin/promises-aplus-tests tmp/promises-aplus-adapter++.js')
} }
}, },

1002
npm-shrinkwrap.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -9,24 +9,24 @@
"angular-benchpress": "0.x.x", "angular-benchpress": "0.x.x",
"benchmark": "1.x.x", "benchmark": "1.x.x",
"bower": "~1.3.9", "bower": "~1.3.9",
"browserstacktunnel-wrapper": "~1.1.1", "browserstacktunnel-wrapper": "~1.3.1",
"canonical-path": "0.0.2", "canonical-path": "0.0.2",
"dgeni": "^0.4.0", "dgeni": "^0.4.0",
"dgeni-packages": "^0.10.0", "dgeni-packages": "^0.10.0",
"event-stream": "~3.1.0", "event-stream": "~3.1.0",
"grunt": "~0.4.2", "grunt": "~0.4.2",
"grunt-bump": "~0.0.13", "grunt-bump": "~0.0.13",
"grunt-contrib-clean": "~0.5.0", "grunt-contrib-clean": "~0.6.0",
"grunt-contrib-compress": "~0.5.2", "grunt-contrib-compress": "~0.12.0",
"grunt-contrib-connect": "~0.5.0", "grunt-contrib-connect": "~0.8.0",
"grunt-contrib-copy": "~0.4.1", "grunt-contrib-copy": "~0.6.0",
"grunt-contrib-jshint": "~0.10.0", "grunt-contrib-jshint": "~0.10.0",
"grunt-ddescribe-iit": "~0.0.1", "grunt-ddescribe-iit": "~0.0.1",
"grunt-jasmine-node": "git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code", "grunt-jasmine-node": "git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code",
"grunt-jscs-checker": "~0.4.0", "grunt-jscs-checker": "~0.4.0",
"grunt-merge-conflict": "~0.0.1", "grunt-merge-conflict": "~0.0.1",
"grunt-parallel": "~0.3.1", "grunt-parallel": "~0.3.1",
"grunt-shell": "~0.4.0", "grunt-shell": "~1.1.1",
"gulp": "~3.8.0", "gulp": "~3.8.0",
"gulp-concat": "^2.4.1", "gulp-concat": "^2.4.1",
"gulp-foreach": "0.0.1", "gulp-foreach": "0.0.1",
@@ -35,30 +35,30 @@
"gulp-sourcemaps": "^1.2.2", "gulp-sourcemaps": "^1.2.2",
"gulp-uglify": "^1.0.1", "gulp-uglify": "^1.0.1",
"gulp-util": "^3.0.1", "gulp-util": "^3.0.1",
"jasmine-node": "~1.11.0", "jasmine-node": "~1.14.5",
"jasmine-reporters": "~0.2.1", "jasmine-reporters": "~1.0.1",
"jshint-stylish": "~0.1.5", "jshint-stylish": "~1.0.0",
"karma": "^0.12.0", "karma": "^0.12.0",
"karma-browserstack-launcher": "0.0.7", "karma-browserstack-launcher": "0.1.1",
"karma-chrome-launcher": "0.1.2", "karma-chrome-launcher": "0.1.5",
"karma-firefox-launcher": "0.1.3", "karma-firefox-launcher": "0.1.3",
"karma-jasmine": "0.1.5", "karma-jasmine": "0.1.5",
"karma-junit-reporter": "0.2.1", "karma-junit-reporter": "0.2.2",
"karma-ng-scenario": "0.1.0", "karma-ng-scenario": "0.1.0",
"karma-sauce-launcher": "0.2.0", "karma-sauce-launcher": "0.2.10",
"karma-script-launcher": "0.1.0", "karma-script-launcher": "0.1.0",
"load-grunt-tasks": "~0.3.0", "load-grunt-tasks": "~0.6.0",
"lodash": "~2.1.0", "lodash": "~2.4.1",
"marked": "~0.3.0", "marked": "~0.3.0",
"node-html-encoder": "0.0.2", "node-html-encoder": "0.0.2",
"promises-aplus-tests": "~2.0.4", "promises-aplus-tests": "~2.1.0",
"protractor": "1.3.1", "protractor": "1.3.1",
"q": "~1.0.0", "q": "~1.0.0",
"q-io": "^1.10.9", "q-io": "^1.10.9",
"qq": "^0.3.5", "qq": "^0.3.5",
"rewire": "1.1.3", "rewire": "~2.1.0",
"semver": "~2.1.0", "semver": "~4.0.3",
"shelljs": "~0.2.6", "shelljs": "~0.3.0",
"sorted-object": "^1.0.0", "sorted-object": "^1.0.0",
"stringmap": "^0.2.2" "stringmap": "^0.2.2"
}, },