Tweaks the regex

tonysm · Nov 26, 2023 · b87ab34 · b87ab34
1 parent bbd2e95
commit b87ab34
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/Actions/FixJsImportPaths.php b/src/Actions/FixJsImportPaths.php
@@ -47,7 +47,7 @@ private function updatedJsImports(SplFileInfo $file)
 
             try {
                 $lines[$index] = preg_replace_callback(
-                    '#import (?:.*["\'])(\..*)(?:[\'"];?.*)#',
+                    '#import.+["\']([\.]+.*)["\']#',
                     function ($matches) use ($file) {
                         $replaced = $this->replaceDotImports($file, $matches[1], $matches[0]);
 

diff --git a/tests/FixJsImportPathsTest.php b/tests/FixJsImportPathsTest.php
@@ -32,7 +32,7 @@ public function fixes_imports()
 
         // Root files...
         $this->assertTrue(File::exists($this->tmpFolder.DIRECTORY_SEPARATOR.'app.js'));
-        $this->assertMatchesRegularExpression('#import ["\']bootstrap["\']#', File::get($this->tmpFolder.DIRECTORY_SEPARATOR.'app.js'));
+        $this->assertMatchesRegularExpression('#import ["\']bootstrap["\']\nimport ["\']libs["\']#', File::get($this->tmpFolder.DIRECTORY_SEPARATOR.'app.js'));
         $this->assertMatchesRegularExpression('#import axios from ["\']axios["\']#', File::get($this->tmpFolder.DIRECTORY_SEPARATOR.'bootstrap.js'));
 
         // Libs folders...

diff --git a/tests/stubs/fixing-paths/app.js b/tests/stubs/fixing-paths/app.js
@@ -1 +1,2 @@
 import './bootstrap'
+import './libs'