Fixes #883, uglify2 is now the only uglify option, removed uglify1 since it is out of date.

The r.js version will be revved to 2.2.0 to avoid possibilities of breaking things with this change.

Author: jrburke

.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
 .idea/
 /r.js
-build/jslib/uglifyjs2/temp
+build/jslib/uglifyjs/temp
 build/tests/builds
 build/tests/lib/amdefine/built.js
 build/tests/lib/anonUmdInteriorModules/main-built.js

build/example.build.js

@@ -99,8 +99,11 @@
     //How to optimize all the JS files in the build output directory.
     //Right now only the following values
     //are supported:
-    //- "uglify": (default) uses UglifyJS to minify the code.
-    //- "uglify2": in version 2.1.2+. Uses UglifyJS2.
+    //- "uglify": (default) uses UglifyJS to minify the code. Before version
+    //2.2, the uglify version was a 1.3.x release. With r.js 2.2, it is now
+    //a 2.x uglify release.
+    //- "uglify2": in version 2.1.2+. Uses UglifyJS2. As of r.js 2.2, this
+    //is just an alias for "uglify" now that 2.2 just uses uglify 2.x.
     //- "closure": uses Google's Closure Compiler in simple optimization
     //mode to minify the code. Only available if running the optimizer using
     //Java.
@@ -153,27 +156,16 @@
 
     //If using UglifyJS for script optimization, these config options can be
     //used to pass configuration values to UglifyJS.
-    //See https://github.com/mishoo/UglifyJS for the possible values.
+    //In r.js 2.2, this is now just uglify2, so see the 'uglify2' section below
+    //for example options. For r.js pre-2.2, this was for setting uglify 1.3.x
+    //options.
     uglify: {
-        toplevel: true,
-        ascii_only: true,
-        beautify: true,
-        max_line_length: 1000,
-
-        //How to pass uglifyjs defined symbols for AST symbol replacement,
-        //see "defines" options for ast_mangle in the uglifys docs.
-        defines: {
-            DEBUG: ['name', 'false']
-        },
-
-        //Custom value supported by r.js but done differently
-        //in uglifyjs directly:
-        //Skip the processor.ast_mangle() part of the uglify call (r.js 2.0.5+)
-        no_mangle: true
     },
 
     //If using UglifyJS2 for script optimization, these config options can be
-    //used to pass configuration values to UglifyJS2.
+    //used to pass configuration values to UglifyJS2. As of r.js 2.2, UglifyJS2
+    //is the only uglify option, so the config key can just be 'uglify' for
+    //r.js 2.2+.
     //For possible `output` values see:
     //https://github.com/mishoo/UglifyJS2#beautifier-options
     //For possible `compress` values see:
@@ -454,8 +446,9 @@
     out: function (text, sourceMapText) {
         //Do what you want with the optimized text here.
         //Starting in 2.1.10, if generateSourceMaps was set to true
-        //and optimize: 'uglify2' was used, then the second argument
-        //to this function, sourceMapText, will be the text of the source map.
+        //and optimize: 'uglify2' was used ('uglify' in r.js 2.2+), then the
+        //second argument to this function, sourceMapText, will be the text of
+        //the source map.
     },
 
     //In 2.0.12+: by setting "out" to "stdout", the optimized output is written

build/jslib/build.js

@@ -1260,6 +1260,16 @@ define(function (require) {
                             ' to insert in to a require([]) call.');
         }
 
