postnhost 0.1.0 → 0.1.1

data/lib/tasks/postnhost_tasks.rake

@@ -1,94 +1,69 @@
-require "json"
+require "fileutils"
+
+require "postnhost/css_build"
+require "postnhost/tailwind_compiler"
+require "postnhost/tailwind_input"
 
 # rubocop:disable-next Metrics/BlockLength
 namespace :postnhost do
   namespace :tailwindcss do
     def postnhost_tailwind_enabled?
-      Rails.root.join("postnhost.tailwind.config.js").exist? &&
-        Rails.root.join("app/assets/stylesheets/postnhost/host.tailwind.css").exist?
-    end
-
-    def tailwindcss_rails_compile_command(watch: false)
-      return unless Gem.loaded_specs.key?("tailwindcss-rails") || Gem.loaded_specs.key?("tailwindcss-ruby")
-
-      begin
-        require "tailwindcss/ruby"
-      rescue LoadError
-        return
-      end
-
-      executable = Tailwindcss::Ruby.executable
-      return if executable.blank?
-
-      command = [
-        executable,
-        "-i", Rails.root.join("app/assets/stylesheets/postnhost/host.tailwind.css").to_s,
-        "-o", Rails.root.join("app/assets/builds/postnhost/host.css").to_s,
-        "-c", Rails.root.join("postnhost.tailwind.config.js").to_s,
-        "--minify"
-      ]
-      command << "-w" if watch
-      command
+      Rails.root.join("app/assets/stylesheets/postnhost/host.tailwind.css").exist?
     end
 
-    def package_json_scripts
-      path = Rails.root.join("package.json")
-      return {} unless path.exist?
-
-      JSON.parse(File.read(path)).fetch("scripts", {})
-    rescue JSON::ParserError
-      {}
+    def host_tailwind_paths
+      {
+        input: Rails.root.join("tmp/postnhost/host.tailwind.css"),
+        unscoped: Rails.root.join("app/assets/builds/postnhost/application.unscoped.css"),
+        output: Rails.root.join("app/assets/builds/postnhost/application.css")
+      }
     end
 
-    def npm_compile_command(watch: false)
-      script = watch ? "postnhost:tailwindcss:watch" : "postnhost:tailwindcss"
-      return unless package_json_scripts.key?(script)
+    def write_host_tailwind_input(path)
+      engine_source = Postnhost::Engine.root.join("app/assets/stylesheets/application.tailwind.css")
+      host_source = Rails.root.join("app/assets/stylesheets/postnhost/host.tailwind.css")
 
-      ["yarn", script]
+      FileUtils.mkdir_p(path.dirname)
+      path.write(Postnhost::TailwindInput.build(engine_source:, host_source:))
     end
 
-    def postnhost_tailwind_command(watch: false)
-      tailwindcss_rails_compile_command(watch:) || npm_compile_command(watch:)
+    def build_host_tailwind(watch: false)
+      paths = host_tailwind_paths
+      write_host_tailwind_input(paths[:input])
+      command = Postnhost::TailwindCompiler.new(root: Rails.root).command(
+        input_path: paths[:input],
+        output_path: paths[:unscoped],
+        watch:
+      )
+
+      Postnhost::CssBuild.run(
+        command:,
+        unscoped_path: paths[:unscoped],
+        output_path: paths[:output],
+        watch:
+      )
+    ensure
+      FileUtils.rm_f(paths&.dig(:input))
     end
 
-    def print_missing_tailwind_runner_message
-      puts <<~MSG
-        [postnhost] No Tailwind runner found for host mode.
-        - Option 1: add the `tailwindcss-rails` gem to your host app.
-        - Option 2: add package.json script `postnhost:tailwindcss:watch` (and `postnhost:tailwindcss` for build).
-      MSG
-    end
-
-    desc "Build host Tailwind CSS for Postnhost overrides"
+    desc "Build host Tailwind CSS for PostnHost overrides"
     task build: :environment do
       unless postnhost_tailwind_enabled?
-        puts "[postnhost] Skipping host Tailwind build (missing postnhost.tailwind.config.js or app/assets/stylesheets/postnhost/host.tailwind.css)"
-        next
-      end
-
-      command = postnhost_tailwind_command
-      unless command
-        print_missing_tailwind_runner_message
+        puts "[postnhost] Skipping host Tailwind build (missing app/assets/stylesheets/postnhost/host.tailwind.css)"
         next
       end
 
-      system(*command, exception: true)
+      build_host_tailwind
     end
 
-    desc "Watch host Tailwind CSS for Postnhost overrides"
+    desc "Watch host Tailwind CSS for PostnHost overrides"
     task watch: :environment do
       unless postnhost_tailwind_enabled?
-        puts "[postnhost] Missing host Tailwind files. Run: rails g postnhost:tailwindcss:install"
-        next
-      end
-
-      command = postnhost_tailwind_command(watch: true)
-      unless command
-        print_missing_tailwind_runner_message
+        puts "[postnhost] Missing host Tailwind files. Run: bin/rails g postnhost:tailwindcss:install"
         next
       end
 
-      system(*command, exception: true)
+      build_host_tailwind(watch: true)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postnhost
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kirill Shevchenko
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: crass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -662,15 +676,18 @@ files:
 - lib/generators/postnhost/static_pages/static_pages_generator.rb
 - lib/generators/postnhost/tailwindcss/install_generator.rb
 - lib/generators/postnhost/tailwindcss/templates/host.tailwind.css
-- lib/generators/postnhost/tailwindcss/templates/tailwind.config.js
 - lib/generators/postnhost/user/user_generator.rb
 - lib/generators/postnhost/views/views_generator.rb
 - lib/postnhost.rb
 - lib/postnhost/configuration.rb
+- lib/postnhost/css_build.rb
+- lib/postnhost/css_scope.rb
 - lib/postnhost/engine.rb
 - lib/postnhost/sample_data.rb
 - lib/postnhost/settings/i18n_overrides.rb
 - lib/postnhost/settings/i18n_patch.rb
+- lib/postnhost/tailwind_compiler.rb
+- lib/postnhost/tailwind_input.rb
 - lib/postnhost/version.rb
 - lib/tasks/postnhost_snapshots.rake
 - lib/tasks/postnhost_tasks.rake

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

@@ -1,8 +0,0 @@
-module.exports = {
-  content: [
-    "./app/views/postnhost/**/*.erb",
-    "./app/views/layouts/postnhost/**/*.erb",
-    "./app/helpers/**/*.rb",
-    "./app/javascript/**/*.js"
-  ]
-}