Changeset 3883:3e89d87ed9bd for build-tools

Timestamp:

09/19/18 10:22:06 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Preserve newlines (LF) in template string in minifier

Location:

build-tools

Files:

• Minifier.php (modified) (1 diff)
• min-js.php (modified) (1 diff)

build-tools/Minifier.php

@@ -481 +481 @@
                 // block below.
                 case "\n":
-                    throw new \RuntimeException('Unclosed string at position: ' . $startpos);
+                    if ($stringType !== '`') {
+                        throw new \RuntimeException('Unclosed string at position: ' . $startpos);
+                    } else {
+                        echo $this->a;
+                    }
                     break;
 

build-tools/min-js.php

@@ -28 +28 @@
     fclose($fp);
 } catch (Exception $e) {
-    fwrite(STDERR, $e->getMessage() . "\n");
+    fwrite(STDERR, $e->getMessage() . ($js ? "($js)" : '') . "\n");
     exit(1);
 }