avo 3.0.1.beta9 → 3.0.1.beta11

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

@@ -11,17 +11,30 @@ module Generators
 
         def create_files
           unless tailwindcss_installed?
+            say "Installing Tailwindcss"
             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"
+          unless (path = Rails.root.join("config", "avo", "tailwind.config.js")).exist?
+            say "Generating the Avo config file."
+            copy_file template_path("tailwind.config.js"), path
+          end
+
+          unless (path = Rails.root.join("app", "assets", "stylesheets", "avo", "tailwindcss")).exist?
+            say "Generating the tailwindcss directory."
+            directory ::Avo::Engine.root.join("app", "assets", "stylesheets", "css", "tailwindcss"), path
+          end
+
+
+          unless (path = Rails.root.join("app", "assets", "stylesheets", "avo" ,"tailwind.css")).exist?
+            say "Add default tailwind.css"
+            copy_file template_path("avo.tailwind.css"), path
           end
 
           if Rails.root.join("Procfile.dev").exist?
-            append_to_file "Procfile.dev", "avo_css: yarn avo:tailwindcss --watch\n"
+            say "Add #{cmd = "avo_css: yarn avo:tailwindcss --watch"} to Procfile.dev"
+            append_to_file "Procfile.dev", "#{cmd}\n"
           else
             say "Add default Procfile.dev"
             copy_file template_path("Procfile.dev"), "Procfile.dev"
@@ -30,17 +43,50 @@ module Generators
             run "gem install foreman"
           end
 
-          # Ensure that the _pre_head.html.erb template is available
-          unless Rails.root.join("app", "views", "avo", "partials", "_pre_head.html.erb").exist?
-            say "Ejecting the _pre_head.html.erb partial"
-            Rails::Generators.invoke("avo:eject", ["--partial", ":pre_head", "--skip-avo-version"], {destination_root: Rails.root})
+          script_name = "avo:tailwindcss"
+          script_command = "tailwindcss -i ./app/assets/stylesheets/avo/tailwind.css -o ./app/assets/builds/avo.tailwind.css -c ./config/avo/tailwind.config.js --minify"
+          pretty_script_command = "\"#{script_name}\": \"#{script_command}\""
+
+          if (path = Rails.root.join("package.json")).exist?
+            say "Add #{pretty_script_command} to package.json"
+            json_data = JSON.parse(File.read(path))
+            json_data["scripts"] ||= {}
+            json_data["scripts"][script_name] = script_command
+
+            File.open(path, 'w') do |file|
+              file.write(JSON.pretty_generate(json_data) + "\n")
+            end
+          else
+            say "package.json not found.", :yellow
+            say "Ensure you have the following script in your package.json file.", :yellow
+            say "\"scripts\": {\n" \
+              "  #{pretty_script_command}\n" \
+            "}", :green
           end
 
-          say "Adding the CSS asset to the partial"
-          prepend_to_file Rails.root.join("app", "views", "avo", "partials", "_pre_head.html.erb"), "<%= stylesheet_link_tag \"avo.tailwind.css\", media: \"all\" %>"
+          rake_enhance = <<~RUBY
 
-          say "Ensure you have the following script in your package.json file.", :yellow
-          say %("scripts": { "avo:tailwindcss": "tailwindcss -i ./app/assets/stylesheets/avo.tailwind.css -o ./app/assets/builds/avo.tailwind.css --minify" }), :green
+            Rake::Task["assets:precompile"].enhance(["avo:sym_link"])
+          RUBY
+
+          if (path = Rails.root.join("Rakefile")).exist?
+            say "Add #{rake_enhance.strip} to Rakefile"
+            append_to_file path, rake_enhance
+          else
+            say "Rakefile not found.", :yellow
+            say "Ensure you have the following code in your Rakefile file.", :yellow
+            say rake_enhance, :green
+          end
+
+          say "Make sure you run \"bundle exec rake avo:sym_link\" before compiling the assets with the \"#{script_name}\" task.", :green
+          if (path = Rails.root.join("bin", "dev")).exist?
+            lines = File.read(path).lines
+
+            # Insert the task after the shebang line (the first line)
+            lines.insert(1, "bundle exec rake avo:sym_link")
+
+            File.write(path, lines.join)
+          end
         end
 
         no_tasks do

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

@@ -1,6 +1,8 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import 'tailwindcss/base';
+# Have all of Avo's custom and plugins styles available.
+@import '../../../../tmp/avo/base.css';
+@import 'tailwindcss/components';
+@import 'tailwindcss/utilities';
 
 /*
 

data/lib/generators/avo/templates/tailwindcss/tailwind.config.js

@@ -0,0 +1,11 @@
+const avoPreset = require('../../tmp/avo/tailwind.preset.js')
+
+module.exports = {
+  presets: [avoPreset],
+  content: [
+    ...avoPreset.content,
+    './app/views/**/*.html.erb',
+    './app/helpers/**/*.rb',
+    './app/javascript/**/*.js',
+  ]
+}

data/lib/tasks/avo_tasks.rake

@@ -1,8 +1,3 @@
-# desc 'Explaining what the task does'
-# task :avo do
-#   # Task goes here
-# end
-
 desc "Runs the update command for all Avo gems."
 task "avo:update" do
   system "bundle update avo avo-pro avo-advanced avo-dashboards avo_filters avo-menu avo_upgrade"
@@ -63,3 +58,36 @@ task "avo:gem_paths" do
   # avo:/Users/adrian/work/avocado/avo-3,avo_filters:/Users/adrian/work/avocado/advanced/avo_filters
   puts result
 end
+
+desc "Symlinks all Avo gems to tmp/avo/packages"
+task "avo:sym_link" do
+  base_path = Rails.root.join("tmp", "avo").to_s.gsub("/spec/dummy", "")
+  packages_path = "#{base_path}/packages"
+  if Dir.exist?(packages_path)
+    `rm -rf #{packages_path}/*`
+  else
+    `mkdir -p #{packages_path}`
+    `touch #{packages_path}/.keep`
+  end
+
+  ["avo", "avo-advanced", "avo-pro", "avo-dynamic_filters", "avo-dashboards", "avo-menu"].each do |gem|
+    path = `bundle show #{gem} 2> /dev/null`.chomp
+
+    unless path.empty?
+      puts "[Avo->] Linking #{gem} to #{path}"
+      `ln -s #{path} #{packages_path}/#{gem}`
+    end
+  end
+
+  base_css_path = Avo::Engine.root.join("app", "assets", "builds", "avo.base.css")
+  dest_css_path = "#{base_path}/base.css"
+  `rm #{dest_css_path}` if File.exist?("#{dest_css_path}")
+  puts "[Avo->] Linking avo.base.css to #{base_css_path}"
+  `ln -s #{base_css_path} #{dest_css_path}`
+
+  base_preset_path = Avo::Engine.root.join("tailwind.preset.js")
+  dest_preset_path = "#{base_path}/tailwind.preset.js"
+  `rm #{dest_preset_path}` if File.exist?("#{dest_preset_path}")
+  puts "[Avo->] Linking tailwind.preset.js to #{base_preset_path}"
+  `ln -s #{base_preset_path} #{dest_preset_path}`
+end