diff --git a/grunt/config/browserify.js b/grunt/config/browserify.js index 6c63ac5796..f0ad28dfa1 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 69cd50e477..21d9b71b8c 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 b0e61c6bb7..701693c34a 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;