From bbacaaddeb3fd9960ddaff2f44340d7179cde3a8 Mon Sep 17 00:00:00 2001 From: Gary Katsevman Date: Mon, 24 Oct 2016 15:20:58 -0400 Subject: [PATCH 1/5] fix: remove unnecessary comments from video.min.js This involves updating to latest version of uglify and setting "screwIE8" to false since that is a default in 2.7. However, this makes "preserveComments" "some" work as it is supposed to work. Fixes #3707 --- build/grunt.js | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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..fb25a79182 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "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", From 3ef8bb7554439f96765d0a7fa0c22726f8c2ba1f Mon Sep 17 00:00:00 2001 From: Gary Katsevman Date: Mon, 24 Oct 2016 17:31:15 -0400 Subject: [PATCH 2/5] set karma concurrency to 2 --- test/karma.conf.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/karma.conf.js b/test/karma.conf.js index a4ec7de0c1..9167958971 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -66,6 +66,7 @@ module.exports = function(config) { logLevel: config.LOG_INFO, captureTimeout: 300000, browserNoActivityTimeout: 300000, + concurrency: 2, browserStack: { name: process.env.TRAVIS_BUILD_NUMBER + process.env.TRAVIS_BRANCH, From cc73ab66327e793eff5b56ab0393b7fc5ea55d3b Mon Sep 17 00:00:00 2001 From: Greenkeeper Date: Fri, 12 Aug 2016 00:03:19 +0200 Subject: [PATCH 3/5] cherry-pick karma updates from master --- CHANGELOG.md | 2 +- package.json | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8a6a1909b..0086ddd592 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ CHANGELOG ========= ## HEAD (Unreleased) -_(none)_ +* greenkeeper updated karma dependencies ([view](https://github.com/videojs/video.js/pull/3523)) -------------------- diff --git a/package.json b/package.json index fb25a79182..034e70f3e2 100644 --- a/package.json +++ b/package.json @@ -65,22 +65,23 @@ "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", From 5b168d8e51efec3bc7ae6ac34660bfd64c169657 Mon Sep 17 00:00:00 2001 From: Gary Katsevman Date: Mon, 24 Oct 2016 18:09:29 -0400 Subject: [PATCH 4/5] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0086ddd592..3a8986d02f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ CHANGELOG ## HEAD (Unreleased) * 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)) -------------------- From 52ad8076646ea7f0d8b7dee9344943f2f82512aa Mon Sep 17 00:00:00 2001 From: Gary Katsevman Date: Mon, 24 Oct 2016 18:10:11 -0400 Subject: [PATCH 5/5] Revert "set karma concurrency to 2" This reverts commit 3ef8bb7554439f96765d0a7fa0c22726f8c2ba1f. --- test/karma.conf.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/karma.conf.js b/test/karma.conf.js index 9167958971..a4ec7de0c1 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -66,7 +66,6 @@ module.exports = function(config) { logLevel: config.LOG_INFO, captureTimeout: 300000, browserNoActivityTimeout: 300000, - concurrency: 2, browserStack: { name: process.env.TRAVIS_BUILD_NUMBER + process.env.TRAVIS_BRANCH,