diff --git a/src/Console/InstallsApiStack.php b/src/Console/InstallsApiStack.php index f88f73cf6..c38cfb738 100644 --- a/src/Console/InstallsApiStack.php +++ b/src/Console/InstallsApiStack.php @@ -82,7 +82,6 @@ protected function removeScaffoldingUnnecessaryForApis() // Remove frontend related files... $files->delete(base_path('package.json')); $files->delete(base_path('vite.config.js')); - $files->delete(base_path('tailwind.config.js')); $files->delete(base_path('postcss.config.js')); // Remove Laravel "welcome" view... diff --git a/src/Console/InstallsBladeStack.php b/src/Console/InstallsBladeStack.php index c5a078c5d..4d4be89e9 100644 --- a/src/Console/InstallsBladeStack.php +++ b/src/Console/InstallsBladeStack.php @@ -19,9 +19,8 @@ protected function installBladeStack() return [ '@tailwindcss/forms' => '^0.5.2', 'alpinejs' => '^3.4.2', - 'autoprefixer' => '^10.4.2', - 'postcss' => '^8.4.31', - 'tailwindcss' => '^3.1.0', + '@tailwindcss/vite' => '^4.0.0', + 'tailwindcss' => '^4.0.0', ] + $packages; }); @@ -64,8 +63,6 @@ protected function installBladeStack() $this->replaceInFile('Home', 'Dashboard', resource_path('views/welcome.blade.php')); // Tailwind / Vite... - copy(__DIR__.'/../../stubs/default/tailwind.config.js', base_path('tailwind.config.js')); - copy(__DIR__.'/../../stubs/default/postcss.config.js', base_path('postcss.config.js')); copy(__DIR__.'/../../stubs/default/vite.config.js', base_path('vite.config.js')); copy(__DIR__.'/../../stubs/default/resources/css/app.css', resource_path('css/app.css')); copy(__DIR__.'/../../stubs/default/resources/js/app.js', resource_path('js/app.js')); diff --git a/src/Console/InstallsInertiaStacks.php b/src/Console/InstallsInertiaStacks.php index acd5b8316..520393874 100644 --- a/src/Console/InstallsInertiaStacks.php +++ b/src/Console/InstallsInertiaStacks.php @@ -25,9 +25,8 @@ protected function installInertiaVueStack() '@inertiajs/vue3' => '^2.0.0', '@tailwindcss/forms' => '^0.5.3', '@vitejs/plugin-vue' => '^5.0.0', - 'autoprefixer' => '^10.4.12', - 'postcss' => '^8.4.31', - 'tailwindcss' => '^3.2.1', + '@tailwindcss/vite' => '^4.0.0', + 'tailwindcss' => '^4.0.0', 'vue' => '^3.4.0', ] + $packages; }); @@ -146,9 +145,7 @@ protected function installInertiaVueStack() copy(__DIR__.'/../../stubs/inertia-common/routes/auth.php', base_path('routes/auth.php')); // Tailwind / Vite... - copy(__DIR__.'/../../stubs/default/resources/css/app.css', resource_path('css/app.css')); - copy(__DIR__.'/../../stubs/default/postcss.config.js', base_path('postcss.config.js')); - copy(__DIR__.'/../../stubs/inertia-common/tailwind.config.js', base_path('tailwind.config.js')); + copy(__DIR__.'/../../stubs/inertia-vue/resources/css/app.css', resource_path('css/app.css')); copy(__DIR__.'/../../stubs/inertia-vue/vite.config.js', base_path('vite.config.js')); if ($this->option('typescript')) { @@ -237,9 +234,8 @@ protected function installInertiaReactStack() '@inertiajs/react' => '^2.0.0', '@tailwindcss/forms' => '^0.5.3', '@vitejs/plugin-react' => '^4.2.0', - 'autoprefixer' => '^10.4.12', - 'postcss' => '^8.4.31', - 'tailwindcss' => '^3.2.1', + '@tailwindcss/vite' => '^4.0.0', + 'tailwindcss' => '^4.0.0', 'react' => '^18.2.0', 'react-dom' => '^18.2.0', ] + $packages; @@ -364,8 +360,6 @@ protected function installInertiaReactStack() // Tailwind / Vite... copy(__DIR__.'/../../stubs/default/resources/css/app.css', resource_path('css/app.css')); - copy(__DIR__.'/../../stubs/default/postcss.config.js', base_path('postcss.config.js')); - copy(__DIR__.'/../../stubs/inertia-common/tailwind.config.js', base_path('tailwind.config.js')); copy(__DIR__.'/../../stubs/inertia-react/vite.config.js', base_path('vite.config.js')); if ($this->option('typescript')) { @@ -379,12 +373,9 @@ protected function installInertiaReactStack() $this->replaceInFile('"vite build', '"tsc && vite build', base_path('package.json')); $this->replaceInFile('.jsx', '.tsx', base_path('vite.config.js')); $this->replaceInFile('.jsx', '.tsx', resource_path('views/app.blade.php')); - $this->replaceInFile('.vue', '.tsx', base_path('tailwind.config.js')); } else { copy(__DIR__.'/../../stubs/inertia-common/jsconfig.json', base_path('jsconfig.json')); copy(__DIR__.'/../../stubs/inertia-react/resources/js/app.jsx', resource_path('js/app.jsx')); - - $this->replaceInFile('.vue', '.jsx', base_path('tailwind.config.js')); } if (file_exists(resource_path('js/app.js'))) { diff --git a/src/Console/InstallsLivewireStack.php b/src/Console/InstallsLivewireStack.php index 93c75abd9..fa35b452c 100644 --- a/src/Console/InstallsLivewireStack.php +++ b/src/Console/InstallsLivewireStack.php @@ -19,9 +19,8 @@ protected function installLivewireStack($functional = false) $this->updateNodePackages(function ($packages) { return [ '@tailwindcss/forms' => '^0.5.2', - 'autoprefixer' => '^10.4.2', - 'postcss' => '^8.4.31', - 'tailwindcss' => '^3.1.0', + '@tailwindcss/vite' => '^4.0.0', + 'tailwindcss' => '^4.0.0', ] + $packages; }); @@ -93,8 +92,6 @@ protected function installLivewireStack($functional = false) copy(__DIR__.'/../../stubs/livewire-common/routes/auth.php', base_path('routes/auth.php')); // Tailwind / Vite... - copy(__DIR__.'/../../stubs/default/tailwind.config.js', base_path('tailwind.config.js')); - copy(__DIR__.'/../../stubs/default/postcss.config.js', base_path('postcss.config.js')); copy(__DIR__.'/../../stubs/default/vite.config.js', base_path('vite.config.js')); copy(__DIR__.'/../../stubs/default/resources/css/app.css', resource_path('css/app.css')); diff --git a/stubs/default/postcss.config.js b/stubs/default/postcss.config.js deleted file mode 100644 index 49c0612d5..000000000 --- a/stubs/default/postcss.config.js +++ /dev/null @@ -1,6 +0,0 @@ -export default { - plugins: { - tailwindcss: {}, - autoprefixer: {}, - }, -}; diff --git a/stubs/default/resources/css/app.css b/stubs/default/resources/css/app.css index b5c61c956..db5626ad7 100644 --- a/stubs/default/resources/css/app.css +++ b/stubs/default/resources/css/app.css @@ -1,3 +1,12 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; +@import 'tailwindcss'; + +@source '../../vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php'; +@source '../../storage/framework/views/*.php'; +@source '../views/**/*.blade.php'; + +@theme { + --font-sans: Figtree, ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', + 'Noto Color Emoji'; +} + +@plugin '@tailwindcss/forms'; \ No newline at end of file diff --git a/stubs/default/resources/views/auth/login.blade.php b/stubs/default/resources/views/auth/login.blade.php index 80e1b392d..62a3f88af 100644 --- a/stubs/default/resources/views/auth/login.blade.php +++ b/stubs/default/resources/views/auth/login.blade.php @@ -27,14 +27,14 @@