From e994e06c541c226748f0fe5b99129abe7aa16049 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 3 Feb 2014 19:05:09 -0500 Subject: [PATCH 1/3] Revert "Removed redundant uglification" This reverts commit 86373d924cd5f5808e3da72ceb2bf171bc9142f0. --- grunt/config/browserify.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grunt/config/browserify.js b/grunt/config/browserify.js index 396c8eab244..6c63ac5796b 100644 --- a/grunt/config/browserify.js +++ b/grunt/config/browserify.js @@ -7,6 +7,7 @@ var deamdify = require('deamdify'); var envify = require('envify/custom'); var grunt = require('grunt'); var UglifyJS = require('uglify-js'); +var uglifyify = require('uglifyify'); var _ = require('lodash'); var SIMPLE_TEMPLATE = @@ -69,7 +70,7 @@ var basic = { var min = _.merge({}, basic, { outfile: './build/react.min.js', debug: false, - transforms: [envify({NODE_ENV: 'production'})], + transforms: [envify({NODE_ENV: 'production'}), uglifyify], after: [minify, bannerify] }); @@ -99,7 +100,7 @@ var addons = { var addonsMin = _.merge({}, addons, { outfile: './build/react-with-addons.min.js', debug: false, - transforms: [envify({NODE_ENV: 'production'})], + transforms: [envify({NODE_ENV: 'production'}), uglifyify], after: [minify, bannerify] }); From 77c53dd5d4eb258c93d654ae6d75f8830d0fb56e Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 3 Feb 2014 19:05:15 -0500 Subject: [PATCH 2/3] Revert "More optimizations and fix for JSXTransformer build" This reverts commit f1b7db9aef57d5b2a9264b51e4303540772f847f. --- grunt/config/browserify.js | 2 -- package.json | 3 +-- vendor/browser-transforms.js | 7 ++----- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/grunt/config/browserify.js b/grunt/config/browserify.js index 6c63ac5796b..f0ad28dfa13 100644 --- a/grunt/config/browserify.js +++ b/grunt/config/browserify.js @@ -3,7 +3,6 @@ 'use strict'; -var deamdify = require('deamdify'); var envify = require('envify/custom'); var grunt = require('grunt'); var UglifyJS = require('uglify-js'); @@ -81,7 +80,6 @@ var transformer = { outfile: './build/JSXTransformer.js', debug: false, standalone: 'JSXTransformer', - transforms: [deamdify], after: [simpleBannerify] }; diff --git a/package.json b/package.json index 69cd50e477d..21d9b71b8cc 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "devDependencies": { "benchmark": "~1.0.0", "coverify": "~1.0.4", - "deamdify": "~0.1.1", "envify": "~1.0.1", "es5-shim": "~2.3.0", "grunt": "~0.4.2", @@ -60,7 +59,7 @@ "phantomjs": "~1.9", "platform": "~1.0.0", "populist": "~0.1.6", - "pure-cjs": "~1.8.3", + "pure-cjs": "~1.8.0", "recast": "~0.5.6", "sauce-tunnel": "~1.1.0", "semver": "~2.2.1", diff --git a/vendor/browser-transforms.js b/vendor/browser-transforms.js index b0e61c6bb76..701693c34a7 100644 --- a/vendor/browser-transforms.js +++ b/vendor/browser-transforms.js @@ -20,6 +20,7 @@ var runScripts; var headEl; +var buffer = require('buffer'); var transform = require('jstransform').transform; var visitors = require('./fbtransform/visitors').transformVisitors; var docblock = require('jstransform/src/docblock'); @@ -96,10 +97,6 @@ var transformCode = function(code, source) { throw e; } - if (typeof btoa === 'undefined') { - return transformed.code; - } - var map = transformed.sourceMap.toJSON(); if (source == null) { source = "Inline JSX script"; @@ -114,7 +111,7 @@ var transformCode = function(code, source) { return ( transformed.code + '//# sourceMappingURL=data:application/json;base64,' + - btoa(unescape(encodeURIComponent(JSON.stringify(map)))) + buffer.Buffer(JSON.stringify(map)).toString('base64') ); } else { return code; From 9f1ed709d05286df519061cc34199c3e455cb200 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 3 Feb 2014 19:05:22 -0500 Subject: [PATCH 3/3] Revert "Switched from browserify to pure-cjs bundler." This reverts commit bff9731b66093239dc0408fb1d83df423925b6f9. --- grunt/tasks/browserify.js | 55 ++++++++++++++++++++++++++++----------- package.json | 2 +- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/grunt/tasks/browserify.js b/grunt/tasks/browserify.js index 9a0eea744bc..e36c545e17b 100644 --- a/grunt/tasks/browserify.js +++ b/grunt/tasks/browserify.js @@ -1,6 +1,6 @@ 'use strict'; -var cjs = require('pure-cjs'); +var browserify = require('browserify'); var grunt = require('grunt'); module.exports = function() { @@ -18,26 +18,51 @@ module.exports = function() { config.after = [config.after]; } - // Extract options + // create the bundle we'll work with + var entries = grunt.file.expand(config.entries); + var bundle = browserify(entries); + + // Make sure the things that need to be exposed are. + var requires = config.requires || {}; + if (requires instanceof Array) { + grunt.file.expand({ + nonull: true, // Keep IDs that don't expand to anything. + cwd: "src" + }, requires).forEach(function(name) { + bundle.require("./build/modules/" + name, { + expose: name.replace(/\.js$/i, "") + }); + }); + } else if (typeof requires === "object") { + Object.keys(requires).forEach(function(name) { + bundle.require(requires[name], { expose: name }); + }); + } + + // Extract other options var options = { - input: config.entries[0], - output: config.outfile, - map: config.debug, // sourcemaps - exports: config.standalone, // global - transform: config.transforms, - dryRun: true // we will write to disk ourselves + debug: config.debug, // sourcemaps + standalone: config.standalone // global }; + // TODO: make sure this works, test with this too + config.transforms.forEach(function(transform) { + bundle.transform({}, transform); + }); + // Actually bundle it up var _this = this; - cjs.transform(options).then(function(result) { - grunt.file.write(config.outfile, config.after.reduce(function(src, fn) { - return fn.call(_this, src); - }, result.code)); + bundle.bundle(options, function(err, src) { + if (err) { + grunt.log.error(err); + done(); + } - done(); - }, function(err) { - grunt.log.error(err); + config.after.forEach(function(fn) { + src = fn.call(_this, src); + }); + + grunt.file.write(config.outfile, src); done(); }); }; diff --git a/package.json b/package.json index 21d9b71b8cc..1d89f67fa7f 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ }, "devDependencies": { "benchmark": "~1.0.0", + "browserify": "~3.20.0", "coverify": "~1.0.4", "envify": "~1.0.1", "es5-shim": "~2.3.0", @@ -59,7 +60,6 @@ "phantomjs": "~1.9", "platform": "~1.0.0", "populist": "~0.1.6", - "pure-cjs": "~1.8.0", "recast": "~0.5.6", "sauce-tunnel": "~1.1.0", "semver": "~2.2.1",