🩹 Look for Vite manifest (#432)

* 🩹 Look for Vite manifest

* format

* 🧑‍💻 Resolve the Vite manifest using asset middleware

* 🎨 Prevent double build paths when resolving a Vite asset

* 🎨 Improve the Vite asset path replacement

* ✅ Fix asset tests

---------

Co-authored-by: Brandon <[email protected]>

src/Roots/Acorn/Assets/Manager.php

@@ -7,6 +7,7 @@
 use Roots\Acorn\Assets\Exceptions\ManifestNotFoundException;
 use Roots\Acorn\Assets\Middleware\LaravelMixMiddleware;
 use Roots\Acorn\Assets\Middleware\RootsBudMiddleware;
+use Roots\Acorn\Assets\Middleware\ViteMiddleware;
 
 /**
  * Manage assets manifests
@@ -37,6 +38,7 @@ class Manager
      */
     protected $middleware = [
         RootsBudMiddleware::class,
+        ViteMiddleware::class,
         LaravelMixMiddleware::class,
     ];
 
@@ -91,6 +93,7 @@ protected function resolve(string $name, ?array $config): ManifestContract
 
         $path = $config['path'];
         $url = $config['url'];
+
         $assets = isset($config['assets']) ? $this->getJsonManifest($config['assets']) : [];
         $bundles = isset($config['bundles']) ? $this->getJsonManifest($config['bundles']) : [];
 

src/Roots/Acorn/Assets/Manifest.php

@@ -48,6 +48,10 @@ public function __construct(string $path, string $uri, array $assets = [], ?arra
         $this->bundles = $bundles;
 
         foreach ($assets as $original => $revved) {
+            if (is_array($revved)) {
+                $revved = $revved['file'];
+            }
+
             $this->assets[$this->normalizeRelativePath($original)] = $this->normalizeRelativePath($revved);
         }
     }

src/Roots/Acorn/Assets/Middleware/ViteMiddleware.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Roots\Acorn\Assets\Middleware;
+
+use Illuminate\Support\Facades\Vite;
+
+class ViteMiddleware
+{
+    /**
+     * Handle the manifest config.
+     *
+     * @param  array  $config
+     * @return array
+     */
+    public function handle($config)
+    {
+        if (! Vite::manifestHash()) {
+            return $config;
+        }
+
+        return [
+            'url' => get_theme_file_uri('public/build'),
+            'path' => public_path('build'),
+            'bundles' => public_path('build/manifest.json'),
+            'assets' => public_path('build/manifest.json'),
+        ];
+    }
+}

src/Roots/Acorn/Assets/Vite.php

@@ -4,6 +4,8 @@
 
 use Illuminate\Foundation\Vite as FoundationVite;
 
+use function Roots\asset;
+
 class Vite extends FoundationVite
 {
     /**
@@ -15,6 +17,6 @@ class Vite extends FoundationVite
      */
     protected function assetPath($path, $secure = null)
     {
-        return \Roots\asset($path)->uri();
+        return str_replace('/build/build/', '/build/', asset($path)->uri());
     }
 }

tests/Assets/AssetsHelpersTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\Facade;
 use Roots\Acorn\Tests\Test\TestCase;
 
 use function Roots\asset;
@@ -8,8 +9,13 @@
 
 uses(TestCase::class);
 
+beforeEach(function () {
+    Facade::setFacadeApplication(new \Roots\Acorn\Application);
+});
+
 it('asset() can access the default manifest', function () {
     $app = new \Roots\Acorn\Application;
+
     $app->singleton('config', fn () => new \Illuminate\Config\Repository([
         'assets' => [
             'default' => 'app',
@@ -29,13 +35,15 @@
             ],
         ],
     ]));
+
     $app->register(\Roots\Acorn\Assets\AssetsServiceProvider::class);
 
     assertMatchesSnapshot(asset('app.js')->uri());
 });
 
 it('asset() can access a specified manifest', function () {
     $app = new \Roots\Acorn\Application;
+
     $app->singleton('config', fn () => new \Illuminate\Config\Repository([
         'assets' => [
             'default' => 'app',
@@ -55,6 +63,7 @@
             ],
         ],
     ]));
+
     $app->register(\Roots\Acorn\Assets\AssetsServiceProvider::class);
 
     assertMatchesSnapshot(asset('editor.js', 'editor')->uri());
@@ -81,13 +90,15 @@
             ],
         ],
     ]));
+
     $app->register(\Roots\Acorn\Assets\AssetsServiceProvider::class);
 
     assertMatchesSnapshot(bundle('app')->js()->toJson());
 });
 
 it('bundle() can access a specified manifest', function () {
     $app = new \Roots\Acorn\Application;
+
     $app->singleton('config', fn () => new \Illuminate\Config\Repository([
         'assets' => [
             'default' => 'app',
@@ -107,6 +118,7 @@
             ],
         ],
     ]));
+
     $app->register(\Roots\Acorn\Assets\AssetsServiceProvider::class);
 
     assertMatchesSnapshot(bundle('editor', 'editor')->js()->toJson());