Skip to content

Commit 52cc6ae

Browse files
committedJan 29, 2016
Merge pull request #388 from swarajgiri/bump-dependencies
Update lodash, maxmin and dev dependencies
2 parents a6dd1cb + 2ff0283 commit 52cc6ae

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed
 

‎CHANGELOG

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
v0.11.1:
2+
date: 2016-01-29
3+
changes:
4+
- switch to lodash ^4.0.1
5+
- switch to grunt-contrib-clean ^0.7.0
6+
- switch to grunt-contrib-jshint ^0.12.0
17
v0.11.0:
28
date: 2015-11-20
39
changes:

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "grunt-contrib-uglify",
33
"description": "Minify files with UglifyJS",
4-
"version": "0.11.0",
4+
"version": "0.11.1",
55
"author": {
66
"name": "Grunt Team",
77
"url": "http://gruntjs.com/"
@@ -16,17 +16,17 @@
1616
},
1717
"dependencies": {
1818
"chalk": "^1.0.0",
19-
"lodash": "^3.2.0",
20-
"maxmin": "^1.0.0",
19+
"lodash": "^4.0.1",
20+
"maxmin": "^2.0.0",
2121
"uglify-js": "~2.6.0",
2222
"uri-path": "^1.0.0"
2323
},
2424
"devDependencies": {
2525
"grunt": "^0.4.2",
2626
"grunt-cli": "^0.1.13",
27-
"grunt-contrib-clean": "^0.6.0",
27+
"grunt-contrib-clean": "^0.7.0",
2828
"grunt-contrib-internal": "^0.4.12",
29-
"grunt-contrib-jshint": "^0.11.0",
29+
"grunt-contrib-jshint": "^0.12.0",
3030
"grunt-contrib-nodeunit": "^0.4.0"
3131
},
3232
"peerDependencies": {

‎tasks/lib/uglify.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ var path = require('path');
1313
var UglifyJS = require('uglify-js');
1414
var _ = require('lodash');
1515
var uriPath = require('uri-path');
16+
var getOutputOptions;
1617

1718
exports.init = function(grunt) {
1819
var exports = {};
@@ -196,7 +197,7 @@ exports.init = function(grunt) {
196197
return result;
197198
};
198199

199-
var getOutputOptions = function(options, dest) {
200+
getOutputOptions = function(options, dest) {
200201
var outputOptions = {
201202
beautify: false,
202203
source_map: null

‎tasks/uglify.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
var path = require('path');
1212
var chalk = require('chalk');
1313
var maxmin = require('maxmin');
14+
var err;
1415

1516
// Return the relative path from file1 => file2
1617
function relativePath(file1, file2) {
@@ -98,7 +99,7 @@ module.exports = function(grunt) {
9899
try {
99100
options.generatedSourceMapName = mapNameGenerator(f.dest);
100101
} catch (e) {
101-
var err = new Error('SourceMap failed.');
102+
err = new Error('SourceMap failed.');
102103
err.origError = e;
103104
grunt.fail.warn(err);
104105
}
@@ -114,7 +115,7 @@ module.exports = function(grunt) {
114115
try {
115116
options.sourceMapIn = mapInNameGenerator(src[0]);
116117
} catch (e) {
117-
var err = new Error('SourceMapInName failed.');
118+
err = new Error('SourceMapInName failed.');
118119
err.origError = e;
119120
grunt.fail.warn(err);
120121
}
@@ -139,7 +140,7 @@ module.exports = function(grunt) {
139140
result = uglify.minify(src, f.dest, options);
140141
} catch (e) {
141142
console.log(e);
142-
var err = new Error('Uglification failed.');
143+
err = new Error('Uglification failed.');
143144
if (e.message) {
144145
err.message += '\n' + e.message + '. \n';
145146
if (e.line) {

0 commit comments

Comments
 (0)
Please sign in to comment.