Fixes requirejs#297, uglifyjs on command line adds trailing semicolon. Match that behavior.

jrburke · jrburke · commit dcf2aeba0d8f · 2012-11-19T17:24:16.000-08:00
diff --git a/build/jslib/optimize.js b/build/jslib/optimize.js
@@ -16,7 +16,8 @@ function (lang,   logger,   envOptimize,        file,           parse,
     var optimize,
         cssImportRegExp = /\@import\s+(url\()?\s*([^);]+)\s*(\))?([\w, ]*)(;)?/g,
         cssCommentImportRegExp = /\/\*[^\*]*@import[^\*]*\*\//g,
-        cssUrlRegExp = /\url\(\s*([^\)]+)\s*\)?/g;
+        cssUrlRegExp = /\url\(\s*([^\)]+)\s*\)?/g,
+        endSemicolonRegExp = /;\s*$/;
 
     /**
      * If an URL from a CSS url value contains start/end quotes, remove them.
@@ -362,6 +363,9 @@ function (lang,   logger,   envOptimize,        file,           parse,
                     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);
diff --git a/build/tests/lib/comments/expected.js b/build/tests/lib/comments/expected.js
@@ -10,4 +10,4 @@
 
 //@license comment to be found
 
-define("bang",[],function(){return{name:"bang"}}),define("license",{name:"license"})
+define("bang",[],function(){return{name:"bang"}}),define("license",{name:"license"});
diff --git a/build/tests/lib/comments/noPartialDupe/expected.js b/build/tests/lib/comments/noPartialDupe/expected.js
@@ -6,4 +6,4 @@
 //     For all details and documentation:
 //     http://documentcloud.github.com/underscore
 
-(function(){})()
+(function(){})();
diff --git a/build/tests/lib/comments/unique/expected.js b/build/tests/lib/comments/unique/expected.js
@@ -18,4 +18,4 @@
  * sdf sdf
  */
 
-define("main",function(){})
+define("main",function(){});

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@`
`10`	`10`
`11`	`11`	`//@license comment to be found`
`12`	`12`
`13`		`-define("bang",[],function(){return{name:"bang"}}),define("license",{name:"license"})`
	`13`	`+define("bang",[],function(){return{name:"bang"}}),define("license",{name:"license"});`