v0.1.3 Proper install of tailwind instead of CDN

kobaltz · Feb 8, 2024 · 85bb65a · 85bb65a
1 parent 2adf254
commit 85bb65a
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 24 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    mission_control-servers (0.1.2)
+    mission_control-servers (0.1.3)
       importmap-rails
       rails (>= 7.1.3)
       stimulus-rails
+      tailwindcss-rails
       turbo-rails
 
 GEM
@@ -199,6 +200,10 @@ GEM
     stimulus-rails (1.3.3)
       railties (>= 6.0.0)
     stringio (3.1.0)
+    tailwindcss-rails (2.3.0-arm64-darwin)
+      railties (>= 6.0.0)
+    tailwindcss-rails (2.3.0-x86_64-linux)
+      railties (>= 6.0.0)
     thor (1.3.0)
     timeout (0.4.1)
     turbo-rails (2.0.0)

diff --git a/Procfile.dev b/Procfile.dev
@@ -0,0 +1,2 @@
+web: bin/rails server -b 0.0.0.0
+css: bin/rails app:tailwind_engine_watch
diff --git a/app/assets/builds/mission_control_servers_application.css b/app/assets/builds/mission_control_servers_application.css
diff --git a/app/assets/config/mission_control_servers_manifest.js b/app/assets/config/mission_control_servers_manifest.js
@@ -1,3 +1,3 @@
-//= link_directory ../stylesheets/mission_control/servers .css
+//= link_tree ../builds/ .css
 //= link_directory ../../javascript/mission_control/servers .js
 //= link_directory ../../javascript/mission_control/servers/controllers .js
diff --git a/app/assets/stylesheets/mission_control/servers/application.css b/app/assets/stylesheets/mission_control/servers/application.css
diff --git a/app/assets/stylesheets/mission_control/servers/application.tailwind.css b/app/assets/stylesheets/mission_control/servers/application.tailwind.css
@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
diff --git a/app/views/layouts/mission_control/servers/application.html.erb b/app/views/layouts/mission_control/servers/application.html.erb
@@ -5,10 +5,9 @@
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
   <meta name="viewport" content="width=device-width,initial-scale=1">
-  <script src="https://cdn.tailwindcss.com?plugins=forms,typography"></script>
   <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 
-  <%= stylesheet_link_tag "mission_control/servers/application", media: "all" %>
+  <%= stylesheet_link_tag "mission_control_servers_application", media: "all" %>
   <%= javascript_importmap_tags "application-mcs" %>
 </head>
 <body class="h-full">

diff --git a/bin/dev b/bin/dev
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+if gem list --no-installed --exact --silent foreman; then
+  echo "Installing foreman..."
+  gem install foreman
+fi
+
+# Default to port 3000 if not specified
+export PORT="${PORT:-3000}"
+
+exec foreman start -f Procfile.dev "$@"
diff --git a/config/tailwind.config.js b/config/tailwind.config.js
@@ -0,0 +1,23 @@
+const defaultTheme = require('tailwindcss/defaultTheme')
+
+module.exports = {
+  content: [
+    './public/*.html',
+    './app/helpers/**/*.rb',
+    './app/javascript/**/*.js',
+    './app/views/**/*.{erb,haml,html,slim}'
+  ],
+  theme: {
+    extend: {
+      fontFamily: {
+        sans: ['Inter var', ...defaultTheme.fontFamily.sans],
+      },
+    },
+  },
+  plugins: [
+    require('@tailwindcss/forms'),
+    require('@tailwindcss/aspect-ratio'),
+    require('@tailwindcss/typography'),
+    require('@tailwindcss/container-queries'),
+  ]
+}
diff --git a/lib/mission_control/servers/version.rb b/lib/mission_control/servers/version.rb
@@ -1,5 +1,5 @@
 module MissionControl
   module Servers
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end
diff --git a/lib/tasks/mission_control/servers_tasks.rake b/lib/tasks/mission_control/servers_tasks.rake
@@ -1,4 +1,9 @@
-# desc "Explaining what the task does"
-# task :mission_control_servers do
-#   # Task goes here
-# end
+task :tailwind_engine_watch do
+  require "tailwindcss-rails"
+  # NOTE: tailwindcss-rails is an engine
+  system "#{Tailwindcss::Engine.root.join("exe/tailwindcss")} \
+         -i #{MissionControl::Servers::Engine.root.join("app/assets/stylesheets/mission_control/servers/application.tailwind.css")} \
+         -o #{MissionControl::Servers::Engine.root.join("app/assets/builds/mission_control_servers_application.css")} \
+         -c #{MissionControl::Servers::Engine.root.join("config/tailwind.config.js")} \
+         --minify -w"
+end
diff --git a/mission_control-servers.gemspec b/mission_control-servers.gemspec
@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'importmap-rails'
   spec.add_dependency 'turbo-rails'
   spec.add_dependency 'stimulus-rails'
+  spec.add_dependency "tailwindcss-rails"
 end
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		web: bin/rails server -b 0.0.0.0
		css: bin/rails app:tailwind_engine_watch