diff --git a/app/config/container.php b/app/config/container.php index 8cb8a91..45ddacf 100644 --- a/app/config/container.php +++ b/app/config/container.php @@ -19,10 +19,11 @@ return [ /** Path definitions */ 'base_path' => dirname(__DIR__, 2), 'app_path' => dirname(__DIR__), + 'assets_path' => string('{app_path}/assets'), 'cache_path' => string('{app_path}/cache'), 'config_path' => string('{app_path}/config'), 'files_path' => env('FILES_PATH', get('base_path')), - 'manifest_path' => string('{app_path}/manifest.json'), + 'manifest_path' => string('{assets_path}/manifest.json'), 'source_path' => string('{app_path}/src'), 'translations_path' => string('{app_path}/translations'), 'views_path' => string('{app_path}/views'), diff --git a/app/src/ViewFunctions/Vite.php b/app/src/ViewFunctions/Vite.php index c2b1a40..0d7664f 100644 --- a/app/src/ViewFunctions/Vite.php +++ b/app/src/ViewFunctions/Vite.php @@ -35,8 +35,8 @@ class Vite extends ViewFunction return Collection::make($assets)->map( static fn (string $asset): string => match (mb_substr($asset, (int) mb_strrpos($asset, '.'))) { - '.js' => sprintf('', $manifest->{$asset}->file), - '.css' => sprintf('', $manifest->{$asset}->file), + '.js' => sprintf('', $manifest->{$asset}->file), + '.css' => sprintf('', $manifest->{$asset}->file), default => throw new UnexpectedValueException(sprintf('Unsupported asset type: %s', $asset)) } ); diff --git a/vite.config.js b/vite.config.js index 2f376aa..962071b 100644 --- a/vite.config.js +++ b/vite.config.js @@ -4,9 +4,10 @@ import tailwindcss from '@tailwindcss/vite' export default defineConfig(({ command }) => { return { build: { - outDir: 'app', + outDir: '.', emptyOutDir: false, - manifest: 'manifest.json', + assetsDir: 'app/assets', + manifest: 'app/assets/manifest.json', rollupOptions: { input: [ 'app/resources/css/app.css',