avo 2.14.2.pre.1 → 2.14.3.pre.2.tailwindcss

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b2dd6f882eac9d9271bbb4824fb9fb71bad9c77c7fa1e71df410cb9b4aeb54f
-  data.tar.gz: 32a04dae63c3694152bcc9b531d4d323e135b2440becd4a33f721ad9f351b1c5
+  metadata.gz: 000cbbb5361f9e2b283d18b20421f360e510f1320563fa480060035b31070d2c
+  data.tar.gz: ea51f134fedc9aacb232b4d5333d1d74807ffe93a32edc4daf46cc6c69cc0d3b
 SHA512:
-  metadata.gz: 5cee10bf690be47c5151cf6d00d1ddff9c32c0f3306be7b99962477e1d61c731dca473bcca93cce2eeea9a7ee4b0fe27ba160fe45548ae7042b900b0a9711f3f
-  data.tar.gz: 12267b7e20da3cd91c971e4b86d7ee872cb584eee965b9e8c7c92bc3235a42b17a0ea75b25d30abd694647548341300a1342bb383b800cb6dca9b3e7134e2c26
+  metadata.gz: a696a065e0af86bb02b9d1b44ac26cee640baeae95207528890a4be21a38496f7282f3609edf6d4458c4ec65357c4526553d20300d51562fd1a1ed271280b47b
+  data.tar.gz: 6f837374c20ef0a29b4382fefe9827de36f6c1543a9b7162c0ca9272d3fc1f99b4b5aff9823215f640711f86d9d33d106da69c819fcc111dc9d340361ad8bb78

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.14.2.pre.1)
+    avo (2.14.3.pre.2.tailwindcss)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/views/layouts/avo/application.html.erb

@@ -8,11 +8,11 @@
     <%= render partial: 'avo/partials/javascript' %>
     <%= render partial: 'avo/partials/head' %>
     <% if Avo::PACKED %>
-      <%= javascript_include_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
-      <%= stylesheet_link_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
+      <%= javascript_include_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
+      <%= stylesheet_link_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
     <% else %>
-      <%= javascript_include_tag "avo", "data-turbo-track": "reload", defer: true %>
-      <%= stylesheet_link_tag "avo", "data-turbo-track": "reload", defer: true %>
+      <%= javascript_include_tag "avo.base", "data-turbo-track": "reload", defer: true %>
+      <%= stylesheet_link_tag "avo.base", "data-turbo-track": "reload", defer: true %>
       <% if Rails.env.development? %>
         <%= javascript_include_tag "hotwire-livereload", defer: true %>
       <% end %>

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.14.2.pre.1" unless const_defined?(:VERSION)
+  VERSION = "2.14.3.pre.2.tailwindcss" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/base_generator.rb

@@ -7,7 +7,11 @@ module Generators
 
       def initialize(*args)
         super(*args)
-        invoke "avo:version", *args
+
+        # Don't output the version if requested so
+        unless args.include?(["--no-avo-version"])
+          invoke "avo:version", *args
+        end
       end
     end
   end

data/lib/generators/avo/tailwindcss/install_generator.rb

@@ -0,0 +1,54 @@
+require_relative "../base_generator"
+
+module Generators
+  module Avo
+    module Tailwindcss
+      class InstallGenerator < BaseGenerator
+        source_root File.expand_path("../templates", __dir__)
+
+        namespace "avo:tailwindcss:install"
+        desc "Add Tailwindcss to your Avo project."
+
+        def create_files
+          unless tailwindcss_installed?
+            system "./bin/bundle add tailwindcss-rails"
+            system "./bin/rails tailwindcss:install"
+          end
+
+          unless Rails.root.join("app", "assets", "stylesheets", "avo.tailwind.css").exist?
+            say "Add default app/assets/stylesheets/avo.tailwind.css"
+            copy_file template_path("avo.tailwind.css"), "app/assets/stylesheets/avo.tailwind.css"
+          end
+
+          if Rails.root.join("Procfile.dev").exist?
+            append_to_file "Procfile.dev", "css: bin/rails avo:tailwindcss:watch\n"
+          else
+            say "Add default Procfile.dev"
+            copy_file template_path("Procfile.dev"), "Procfile.dev"
+
+            say "Ensure foreman is installed"
+            run "gem install foreman"
+          end
+
+          append_to_file "Procfile.dev", "avo_css: bin/rails tailwindcss:watch\n"
+
+          say "Ejecting the _head.html.erb partial"
+          Rails::Generators.invoke("avo:eject", [":head", "--no-avo-version"], {destination_root: Rails.root})
+
+          say "Adding the CSS asset to the partial"
+          prepend_to_file Rails.root.join("app", "views", "avo", "partials", "_head.html.erb"), "<%= stylesheet_link_tag \"avo.tailwind.css\", media: \"all\" %>"
+        end
+
+        no_tasks do
+          def template_path(filename)
+            Pathname.new(__dir__).join("..", "templates", "tailwindcss", filename).to_s
+          end
+
+          def tailwindcss_installed?
+            Rails.root.join("config", "tailwind.config.js").exist? || Rails.root.join("tailwind.config.js").exist?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/generators/avo/templates/tailwindcss/Procfile.dev

