aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimmy Willison <4timmywil@gmail.com>2018-01-03 12:19:37 -0500
committerTimmy Willison <4timmywil@gmail.com>2018-01-08 11:48:24 -0500
commitc9efd11f47c68f0537c8ea535b8d6a9c6d667175 (patch)
treedc859fbc253219c0d17f343c75264b1970e037ba
parente2f192887cb03400128b975c8cd86d6c4dc1e31e (diff)
downloadjquery-c9efd11f47c68f0537c8ea535b8d6a9c6d667175.tar.gz
jquery-c9efd11f47c68f0537c8ea535b8d6a9c6d667175.zip
Build: Fix UglifyJS output in Android 4.0; update uglify
- Thanks to @mgol for first pass Fixes gh-3743 Close gh-3920
-rw-r--r--Gruntfile.js7
-rw-r--r--package.json2
2 files changed, 7 insertions, 2 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 19e94fad7..431e87557 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -246,7 +246,12 @@ module.exports = function( grunt ) {
"dist/<%= grunt.option('filename').replace('.js', '.min.map') %>",
report: "min",
output: {
- "ascii_only": true
+ "ascii_only": true,
+
+ // Support: Android 4.0 only
+ // UglifyJS 3 breaks Android 4.0 if this option is not enabled.
+ // This is in lieu of setting ie8 for all of mangle, compress, and output
+ "ie8": true
},
banner: "/*! jQuery v<%= pkg.version %> | " +
"(c) JS Foundation and other contributors | jquery.org/license */",
diff --git a/package.json b/package.json
index 53ea4f7eb..091f1c992 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
"sizzle": "2.3.3",
"strip-json-comments": "2.0.1",
"testswarm": "1.1.0",
- "uglify-js": "3.0.24"
+ "uglify-js": "3.3.4"
},
"scripts": {
"build": "npm install && grunt",