+        //Support older configs with uglify2 settings, but now that uglify1 has
+        //been removed, just translate it to 'uglify' settings.
+        if (config.optimize === 'uglify2') {
+            config.optimize = 'uglify';
+        }
+        if (config.uglify2) {
+            config.uglify = config.uglify2;
+            delete config.uglify2;
+        }
+
         if (config.generateSourceMaps) {
             if (config.preserveLicenseComments && config.optimize !== 'none') {
                 throw new Error('Cannot use preserveLicenseComments and ' +
@@ -1270,7 +1280,7 @@ define(function (require) {
                     'http://requirejs.org/docs/errors.html#sourcemapcomments');
             } else if (config.optimize !== 'none' &&
                        config.optimize !== 'closure' &&
-                       config.optimize !== 'uglify2') {
+                       config.optimize !== 'uglify') {
                 //Allow optimize: none to pass, since it is useful when toggling
                 //minification on and off to debug something, and it implicitly
                 //works, since it does not need a source map.

build/jslib/optimize.js

@@ -2,10 +2,10 @@
 /*global define: false */
 
 define([ 'lang', 'logger', 'env!env/optimize', 'env!env/file', 'parse',
-         'pragma', 'uglifyjs/index', 'uglifyjs2',
+         'pragma', 'uglifyjs',
          'source-map'],
 function (lang,   logger,   envOptimize,        file,           parse,
-          pragma, uglify,             uglify2,
+          pragma, uglify,
           sourceMap) {
     'use strict';
 
@@ -403,40 +403,6 @@ function (lang,   logger,   envOptimize,        file,           parse,
 
         optimizers: {
             uglify: function (fileName, fileContents, outFileName, keepLines, config) {
-                var parser = uglify.parser,
-                    processor = uglify.uglify,
-                    ast, errMessage, errMatch;
-
-                config = config || {};
-
-                logger.trace("Uglifying file: " + fileName);
-
-                try {
-                    ast = parser.parse(fileContents, config.strict_semicolons);
-                    if (config.no_mangle !== true) {
-                        ast = processor.ast_mangle(ast, config);
-                    }
-                    ast = processor.ast_squeeze(ast, config);
-
-                    fileContents = processor.gen_code(ast, config);
-
-                    if (config.max_line_length) {
-                        fileContents = processor.split_lines(fileContents, config.max_line_length);
-                    }
-
-                    //Add trailing semicolon to match uglifyjs command line version
-                    fileContents += ';';
-                } catch (e) {
-                    errMessage = e.toString();
-                    errMatch = /\nError(\r)?\n/.exec(errMessage);
-                    if (errMatch) {
-                        errMessage = errMessage.substring(0, errMatch.index);
-                    }
-                    throw new Error('Cannot uglify file: ' + fileName + '. Skipping it. Error is:\n' + errMessage);
-                }
-                return fileContents;
-            },
-            uglify2: function (fileName, fileContents, outFileName, keepLines, config) {
                 var result, existingMap, resultMap, finalMap, sourceIndex,
                     uconfig = {},
                     existingMapPath = outFileName + '.map',
@@ -460,11 +426,11 @@ function (lang,   logger,   envOptimize,        file,           parse,
                     }
                 }
 
-                logger.trace("Uglify2 file: " + fileName);
+                logger.trace("Uglify file: " + fileName);
 
                 try {
                     //var tempContents = fileContents.replace(/\/\/\# sourceMappingURL=.*$/, '');
-                    result = uglify2.minify(fileContents, uconfig, baseName + '.src.js');
+                    result = uglify.minify(fileContents, uconfig, baseName + '.src.js');
                     if (uconfig.outSourceMap && result.map) {
                         resultMap = result.map;
                         if (!existingMap && !config._buildSourceMap) {
@@ -482,7 +448,7 @@ function (lang,   logger,   envOptimize,        file,           parse,
                         fileContents = result.code;
                     }
                 } catch (e) {
-                    throw new Error('Cannot uglify2 file: ' + fileName + '. Skipping it. Error is:\n' + e.toString());
+                    throw new Error('Cannot uglify file: ' + fileName + '. Skipping it. Error is:\n' + e.toString());
                 }
                 return fileContents;
             }

build/jslib/uglifyjs2.js renamed to build/jslib/uglifyjs.js

@@ -1,16 +1,23 @@
-This is a copy of UglifyJS from:
-https://github.com/mishoo/UglifyJS
+Sets up uglifyjs for use in the optimizer.
 
-Using "1.3.4", from npm. Check github tags and npm to find the latest version.
+Current embedded version: 2.6.1, source-map 0.5.3
 
-UglifyJS is under the BSD license, and it a third-party package.
+Steps:
 
-* The contents of the package were modified to wrap the modules in a define() wrapper,
-  including listing out the separate dependencies.
-* uglify-js.js was renamed to index.js
-* The scripts in the original lib directory were just placed alongside index.js to allow for an easier path mapping.
-* index.js was modified to use the ./ path instead of the ./lib/ path.
+    ./generate.sh
 
-If UglifyJS is updated, be sure to run a Java-backed optimizer test to be sure
-it still works in that environment. Array.prototype.reduce needed to be added
-to get the existing version to work.
+Then update this file with the uglifyjs version fetched.
+
+* UPDATE VERSION NUMBERS IN X.JS
+* Confirm the `raw` array in combine.js is correct.
+
+THINGS TO CHECK:
+
+* Compare node_modules/uglify-js/tools/node.js and what
+  is put in last part of the combined file.
+* REMOVE these functions from the end:
+    * readReservedFile
+    * exports.readReservedFile,
+    * exports.readDefaultReservedFile,
+    * exports.readNameCache,
+    * exports.writeNameCache

build/jslib/uglifyjs/README.md

@@ -31,10 +31,10 @@ 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,');
 
-fs.writeFileSync(__dirname + '/../uglifyjs2.js', [
+fs.writeFileSync(__dirname + '/../uglifyjs.js', [
     pre,
     raw,
-    'AST_Node.warn_function = function(txt) { logger.error("uglifyjs2 WARN: " + txt); };',
+    'AST_Node.warn_function = function(txt) { logger.error("uglifyjs WARN: " + txt); };',
     exportContents,
     post
  ].join('\n'), 'utf8');