@samitouri / QOS-React-2 / commits / ca930efa7c

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.

Paul O’Shannessy committed Jan 17, 2014 at 09:33 UTC ca930efa7ccf441d83021392adf05b90c0806e4d
2 files changed +5 -3
grunt/config/browserify.js
+3 -2
@@ -7,6 +7,7 @@ var envify = require('envify/custom');
7 var grunt = require('grunt');
8 var UglifyJS = require('uglify-js');
9 var uglifyify = require('uglifyify');
10 +var _ = require('lodash');
11
12 var SIMPLE_TEMPLATE =
13 '/**\n\
@@ -65,7 +66,7 @@ var basic = {
66 after: [simpleBannerify]
67 };
68
68 -var min = grunt.util._.merge({}, basic, {
69 +var min = _.merge({}, basic, {
70 outfile: './build/react.min.js',
71 debug: false,
72 transforms: [envify({NODE_ENV: 'production'}), uglifyify],
@@ -94,7 +95,7 @@ var addons = {
95 after: [simpleBannerify]
96 };
97
97 -var addonsMin = grunt.util._.merge({}, addons, {
98 +var addonsMin = _.merge({}, addons, {
99 outfile: './build/react-with-addons.min.js',
100 debug: false,
101 transforms: [envify({NODE_ENV: 'production'}), uglifyify],
package.json
+2 -1
@@ -43,7 +43,7 @@
43 "coverify": "~1.0.4",
44 "envify": "~1.0.1",
45 "es5-shim": "~2.3.0",
46 - "grunt": "~0.4.1",
46 + "grunt": "~0.4.2",
47 "grunt-cli": "~0.1.9",
48 "grunt-compare-size": "~0.4.0",
49 "grunt-complexity": "~0.1.3",
@@ -54,6 +54,7 @@
54 "grunt-contrib-jshint": "~0.8.0",
55 "gzip-js": "~0.3.2",
56 "jasmine-tapreporter": "~0.2.2",
57 + "lodash": "~2.4.1",
58 "microtime": "~0.5.1",
59 "optimist": "~0.6.0",
60 "phantomjs": "~1.9",