Merge cfb695d into 9ba1b45

matthiasmullie · Apr 25, 2020 · f4a300e · f4a300e
2 parents 9ba1b45 + cfb695d
commit f4a300e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/JS.php b/src/JS.php
@@ -209,7 +209,7 @@ protected function stripComments()
         $this->registerPattern('/\/\*.*?\*\//s', '');
 
         // single-line comments
-        $this->registerPattern('/\/\/.*$/m', '');
+        $this->registerPattern('/(\/\/)(?!i).*$/m', '');
     }
 
     /**

diff --git a/tests/js/JSTest.php b/tests/js/JSTest.php
@@ -1324,6 +1324,24 @@ function someOtherFunction() {
             '/^\[(x| )\](?=\s)/i',
         );
 
+        // https://github.com/matthiasmullie/minify/issues/323
+        $tests[] = array(
+            'a = {
+                device: [
+                    [/android.+(transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+|nexus 7)/i],
+                    [/(sony)\s(tablet\s[ps])\sbuild\//i, /(sony)?(?:sgp.+)\sbuild\//i],
+                    [/(?:sony)?(?:(?:(?:c|d)\d{4})|(?:so[-l].+))\sbuild\//i]
+                ]
+            }',
+            'a={device:[[/android.+(transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+|nexus 7)/i],[/(sony)\s(tablet\s[ps])\sbuild\//i,/(sony)?(?:sgp.+)\sbuild\//i],[/(?:sony)?(?:(?:(?:c|d)\d{4})|(?:so[-l].+))\sbuild\//i]]}'
+        );
+
+        // https://github.com/matthiasmullie/minify/issues/329
+        $tests[] = array(
+            'test: [/\sedg\//i],',
+            'test:[/\sedg\//i],',
+        );
+
         // known minified files to help doublecheck changes in places not yet
         // anticipated in these tests
         $files = glob(__DIR__.'/sample/minified/*.js');