refactor: tailwind.css file clashes with other files

avo-hq · Dec 19, 2023 · db2c453 · db2c453
1 parent 1731147
commit db2c453
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/generators/avo/tailwindcss/install_generator.rb b/lib/generators/avo/tailwindcss/install_generator.rb
@@ -27,12 +27,12 @@ def create_files
           end
 
 
-          unless (path = Rails.root.join("app", "assets", "stylesheets", "avo" ,"tailwind.css")).exist?
+          unless (path = Rails.root.join("app", "assets", "stylesheets", "avo" ,"avo.tailwind.css")).exist?
             say "Add default tailwind.css"
             copy_file template_path("avo.tailwind.css"), path
           end
 
-          script_name = "avo:tailwind:css"
+          script_name = "avo:tailwindcss"
           if Rails.root.join("Procfile.dev").exist?
             say "Add #{cmd = "avo_css: yarn #{script_name} --watch"} to Procfile.dev"
             append_to_file "Procfile.dev", "#{cmd}\n"
@@ -44,7 +44,7 @@ def create_files
             run "gem install foreman"
           end
 
-          script_command = "tailwindcss -i ./app/assets/stylesheets/avo/tailwind.css -o ./app/assets/builds/avo.tailwind.css -c ./config/avo/tailwind.config.js --minify"
+          script_command = "tailwindcss -i ./app/assets/stylesheets/avo/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?
@@ -69,12 +69,12 @@ def create_files
             # When running `rake assets:precompile` this is the order of events:
             # 1 - Task `avo:yarn_install`
             # 2 - Task `avo:sym_link`
-            # 3 - Cmd  `yarn avo:tailwind:css`
+            # 3 - Cmd  `yarn avo:tailwindcss`
             # 4 - Task `assets:precompile`
             Rake::Task["assets:precompile"].enhance(["avo:sym_link"])
             Rake::Task["avo:sym_link"].enhance(["avo:yarn_install"])
             Rake::Task["avo:sym_link"].enhance do
-              `yarn avo:tailwind:css`
+              `yarn avo:tailwindcss`
             end
 
           RUBY

diff --git a/lib/generators/avo/templates/tailwindcss/Procfile.dev b/lib/generators/avo/templates/tailwindcss/Procfile.dev
@@ -1,2 +1,2 @@
 web: bin/rails server -p 3000
-avo_css: yarn avo:tailwind:css --watch
+avo_css: yarn avo:tailwindcss --watch
diff --git a/lib/generators/avo/templates/tailwindcss/tailwind.config.js b/lib/generators/avo/templates/tailwindcss/tailwind.config.js
@@ -7,5 +7,5 @@ module.exports = {
     './app/views/**/*.html.erb',
     './app/helpers/**/*.rb',
     './app/javascript/**/*.js',
-  ]
+  ],
 }