Skip to content

Commit 53c2c3c

Browse files
authored
Merge pull request #187 from inertiajs/ci-fixes
Ci fixes
2 parents ffb19f6 + 9581bfa commit 53c2c3c

File tree

6 files changed

+21
-48
lines changed

6 files changed

+21
-48
lines changed

lib/generators/inertia/install/install_generator.rb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,9 @@ def install_example_page
151151

152152
def install_tailwind
153153
say 'Installing Tailwind CSS'
154-
add_dependencies(%w[tailwindcss postcss autoprefixer @tailwindcss/forms @tailwindcss/typography
155-
@tailwindcss/container-queries])
156-
157-
template 'tailwind/tailwind.config.js', file_path('tailwind.config.js')
158-
copy_file 'tailwind/postcss.config.js', file_path('postcss.config.js')
154+
add_dependencies(%w[tailwindcss @tailwindcss/vite @tailwindcss/forms @tailwindcss/typography])
155+
prepend_file vite_config_path, "import tailwindcss from '@tailwindcss/vite'\n"
156+
insert_into_file vite_config_path, "\n tailwindcss(),", after: 'plugins: ['
159157
copy_file 'tailwind/application.css', js_file_path('entrypoints/application.css')
160158

161159
if application_layout.exist?
@@ -265,7 +263,7 @@ def vite_tag
265263

266264
def inertia_resolved_version
267265
@inertia_resolved_version ||= Gem::Version.new(
268-
`npm show @inertiajs/core@#{options[:inertia_version]} version`.strip
266+
`npm show @inertiajs/core@#{options[:inertia_version]} version --json | tail -n2 | head -n1 | tr -d '", '`.strip
269267
)
270268
end
271269

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import "tailwindcss";
42

5-
/*
6-
7-
@layer components {
8-
.btn-primary {
9-
@apply py-2 px-4 bg-blue-200;
10-
}
11-
}
12-
13-
*/
3+
@plugin "@tailwindcss/typography";
4+
@plugin "@tailwindcss/forms";

lib/generators/inertia/install/templates/tailwind/postcss.config.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

lib/generators/inertia/install/templates/tailwind/tailwind.config.js.tt

Lines changed: 0 additions & 18 deletions
This file was deleted.

spec/generators/install/install_generator_spec.rb

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@
5555
directory('app/frontend') do
5656
no_file('entrypoints/application.css')
5757
end
58-
no_file('postcss.config.js')
59-
no_file('tailwind.config.js')
6058
end)
6159
end
6260
end
@@ -67,7 +65,7 @@
6765

6866
before { prepare_application }
6967

70-
it 'installs Tailwind' do
68+
it 'installs Tailwind with vite plugin' do
7169
expect { generator }.not_to raise_error
7270
expect_tailwind_config
7371
end
@@ -134,10 +132,17 @@ def prepare_application(with_vite: true)
134132
def expect_tailwind_config
135133
expect(destination_root).to(have_structure do
136134
directory('app/frontend') do
137-
file('entrypoints/application.css')
135+
file('entrypoints/application.css') do
136+
contains('@import "tailwindcss";')
137+
end
138+
end
139+
file('package.json') do
140+
contains('"tailwindcss":')
141+
contains('"@tailwindcss/vite":')
142+
end
143+
file('vite.config.ts') do
144+
contains('tailwindcss(),')
138145
end
139-
file('postcss.config.js')
140-
file('tailwind.config.js')
141146
end)
142147
end
143148

spec/rails_helper.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
require 'spec_helper'
2+
# Requiring logger fixes an issue between concurrent-ruby and activesupport in Rails < 7.1
3+
# https://github.com/rails/rails/issues/54260
4+
require 'logger'
25
ENV['RAILS_ENV'] ||= 'test'
36

47
require File.expand_path('../dummy/config/environment', __FILE__)

0 commit comments

Comments
 (0)