Merge pull request #17 from StyleShit/fix/windows-crlf

fix: conditional includes are not working properly on Windows
spatie · Oct 9, 2023 · adc77d7 · adc77d7
2 parents 04fdb31 + 6a30c14
commit adc77d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/Commenters/BladeCommenters/IncludeUnlessCommenter.php b/src/Commenters/BladeCommenters/IncludeUnlessCommenter.php
@@ -13,7 +13,7 @@ public function pattern(): string
             $excludeRegex = '(?!'.implode('|', $excludes).')';
         }
 
-        return '/(?:^|\n)(\s*)@includeUnless\(([^)]+),\s*[\'"]'.$excludeRegex.'([^\'"]*)[\'"]\)/';
+        return '/(?:^|\n|\r\n)(\s*)@includeUnless\(([^)]+),\s*[\'"]'.$excludeRegex.'([^\'"]*)[\'"]\)/';
     }
 
     public function replacement(): string

diff --git a/src/Commenters/BladeCommenters/IncludeWhenCommenter.php b/src/Commenters/BladeCommenters/IncludeWhenCommenter.php
@@ -13,7 +13,7 @@ public function pattern(): string
             $excludesRegex = '(?!'.implode('|', $excludes).')';
         }
 
-        return '/(?:^|\n)(\s*)@includeWhen\(([^)]+),\s*[\'"]'.$excludesRegex.'([^\'"]*)[\'"]\)/';
+        return '/(?:^|\n|\r\n)(\s*)@includeWhen\(([^)]+),\s*[\'"]'.$excludesRegex.'([^\'"]*)[\'"]\)/';
     }
 
     public function replacement(): string

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -51,6 +51,14 @@ public function rerunServiceProvider(): void
     public function preparedLivewireHtmlForSnapshot(string $html): string
     {
         // remove all wire:* attributes
-        return preg_replace('/(\s+(wire:\w+)=(?<q>[\'"]).*?(?P=q))/s', '', $html);
+        $html = preg_replace('/(\s+(wire:[\w-]+)=(?<q>[\'"]).*?(?P=q))/s', '', $html);
+
+        // remove wire-end random string
+        $html = preg_replace('/wire-end:[^ ]+\s*/', '', $html);
+
+        // remove "livewire component" comment that is added only by livewire <= 2.x
+        $html = str_replace("\n<!-- Livewire Component -->", '', $html);
+
+        return $html;
     }
 }