diff --git a/CHANGELOG.md b/CHANGELOG.md index a8a6a1909b..3a8986d02f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ CHANGELOG ========= ## HEAD (Unreleased) -_(none)_ +* greenkeeper updated karma dependencies ([view](https://github.com/videojs/video.js/pull/3523)) +* update to latest uglify to fix preserve comments issue. Disable screw ie8 option. ([view](https://github.com/videojs/video.js/pull/3709)) -------------------- diff --git a/build/grunt.js b/build/grunt.js index 379a815ac2..e391b9443c 100644 --- a/build/grunt.js +++ b/build/grunt.js @@ -128,6 +128,7 @@ module.exports = function(grunt) { sourceMapIn: 'build/temp/video.js.map', sourceMapRoot: '../../src/js', preserveComments: 'some', + screwIE8: false, mangle: true, compress: { sequences: true, diff --git a/package.json b/package.json index 9e7c69720a..034e70f3e2 100644 --- a/package.json +++ b/package.json @@ -59,28 +59,29 @@ "grunt-contrib-cssmin": "~0.6.0", "grunt-contrib-jshint": "~0.11.3", "grunt-contrib-less": "~0.6.4", - "grunt-contrib-uglify": "~0.11.0", + "grunt-contrib-uglify": "^2.0.0", "grunt-contrib-watch": "~0.1.4", "grunt-coveralls": "^1.0.0", "grunt-exorcise": "^1.0.1", "grunt-fastly": "^0.1.3", "grunt-github-releaser": "^0.1.17", - "grunt-karma": "^0.8.3", + "grunt-karma": "^2.0.0", + "grunt-shell": "^1.3.0", "grunt-version": "~0.3.0", "grunt-videojs-languages": "0.0.4", "grunt-zip": "0.10.2", - "karma": "^0.12.36", - "karma-browserify": "^4.0.0", - "karma-browserstack-launcher": "^0.1.4", - "karma-chrome-launcher": "^0.1.3", - "karma-coverage": "^0.4.0", - "karma-detect-browsers": "^2.0.2", - "karma-firefox-launcher": "^0.1.3", - "karma-ie-launcher": "^0.1.5", - "karma-opera-launcher": "~0.1.0", - "karma-qunit": "^0.1.2", - "karma-safari-launcher": "^0.1.1", - "karma-sinon": "^1.0.3", + "karma": "^1.2.0", + "karma-browserify": "^5.1.0", + "karma-browserstack-launcher": "^1.0.1", + "karma-chrome-launcher": "^1.0.1", + "karma-coverage": "^1.1.1", + "karma-detect-browsers": "^2.1.0", + "karma-firefox-launcher": "^1.0.0", + "karma-ie-launcher": "^1.0.0", + "karma-opera-launcher": "^1.0.0", + "karma-qunit": "^1.2.0", + "karma-safari-launcher": "^1.0.0", + "karma-sinon": "^1.0.5", "load-grunt-tasks": "^3.1.0", "proxyquireify": "^3.0.0", "qunitjs": "^1.18.0",