Fixes #929, uglify's addFile declaration and 0.10/0.12 nodes

jrburke · jrburke · commit 59a9c8cc7145 · 2016-09-05T09:49:32.000-07:00
diff --git a/build/jslib/uglifyjs.js b/build/jslib/uglifyjs.js
@@ -9075,7 +9075,7 @@ exports.minify = function(files, options, name) {
     if (options.spidermonkey) {
         toplevel = AST_Node.from_mozilla_ast(files);
     } else {
-        function addFile(file, fileUrl) {
+        var addFile = function(file, fileUrl) {
             var code = options.fromString
                 ? file
                 : rjsFile.readFile(file, "utf8");
diff --git a/build/jslib/uglifyjs/combine.js b/build/jslib/uglifyjs/combine.js
@@ -31,6 +31,11 @@ exportContents = exportContents.replace(/UglifyJS\./g, '');
 exportContents = exportContents.replace('exports.minify = function(files, options) {', 'exports.minify = function(files, options, name) {');
 exportContents = exportContents.replace('filename: options.fromString ? i : file,', 'filename: options.fromString ? name : file,');
 
+// Node 0.10/0.12 do not like the addFile function declaration with the "use strict"
+// that is used near that declaration, but not at the top of the file.
+// https://github.com/requirejs/r.js/pull/929
+exportContents = exportContents.replace(/function addFile\(/, 'var addFile = function(');
+
 fs.writeFileSync(__dirname + '/../uglifyjs.js', [
     pre,
     raw,
