From 1727b832f192ca08b98c927c53ebe8a34bed789a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 14 Apr 2023 12:43:19 +0200 Subject: [PATCH] Fix Vite asset compilation and usage for default mail template --- app/Providers/AppServiceProvider.php | 8 ++++++++ resources/ts/bo.ts | 3 +++ resources/ts/fo.ts | 3 +++ resources/views/vendor/mail/html/header.blade.php | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 860d1c5..24580a6 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -7,6 +7,7 @@ use Illuminate\Pagination\Paginator; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\URL; +use Illuminate\Support\Facades\Vite; use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider @@ -88,6 +89,13 @@ class AppServiceProvider extends ServiceProvider private function sharetoView() { if (!app()->runningInConsole()) { + // * VITE ALIASES + Vite::macro('image', function (string $asset) { + /** @var \Illuminate\Foundation\Vite $self */ + $self = $this; + $self->asset("resources/assets/images/{$asset}"); + }); + // * FORCE BOOTSTRAP PAGINATOR (or custom if in front) // Early boot, request wont be filled as expected. if (collect(explode('/', \request()->getPathInfo()))->get(1) === 'bo') { diff --git a/resources/ts/bo.ts b/resources/ts/bo.ts index 8dff049..e892f20 100644 --- a/resources/ts/bo.ts +++ b/resources/ts/bo.ts @@ -1,3 +1,6 @@ +// ASSETS +import.meta.glob(["./../assets/images/**"]); + // UTILITIES import "./utilities/bootstrap"; import "./utilities/fontawesome"; diff --git a/resources/ts/fo.ts b/resources/ts/fo.ts index 8ecb4b7..ae46fda 100644 --- a/resources/ts/fo.ts +++ b/resources/ts/fo.ts @@ -1,3 +1,6 @@ +// ASSETS +import.meta.glob(["./../assets/images/**"]); + // UTILITIES import "./utilities/bootstrap"; import "./utilities/fontawesome"; diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php index 342648f..99e1221 100644 --- a/resources/views/vendor/mail/html/header.blade.php +++ b/resources/views/vendor/mail/html/header.blade.php @@ -5,7 +5,7 @@ @else {{-- FIXME: Personaliser ca --}} -
+
{{ $slot }} @endif