Skip to content

Commit

Permalink
Merge remote-tracking branch 'arandilopez/tailwindcss-v4' into ci-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
bknoles committed Jan 30, 2025
2 parents e7ac985 + e7f0260 commit 9581bfa
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 47 deletions.
8 changes: 3 additions & 5 deletions lib/generators/inertia/install/install_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,9 @@ def install_example_page

def install_tailwind
say 'Installing Tailwind CSS'
add_dependencies(%w[tailwindcss postcss autoprefixer @tailwindcss/forms @tailwindcss/typography
@tailwindcss/container-queries])

template 'tailwind/tailwind.config.js', file_path('tailwind.config.js')
copy_file 'tailwind/postcss.config.js', file_path('postcss.config.js')
add_dependencies(%w[tailwindcss @tailwindcss/vite @tailwindcss/forms @tailwindcss/typography])
prepend_file vite_config_path, "import tailwindcss from '@tailwindcss/vite'\n"
insert_into_file vite_config_path, "\n tailwindcss(),", after: 'plugins: ['
copy_file 'tailwind/application.css', js_file_path('entrypoints/application.css')

if application_layout.exist?
Expand Down
15 changes: 3 additions & 12 deletions lib/generators/inertia/install/templates/tailwind/application.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "tailwindcss";

/*
@layer components {
.btn-primary {
@apply py-2 px-4 bg-blue-200;
}
}
*/
@plugin "@tailwindcss/typography";
@plugin "@tailwindcss/forms";

This file was deleted.

This file was deleted.

17 changes: 11 additions & 6 deletions spec/generators/install/install_generator_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@
directory('app/frontend') do
no_file('entrypoints/application.css')
end
no_file('postcss.config.js')
no_file('tailwind.config.js')
end)
end
end
Expand All @@ -67,7 +65,7 @@

before { prepare_application }

it 'installs Tailwind' do
it 'installs Tailwind with vite plugin' do
expect { generator }.not_to raise_error
expect_tailwind_config
end
Expand Down Expand Up @@ -134,10 +132,17 @@ def prepare_application(with_vite: true)
def expect_tailwind_config
expect(destination_root).to(have_structure do
directory('app/frontend') do
file('entrypoints/application.css')
file('entrypoints/application.css') do
contains('@import "tailwindcss";')
end
end
file('package.json') do
contains('"tailwindcss":')
contains('"@tailwindcss/vite":')
end
file('vite.config.ts') do
contains('tailwindcss(),')
end
file('postcss.config.js')
file('tailwind.config.js')
end)
end

Expand Down

0 comments on commit 9581bfa

Please sign in to comment.