Switch to generators and bundling style production

rails · dhh · Dec 17, 2021 · Dec 16, 2021 · Dec 16, 2021 · Dec 16, 2021
commit b89709ad89f553bb84f8bf5c74f1c604e637a47c
diff --git a/lib/install/Procfile.dev b/lib/install/Procfile.dev
@@ -0,0 +1,2 @@
+web: bin/rails server -p 3000
+css: rails tailwindcss:watch
diff --git a/lib/install/application.tailwind.css b/lib/install/application.tailwind.css
@@ -0,0 +1,13 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+/*
+
+@layer components {
+  .btn-primary {
+    @apply py-2 px-4 bg-blue-200;
+  }
+}
+
+*/
diff --git a/lib/install/dev b/lib/install/dev
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if ! command -v foreman &> /dev/null
+then
+  echo "Installing foreman..."
+  gem install foreman
+fi
+
+foreman start -f Procfile.dev
diff --git a/lib/install/tailwind.config.js b/lib/install/tailwind.config.js
@@ -0,0 +1,22 @@
+const defaultTheme = require('tailwindcss/defaultTheme')
+
+module.exports = {
+  darkMode: 'media',
+  content: [
+    './app/helpers/**/*.rb',
+    './app/javascript/**/*.js',
+    './app/views/**/*'
+  ],  
+  theme: {
+    extend: {
+      fontFamily: {
+        sans: ['Inter var', ...defaultTheme.fontFamily.sans],
+      },
+    },
+  },
+  plugins: [
+    require('@tailwindcss/forms'),
+    require('@tailwindcss/aspect-ratio'),
+    require('@tailwindcss/typography'),
+  ]
+}
diff --git a/lib/install/tailwindcss.rb b/lib/install/tailwindcss.rb
@@ -3,20 +3,47 @@
 if APPLICATION_LAYOUT_PATH.exist?
   say "Add Tailwindcss include tags and container element in application layout"
   insert_into_file APPLICATION_LAYOUT_PATH.to_s, <<~ERB.indent(4), before: /^\s*<%= stylesheet_link_tag/
-    <%= stylesheet_link_tag "inter-font", "data-turbo-track": "reload" %>
-    <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+    <%= stylesheet_link_tag "tailwind", "inter-font", "data-turbo-track": "reload" %>
   ERB
   insert_into_file APPLICATION_LAYOUT_PATH.to_s, %(    <main class="container mx-auto mt-28 px-5 flex">\n  ), before: /^\s*<%= yield/
   insert_into_file APPLICATION_LAYOUT_PATH.to_s, %(\n    </main>),  after: /^\s*<%= yield %>/
 else
   say "Default application.html.erb is missing!", :red
-  say %(        Add <%= stylesheet_link_tag "inter-font", "data-turbo-track": "reload" %> and <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %> within the <head> tag in your custom layout.)
+  say %(        Add <%= stylesheet_link_tag "tailwind", "inter-font", "data-turbo-track": "reload" %> within the <head> tag in your custom layout.)
 end
 
-# No longer included by default in Rails 7, but for earlier versions of Rails
-if (scaffolds_css_path = Rails.root.join("app/assets/stylesheets/scaffolds.scss")).exist?
-  remove_file scaffolds_css_path
+say "Build into app/assets/builds"
+empty_directory "app/assets/builds"
+keep_file "app/assets/builds"
+
+if (sprockets_manifest_path = Rails.root.join("app/assets/config/manifest.js")).exist?
+  append_to_file sprockets_manifest_path, %(//= link_tree ../builds\n)
+end
+
+if Rails.root.join(".gitignore").exist?
+  append_to_file(".gitignore", %(\n/app/assets/builds/*\n!/app/assets/builds/.keep\n))
+end
+
+unless Rails.root.join("config/tailwind.config.js").exist?
+  say "Add default config/tailwindcss.config.js"
+  copy_file "#{__dir__}/tailwind.config.js", "config/tailwind.config.js"
+end
+
+unless Rails.root.join("app/assets/stylesheets/application.tailwind.css").exist?
+  say "Add default app/assets/stylesheets/application.tailwind.css"
+  copy_file "#{__dir__}/application.tailwind.css", "app/assets/stylesheets/application.tailwind.css"
+end
+
+if Rails.root.join("Procfile.dev").exist?
+  append_to_file "Procfile.dev", "css: rails tailwindcss:watch\n"
+else
+  say "Add default Procfile.dev"
+  copy_file "#{__dir__}/Procfile.dev", "Procfile.dev"
+
+  say "Ensure foreman is installed"
+  run "gem install foreman"
 end
 
-say "Turn on purging of unused css classes in production"
-gsub_file Rails.root.join("config/environments/production.rb"), /^\s+#?\s+config.assets.css_compressor =.*$/, %(  config.assets.css_compressor = :purger)
+say "Add bin/dev to start foreman"
+copy_file "#{__dir__}/dev", "bin/dev"
+chmod "bin/dev", 0755, verbose: false
diff --git a/lib/tailwindcss/version.rb b/lib/tailwindcss/version.rb
@@ -1,3 +1,3 @@
 module Tailwindcss
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end
diff --git a/lib/tasks/build.rake b/lib/tasks/build.rake
@@ -0,0 +1,20 @@
+TAILWIND_COMPILE_COMMAND = "#{Pathname.new(__dir__).to_s}/../../exe/tailwindcss -i #{Rails.root.join("app/assets/stylesheets/application.tailwind.css")} -o #{Rails.root.join("app/assets/builds/tailwind.css")} -c #{Rails.root.join("config/tailwind.config.js")}"
+
+namespace :tailwindcss do
+  desc "Build your Tailwind CSS"
+  task :build do
+    system TAILWIND_COMPILE_COMMAND
+  end
+
+  task :watch do
+    system "#{TAILWIND_COMPILE_COMMAND} -w"
+  end
+end
+
+Rake::Task["assets:precompile"].enhance(["tailwindcss:build"])
+
+if Rake::Task.task_defined?("test:prepare")
+  Rake::Task["test:prepare"].enhance(["tailwindcss:build"])
+elsif Rake::Task.task_defined?("db:test:prepare")
+  Rake::Task["db:test:prepare"].enhance(["tailwindcss:build"])
+end
diff --git a/lib/tasks/clobber.rake b/lib/tasks/clobber.rake
@@ -0,0 +1,8 @@
+namespace :tailwindcss do
+  desc "Remove CSS builds"
+  task :clobber do
+    rm_rf Dir["app/assets/builds/[^.]*.css"], verbose: false
+  end
+end
+
+Rake::Task["assets:clobber"].enhance(["tailwindcss:clobber"])
diff --git a/lib/tasks/install.rake b/lib/tasks/install.rake
@@ -0,0 +1,6 @@
+namespace :tailwindcss do
+  desc "Install Tailwind CSS into the app"
+  task :install do
+    system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path("../install/tailwindcss.rb", __dir__)}"
+  end
+end
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		web: bin/rails server -p 3000
		css: rails tailwindcss:watch