@@ -0,0 +1,2 @@
+web: bin/rails server -p 3000
+css: bin/rails avo:tailwindcss:watch

data/lib/generators/avo/templates/tailwindcss/avo.tailwind.css

@@ -0,0 +1,13 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+/*
+
+@layer components {
+  .btn-primary {
+    @apply py-2 px-4 bg-blue-200;
+  }
+}
+
+*/

data/lib/tasks/avo_tasks.rake

@@ -3,9 +3,9 @@
 #   # Task goes here
 # end
 
-desc 'Installs Avo assets and bundles them for when you want to use the GitHub repo in your app'
-task 'avo:build-assets' do
-  spec = get_gem_spec 'avo'
+desc "Installs Avo assets and bundles them for when you want to use the GitHub repo in your app"
+task "avo:build-assets" do
+  spec = get_gem_spec "avo"
   # Uncomment to enable only when the source is github.com
   # enabled = spec.source.to_s.include?('https://github.com/avo-hq/avo')
   enabled = true
@@ -15,8 +15,8 @@ task 'avo:build-assets' do
     path = spec.full_gem_path
 
     Dir.chdir(path) do
-      system 'yarn'
-      system 'yarn prod:build'
+      system "yarn"
+      system "yarn prod:build"
     end
 
     puts "Done"
@@ -28,10 +28,10 @@ end
 # From
 # https://stackoverflow.com/questions/9322078/programmatically-determine-gems-path-using-bundler
 def get_gem_spec(name)
-  spec = Bundler.load.specs.find{|s| s.name == name }
+  spec = Bundler.load.specs.find { |s| s.name == name }
   raise GemNotFound, "Could not find gem '#{name}' in the current bundle." unless spec
-  if spec.name == 'bundler'
-    return File.expand_path('../../../', __FILE__)
+  if spec.name == "bundler"
+    return File.expand_path("../../../", __FILE__)
   end
 
   spec

data/lib/tasks/tailwindcss_rails.rake

@@ -0,0 +1,24 @@
+# Use the user provided asset or use the default
+ASSET_FILE = ARGV[0] || "app/assets/builds/avo.tailwind.css"
+# Se the tailwindcss-rails package name
+TAILWINDCSS_RAILS = "tailwindcss-rails"
+
+# Check if tailwindcss-rails is being used
+if Gem.loaded_specs.key? TAILWINDCSS_RAILS
+  # Get the path
+  GEM_PATH = Gem.loaded_specs[TAILWINDCSS_RAILS].full_gem_path
+  # Compose the compile command
+  AVO_TAILWIND_COMPILE_COMMAND = "#{RbConfig.ruby} #{Pathname.new(GEM_PATH)}/exe/tailwindcss -i '#{Rails.root.join("app/assets/stylesheets/avo.css")}' -o '#{Rails.root.join(ASSET_FILE)}' -c '#{Rails.root.join("config/tailwind.config.js")}' --minify"
+
+  namespace "avo:tailwindcss" do
+    desc "Build your Tailwind CSS"
+    task :build do
+      system(AVO_TAILWIND_COMPILE_COMMAND, exception: true)
+    end
+
+    desc "Watch and build your Tailwind CSS on file changes"
+    task :watch do
+      system "#{AVO_TAILWIND_COMPILE_COMMAND} -w"
+    end
+  end
+end

data/public/avo-assets/{avo.js → avo.base.js}

@@ -510,4 +510,4 @@ PERFORMANCE OF THIS SOFTWARE.
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
  * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
  */
-//# sourceMappingURL=avo.js.map
+//# sourceMappingURL=avo.base.js.map