maglevcms 2.1.0 → 3.0.0.beta1

data/lib/maglev/engine.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'vite_ruby'
+require 'turbo-rails'
+require 'importmap-rails'
 require 'maglev/migration'
 
 module Maglev
@@ -39,52 +40,43 @@ module Maglev
       Rails.application.config.i18n.load_path += Dir["#{config.root}/config/locales/**/*.yml"]
     end
 
-    delegate :vite_ruby, to: :class
-
-    def self.vite_ruby
-      @vite_ruby ||= ::ViteRuby.new(root: root, mode: Rails.env)
+    def self.importmaps
+      @importmaps ||= {
+        editor: ::Importmap::Map.new,
+        client: ::Importmap::Map.new
+      }
     end
 
-    # Serves the engine's vite-ruby when requested
-    initializer 'maglev.vite_rails.static' do |app|
-      if Rails.application.config.public_file_server.enabled
-        # this is the right setup when the main application is already
-        # using Vite for the theme assets.
-        app.middleware.insert_after ActionDispatch::Static,
-                                    Rack::Static,
-                                    urls: ["/#{vite_ruby.config.public_output_dir}"],
-                                    root: root.join(vite_ruby.config.public_dir),
-                                    header_rules: [
-                                      # rubocop:disable Style/StringHashKeys
-                                      [:all, { 'Access-Control-Allow-Origin' => '*' }]
-                                      # rubocop:enable Style/StringHashKeys
-                                    ]
-      else
-        # mostly when running the application in production behind NGINX or APACHE
-        app.middleware.insert_before 0,
-                                     Rack::Static,
-                                     urls: ["/#{vite_ruby.config.public_output_dir}"],
-                                     root: root.join(vite_ruby.config.public_dir),
-                                     header_rules: [
-                                       # rubocop:disable Style/StringHashKeys
-                                       [:all, { 'Access-Control-Allow-Origin' => '*' }]
-                                       # rubocop:enable Style/StringHashKeys
-                                     ]
-      end
-    end
+    initializer 'maglev.assets' do |app|
+      app.config.assets.paths << Engine.root.join('app/assets/builds')
+      app.config.assets.paths << Engine.root.join('app/components')
+      app.config.assets.paths << Engine.root.join('app/assets/javascripts')
+      app.config.assets.paths << Engine.root.join('vendor/javascript')
 
-    initializer 'maglev.vite_rails_engine.proxy' do |app|
-      if vite_ruby.run_proxy?
-        app.middleware.insert_before 0,
-                                     ViteRuby::DevServerProxy,
-                                     ssl_verify_none: true,
-                                     vite_ruby: vite_ruby
-      end
+      # required by Sprockets (if used by the main app)
+      app.config.assets.precompile += %w[maglev_manifest]
     end
 
-    initializer 'maglev.vite_rails_engine.logger' do
-      config.after_initialize do
-        vite_ruby.logger = Rails.logger
+    initializer 'maglev.importmap', after: 'importmap' do |app|
+      Engine.importmaps[:editor].draw(Engine.root.join('config/editor_importmap.rb'))
+      Engine.importmaps[:client].draw(Engine.root.join('config/client_importmap.rb'))
+
+      if (Rails.env.development? || Rails.env.test?) && !app.config.cache_classes
+        # Editor
+        Engine.importmaps[:editor].cache_sweeper(watches: [
+                                                   Engine.root.join('app/assets/javascripts'),
+                                                   Engine.root.join('app/components')
+                                                 ])
+
+        # Client
+        Engine.importmaps[:client].cache_sweeper(watches: [
+                                                   Engine.root.join('app/assets/javascripts/maglev/client')
+                                                 ])
+
+        ActiveSupport.on_load(:action_controller_base) do
+          before_action { Engine.importmaps[:editor].cache_sweeper.execute_if_updated }
+          before_action { Engine.importmaps[:client].cache_sweeper.execute_if_updated }
+        end
       end
     end
   end

data/lib/maglev/errors.rb

