Merge pull request #470 from lydell/safe-js-concat

Safely concatenate JavaScript

pipeline/compressors/__init__.py

@@ -142,7 +142,11 @@ class Compressor(object):
 
     def concatenate(self, paths):
         """Concatenate together a list of files"""
-        return "\n".join([self.read_text(path) for path in paths])
+        # Note how a semicolon is added between the two files to make sure that
+        # their behavior is not changed. '(expression1)\n(expression2)' calls
+        # `expression1` with `expression2` as an argument! Superfluos semicolons
+        # are valid in JavaScript and will be removed by the minifier.
+        return "\n;".join([self.read_text(path) for path in paths])
 
     def construct_asset_path(self, asset_path, css_path, output_filename, variant=None):
         """Return a rewritten asset URL for a stylesheet"""

tests/assets/js/first.js

-function concat() {
-  console.log(arguments);
-}
+(function() {
+  window.concat = function() {
+    console.log(arguments);
+  }
+}()) // No semicolon

tests/assets/js/second.js

-function cat() {
-  console.log("hello world");
-}
+(function() {
+  window.cat = function() {
+    console.log("hello world");
+  }
+}());

tests/tests/test_compressor.py

@@ -46,7 +46,7 @@ class CompressorTest(TestCase):
             _('pipeline/js/first.js'),
             _('pipeline/js/second.js')
         ])
-        self.assertEqual("""function concat() {\n  console.log(arguments);\n}\n\nfunction cat() {\n  console.log("hello world");\n}\n""", js)
+        self.assertEqual("""(function() {\n  window.concat = function() {\n    console.log(arguments);\n  }\n}()) // No semicolon\n\n;(function() {\n  window.cat = function() {\n    console.log("hello world");\n  }\n}());\n""", js)
 
     @patch.object(base64, 'b64encode')
     def test_encoded_content(self, mock):