Merge pull request #187 from inertiajs/ci-fixes

Ci fixes

Author: bknoles

lib/generators/inertia/install/install_generator.rb

@@ -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?
@@ -265,7 +263,7 @@ def vite_tag
 
       def inertia_resolved_version
         @inertia_resolved_version ||= Gem::Version.new(
-          `npm show @inertiajs/core@#{options[:inertia_version]} version`.strip
+          `npm show @inertiajs/core@#{options[:inertia_version]} version --json | tail -n2 | head -n1 | tr -d '", '`.strip
         )
       end
 

lib/generators/inertia/install/templates/tailwind/application.css

@@ -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";

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

@@ -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
@@ -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
@@ -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
 

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

@@ -1,4 +1,7 @@
 require 'spec_helper'
+# Requiring logger fixes an issue between concurrent-ruby and activesupport in Rails < 7.1
+# https://github.com/rails/rails/issues/54260
+require 'logger'
 ENV['RAILS_ENV'] ||= 'test'
 
 require File.expand_path('../dummy/config/environment', __FILE__)