diff --git a/History.md b/History.md index 0dc2c12316..3306e46bd7 100644 --- a/History.md +++ b/History.md @@ -83,6 +83,7 @@ Meteor will not apply the patch and will instead disable websockets. * Node from 0.10.21 to 0.10.22 * MongoDB from 2.4.6 to 2.4.8 * clean-css from 1.1.2 to 2.0.2 + * uglify-js from a fork of 2.4.0 to 2.4.7 Patches contributed by GitHub users AlexeyMK, awwx, dandv, DenisGorbachev, FooBarWidget, mitar, mcbain, rzymek, sdarnell. diff --git a/packages/minifiers/.npm/package/npm-shrinkwrap.json b/packages/minifiers/.npm/package/npm-shrinkwrap.json index 38aac34aa9..e2eb3b72aa 100644 --- a/packages/minifiers/.npm/package/npm-shrinkwrap.json +++ b/packages/minifiers/.npm/package/npm-shrinkwrap.json @@ -9,16 +9,16 @@ } }, "uglify-js": { - "from": "https://github.com/meteor/UglifyJS2/tarball/bb0a762d12d2ecd058b9d7b57f16b4c289378d9c", + "version": "2.4.7", "dependencies": { "async": { "version": "0.2.9" }, "source-map": { - "version": "0.1.30", + "version": "0.1.31", "dependencies": { "amdefine": { - "version": "0.0.8" + "version": "0.1.0" } } }, diff --git a/packages/minifiers/package.js b/packages/minifiers/package.js index 858ce9c0fb..c76efd3ee9 100644 --- a/packages/minifiers/package.js +++ b/packages/minifiers/package.js @@ -5,8 +5,7 @@ Package.describe({ Npm.depends({ "clean-css": "2.0.2", - // Fork of 2.4.0 fixing https://github.com/mishoo/UglifyJS2/pull/308 - "uglify-js": "https://github.com/meteor/UglifyJS2/tarball/bb0a762d12d2ecd058b9d7b57f16b4c289378d9c" + "uglify-js": "2.4.7" }); Package.on_use(function (api) {