diff --git a/grunt/config/browserify.js b/grunt/config/browserify.js index ffe7b2df60..f0ad28dfa1 100644 --- a/grunt/config/browserify.js +++ b/grunt/config/browserify.js @@ -7,6 +7,7 @@ var envify = require('envify/custom'); var grunt = require('grunt'); var UglifyJS = require('uglify-js'); var uglifyify = require('uglifyify'); +var _ = require('lodash'); var SIMPLE_TEMPLATE = '/**\n\ @@ -65,7 +66,7 @@ var basic = { after: [simpleBannerify] }; -var min = grunt.util._.merge({}, basic, { +var min = _.merge({}, basic, { outfile: './build/react.min.js', debug: false, transforms: [envify({NODE_ENV: 'production'}), uglifyify], @@ -94,7 +95,7 @@ var addons = { after: [simpleBannerify] }; -var addonsMin = grunt.util._.merge({}, addons, { +var addonsMin = _.merge({}, addons, { outfile: './build/react-with-addons.min.js', debug: false, transforms: [envify({NODE_ENV: 'production'}), uglifyify], diff --git a/grunt/tasks/browserify.js b/grunt/tasks/browserify.js index c83ed7e65c..e36c545e17 100644 --- a/grunt/tasks/browserify.js +++ b/grunt/tasks/browserify.js @@ -46,7 +46,9 @@ module.exports = function() { }; // TODO: make sure this works, test with this too - config.transforms.forEach(bundle.transform, bundle); + config.transforms.forEach(function(transform) { + bundle.transform({}, transform); + }); // Actually bundle it up var _this = this; diff --git a/package.json b/package.json index fd59df67bd..351ed6b58e 100644 --- a/package.json +++ b/package.json @@ -39,21 +39,22 @@ }, "devDependencies": { "benchmark": "~1.0.0", - "browserify": "~2.36.1", - "coverify": "~0.1.1", + "browserify": "~3.20.0", + "coverify": "~1.0.4", "envify": "~1.0.1", - "es5-shim": "~2.1.0", - "grunt": "~0.4.1", + "es5-shim": "~2.3.0", + "grunt": "~0.4.2", "grunt-cli": "~0.1.9", "grunt-compare-size": "~0.4.0", "grunt-complexity": "~0.1.3", "grunt-contrib-clean": "~0.5.0", - "grunt-contrib-compress": "~0.5.1", - "grunt-contrib-connect": "~0.5.0", - "grunt-contrib-copy": "~0.4.1", - "grunt-contrib-jshint": "~0.7.2", + "grunt-contrib-compress": "~0.6.0", + "grunt-contrib-connect": "~0.6.0", + "grunt-contrib-copy": "~0.5.0", + "grunt-contrib-jshint": "~0.8.0", "gzip-js": "~0.3.2", "jasmine-tapreporter": "~0.2.2", + "lodash": "~2.4.1", "microtime": "~0.5.1", "optimist": "~0.6.0", "phantomjs": "~1.9", @@ -64,7 +65,7 @@ "semver": "~2.2.1", "tmp": "~0.0.18", "uglify-js": "~2.4.0", - "uglifyify": "~1.0.1", + "uglifyify": "~1.1.0", "wd": "~0.2.6" }, "engines": {