Merge branch 'master' into 2.x-dev

hydephp · Jul 23, 2024 · 08ca495 · 08ca495
2 parents 1272423 + 1f23e69
commit 08ca495
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 41 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     },
     "require-dev": {
         "desilva/psalm-coverage": "dev-master",
-        "driftingly/rector-laravel": "^0.14.1",
+        "driftingly/rector-laravel": "^1.2.0",
         "hyde/monorepo-dev-tools": "*",
         "hyde/realtime-compiler": "*",
         "hyde/testing": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/packages/realtime-compiler/src/Actions/AssetFileLocator.php b/packages/realtime-compiler/src/Actions/AssetFileLocator.php
@@ -4,18 +4,22 @@
 
 namespace Hyde\RealtimeCompiler\Actions;
 
+use Illuminate\Support\Str;
+
 /**
  * Locate a static file to proxy.
  */
 class AssetFileLocator
 {
     public static function find(string $path): ?string
     {
+        $path = trim($path, '/');
+
         $strategies = [
-            BASE_PATH.'/_site'.$path,
-            BASE_PATH.'/_media'.$path,
-            BASE_PATH.'/_site'.basename($path),
-            BASE_PATH.'/_media/'.basename($path),
+            BASE_PATH.'/_site/'.$path,
+            BASE_PATH.'/_media/'.$path,
+            BASE_PATH.'/_site/'.Str::after($path, 'media/'),
+            BASE_PATH.'/_media/'.Str::after($path, 'media/'),
         ];
 
         foreach ($strategies as $strategy) {