Skip to content

Commit ca930ef

Browse files
committed
Upgrade (explicitly) grunt
They deprecated the use of some packaged modules and suggest using those modules directly. http://gruntjs.com/blog/2013-11-21-grunt-0.4.2-released Lodash was the only use we had.
1 parent 9558285 commit ca930ef

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

grunt/config/browserify.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ var envify = require('envify/custom');
77
var grunt = require('grunt');
88
var UglifyJS = require('uglify-js');
99
var uglifyify = require('uglifyify');
10+
var _ = require('lodash');
1011

1112
var SIMPLE_TEMPLATE =
1213
'/**\n\
@@ -65,7 +66,7 @@ var basic = {
6566
after: [simpleBannerify]
6667
};
6768

68-
var min = grunt.util._.merge({}, basic, {
69+
var min = _.merge({}, basic, {
6970
outfile: './build/react.min.js',
7071
debug: false,
7172
transforms: [envify({NODE_ENV: 'production'}), uglifyify],
@@ -94,7 +95,7 @@ var addons = {
9495
after: [simpleBannerify]
9596
};
9697

97-
var addonsMin = grunt.util._.merge({}, addons, {
98+
var addonsMin = _.merge({}, addons, {
9899
outfile: './build/react-with-addons.min.js',
99100
debug: false,
100101
transforms: [envify({NODE_ENV: 'production'}), uglifyify],

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"coverify": "~1.0.4",
4444
"envify": "~1.0.1",
4545
"es5-shim": "~2.3.0",
46-
"grunt": "~0.4.1",
46+
"grunt": "~0.4.2",
4747
"grunt-cli": "~0.1.9",
4848
"grunt-compare-size": "~0.4.0",
4949
"grunt-complexity": "~0.1.3",
@@ -54,6 +54,7 @@
5454
"grunt-contrib-jshint": "~0.8.0",
5555
"gzip-js": "~0.3.2",
5656
"jasmine-tapreporter": "~0.2.2",
57+
"lodash": "~2.4.1",
5758
"microtime": "~0.5.1",
5859
"optimist": "~0.6.0",
5960
"phantomjs": "~1.9",

0 commit comments

Comments
 (0)