Update Vite.php

Author: lukaskleinschmidt

Vite.php

@@ -101,7 +101,7 @@ public function __invoke(array|string $entries, string $buildDirectory = null):
             }
 
             if ($optional || $query !== $value) {
-                if (file_exists($this->app->root('base') . '/' . $query)) {
+                if ($this->exists($query)) {
                     $entries[$key] = $query;
                     $exists[]      = $query;
                 } else {
@@ -149,67 +149,9 @@ public function __invoke(array|string $entries, string $buildDirectory = null):
                 $assets[$file] = $this->makeTag(...$args);
             }
 
-            foreach ($chunk['imports'] ?? [] as $key) {
-                $chunk = $this->chunk($manifest, $key);
-                $file  = $chunk['file'];
-
-                if (! isset($preloads[$file])) {
-                    $preloads[$file] = $this->makePreloadTag(
-                        $key,
-                        url($buildDirectory . '/'. $file),
-                        $chunk,
-                        $manifest,
-                    );
-                }
-
-                foreach ($chunk['css'] ?? [] as $key) {
-                    $chunks = array_filter($manifest, fn ($value) =>
-                        $value['file'] === $key
-                    );
-
-                    $chunk = $chunks[$key = array_key_first($chunks)];
-                    $file  = $chunk['file'];
-
-                    $args = [
-                        $key,
-                        url($buildDirectory . '/'. $file),
-                        $chunk,
-                        $manifest,
-                    ];
-
-                    if (! isset($preloads[$file])) {
-                        $preloads[$file] = $this->makePreloadTag(...$args);
-                    }
-
-                    if (! isset($assets[$file])) {
-                        $assets[$file] = $this->makeTag(...$args);
-                    }
-                }
-            }
+            $this->resolveImports($chunk, $buildDirectory, $manifest, $assets, $preloads);
 
-            foreach ($chunk['css'] ?? [] as $key) {
-                $chunks = array_filter($manifest, fn ($value) =>
-                    $value['file'] === $key
-                );
-
-                $chunk = $chunks[$key = array_key_first($chunks)];
-                $file  = $chunk['file'];
-
-                $args = [
-                    $key,
-                    url($buildDirectory . '/'. $file),
-                    $chunk,
-                    $manifest,
-                ];
-
-                if (! isset($preloads[$file])) {
-                    $preloads[$file] = $this->makePreloadTag(...$args);
-                }
-
-                if (! isset($assets[$file])) {
-                    $assets[$file] = $this->makeTag(...$args);
-                }
-            }
+            $this->resolveCss($chunk, $buildDirectory, $manifest, $assets, $preloads);
         }
 
         uksort($preloads, fn ($a, $b) =>
@@ -253,6 +195,28 @@ protected function chunk(array $manifest, string $file): array
         return $manifest[$file];
     }
 
+    /**
+     * Check if a source file exists.
+     */
+    protected function exists(string $file): bool
+    {
+        $base  = $this->app->root('vite:base') ?? $this->app->root('base');
+        $index = $this->app->root('index');
+
+        $paths = [
+            $base ?? $index,
+            dirname($index),
+        ];
+
+        foreach ($paths as $path) {
+            if (file_exists(rtrim($path, '/') . '/' . $file)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Get the the manifest file for the given build directory.
      *
@@ -486,6 +450,59 @@ public function nonce(): ?string
         return $this->nonce;
     }
 
+    /**
+     * Resolve related css files.
+     */
+    public function resolveCss(array $chunk, string $buildDirectory, array $manifest, array &$assets, array &$preloads): void
+    {
+        foreach ($chunk['css'] ?? [] as $key) {
+            $chunks = array_filter($manifest, fn ($value) =>
+                $value['file'] === $key
+            );
+
+            $key   = array_key_first($chunks);
+            $chunk = current($chunks);
+            $file  = $chunk['file'];
+
+            $args = [
+                $key,
+                url($buildDirectory . '/'. $file),
+                $chunk,
+                $manifest,
+            ];
+
+            if (! isset($assets[$file])) {
+                $assets[$file] = $this->makeTag(...$args);
+            }
+
+            if (! isset($preloads[$file])) {
+                $preloads[$file] = $this->makePreloadTag(...$args);
+            }
+        }
+    }
+
+    /**
+     * Resolve related imports.
+     */
+    public function resolveImports(array $chunk, string $buildDirectory, array $manifest, array &$assets, array &$preloads): void
+    {
+        foreach ($chunk['imports'] ?? [] as $key) {
+            $chunk = $this->chunk($manifest, $key);
+            $file  = $chunk['file'];
+
+            if (! isset($preloads[$file])) {
+                $preloads[$file] = $this->makePreloadTag(
+                    $key,
+                    url($buildDirectory . '/'. $file),
+                    $chunk,
+                    $manifest,
+                );
+            }
+
+            $this->resolveCss($chunk, $buildDirectory, $manifest, $assets, $preloads);
+        }
+    }
+
     /**
      * Generate or set a Content Security Policy nonce to apply to all generated tags.
      */