@@ -4,7 +4,10 @@ module Maglev
   module Errors
     class NotAuthorized < StandardError; end
     class UnknownSection < StandardError; end
+    class UnknownBlock < StandardError; end
     class DuplicateSectionDefinition < StandardError; end
+    class NotImplemented < StandardError; end
+    class UnpublishedPage < StandardError; end
 
     class UnknownSetting < StandardError
       def initialize(section_id, block_id, setting_id)

data/lib/maglev/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Maglev
-  VERSION = '2.1.0'
+  VERSION = '3.0.0.beta1'
 end

data/lib/maglev.rb

@@ -9,7 +9,8 @@ require_relative 'maglev/preview_constraint'
 require_relative 'maglev/reserved_paths'
 
 require 'injectable'
-require 'jbuilder'
+require 'pagy'
+require 'view_component'
 
 module Maglev
   ROOT_PATH = Pathname.new(File.join(__dir__, '..'))
@@ -39,6 +40,7 @@ module Maglev
         c.admin_password = nil
         c.static_pages = []
         c.reserved_paths = []
+        c.tailwindcss_folders = []
       end
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize

data/lib/tasks/maglev/tailwindcss.rake

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+namespace :maglev do
+  namespace :tailwindcss do
+    desc 'Generate Tailwind CSS classes from component files'
+    task build: :environment do
+      puts '[Maglev] Building EditorTailwind CSS'
+      run_tailwindcss_cli
+    end
+
+    desc 'Watch for changes in component files and rebuild Tailwind CSS'
+    task watch: :environment do
+      run_tailwindcss_cli('--watch')
+    end
+
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def run_tailwindcss_cli(options = nil)
+      command_path = Maglev::Engine.root.join('exe', 'tailwind-cli')
+      Maglev::Engine.root.join('tmp/maglev-compiled-tailwind.css')
+      erb_input_path = Maglev::Engine.root.join('app/assets/stylesheets/maglev/tailwind.css.erb')
+      input_path = Maglev::Engine.root.join('tmp/maglev-compiled-tailwind.css')
+      output_path = Maglev::Engine.root.join('app/assets/builds/maglev/tailwind.css')
+
+      FileUtils.mkdir_p(input_path.dirname)
+
+      puts "[Maglev] Generating temporary Tailwind input file at: #{input_path}"
+
+      rendered_css = ERB.new(File.read(erb_input_path)).result
+      File.write(input_path, rendered_css)
+
+      require 'bundler'
+      Bundler.with_unbundled_env do
+        system "#{command_path} -i #{input_path} -o #{output_path} #{options}"
+      end
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  end
+end

data/lib/tasks/maglev_tasks.rake

@@ -1,26 +1,7 @@
 # frozen_string_literal: true
 
-$stdout.sync = true
-
-def within_engine_folder(&block)
-  Dir.chdir(File.join(__dir__, '..', '..'), &block)
-end
-
-unless ENV['VITE_RUBY_SKIP_ASSETS_PRECOMPILE_EXTENSION'] == 'true'
-  if Rake::Task.task_defined?('assets:precompile')
-    Rake::Task['assets:precompile'].enhance do |_task|
-      Rake::Task['maglev:vite:install_dependencies'].invoke
-      Rake::Task['maglev:vite:build_all'].invoke
-    end
-  else
-    Rake::Task.define_task("assets:precompile": ['maglev:vite:install_dependencies', 'maglev:vite:build_all'])
-  end
-
-  if Rake::Task.task_defined?('assets:clobber')
-    Rake::Task['assets:clobber'].enhance do
-      Rake::Task['maglev:vite:clobber'].invoke
-    end
-  else
-    Rake::Task.define_task("assets:clobber": 'maglev:vite:clobber')
-  end
+if Rake::Task.task_defined?('assets:precompile')
+  Rake::Task['assets:precompile'].enhance(['maglev:tailwindcss:build'])
+else
+  Rake::Task.define_task("assets:precompile": ['maglev:tailwindcss:build'])
 end