proscenium 0.15.0.beta.6-arm64-darwin → 0.15.0.beta.7-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cc86ca359e86f6247886b0ae45bd64cfedcf371ddd9ac72dd6bdc5de19d132f
-  data.tar.gz: 2d064cae06399700c5ab06d3fba058815ca61003d9c95e254e1e5fcff56b828b
+  metadata.gz: 22220a996970e7d68157de006512c184796c9716279bf5ab1aa37d7c5baaff2c
+  data.tar.gz: 88eb65f121070d784d8755ff99a4ff98c873627e85dbd88b7e970ccb55558b52
 SHA512:
-  metadata.gz: b3935a11fd5fdfa4a38304a7b4ddb9bc604e1bde3f2c60e018463492d02e895f4512234d86acfd33236ffa18e6a510b037060c6c8fb418b1f37a2fbd3ef1cfbb
-  data.tar.gz: c5d303f84ee3849e39025658088825f16175cda0503f523e73655832b7d8cd4d42416a4b41690435b044cb22d01a377426ef091d554a196370374122bc9e1afe
+  metadata.gz: a839a7d81bc463f486b1453cdecd258e0268282de72a7faadd598e3cc953ba582381e43cf3d95cd21e30c179b190e544c87af20dec8f0ba204d82ffef7ef833f
+  data.tar.gz: dd142648607c8a846a51bcab4f65acf5d83f678ab98afd027a34f29fddd8271e2270308c47e2052351def2ecca7b9b090661b52c8fde45c24f2db4298e4ea131

data/lib/proscenium/importer.rb

@@ -61,19 +61,36 @@ module Proscenium
       #
       # @param filepath [Pathname] Absolute file system path of the Ruby file to sideload.
       def sideload(filepath, **options)
+        return if !Proscenium.config.side_load || (options[:js] == false && options[:css] == false)
+
+        sideload_js(filepath, **options) unless options[:js] == false
+        sideload_css(filepath, **options) unless options[:css] == false
+      end
+
+      def sideload_js(filepath, **options)
         return unless Proscenium.config.side_load
 
         filepath = Rails.root.join(filepath) unless filepath.is_a?(Pathname)
         filepath = filepath.sub_ext('')
 
-        import_if_exists = lambda do |x|
+        JS_EXTENSIONS.find do |x|
           if (fp = filepath.sub_ext(x)).exist?
             import(Resolver.resolve(fp.to_s), sideloaded: true, **options)
           end
         end
+      end
 
-        JS_EXTENSIONS.find(&import_if_exists) unless options[:js] == false
-        CSS_EXTENSIONS.find(&import_if_exists) unless options[:css] == false
+      def sideload_css(filepath, **options)
+        return unless Proscenium.config.side_load
+
+        filepath = Rails.root.join(filepath) unless filepath.is_a?(Pathname)
+        filepath = filepath.sub_ext('')
+
+        CSS_EXTENSIONS.find do |x|
+          if (fp = filepath.sub_ext(x)).exist?
+            import(Resolver.resolve(fp.to_s), sideloaded: true, **options)
+          end
+        end
       end
 
       def each_stylesheet(delete: false)

data/lib/proscenium/side_load.rb

@@ -127,16 +127,28 @@ module Proscenium
           options[k] = obj.instance_eval(&options[k]) if options[k].is_a?(Proc)
         end
 
+        css_imports = []
+
         klass = obj.class
         while klass.respond_to?(:source_path) && klass.source_path && !klass.abstract_class
           if klass.respond_to?(:sideload)
             klass.sideload options
-          else
+          elsif options[:css] == false
             Importer.sideload klass.source_path, **options
+          else
+            Importer.sideload_js klass.source_path, **options
+            css_imports << klass.source_path
           end
 
           klass = klass.superclass
         end
+
+        # The reason why we sideload CSS after JS is because the order of CSS is important.
+        # Basically, the layout should be loaded before the view so that CSS cascading works i9n the
+        # right direction.
+        css_imports.reverse_each do |it|
+          Importer.sideload_css it, **options
+        end
       end
     end
   end

data/lib/proscenium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Proscenium
-  VERSION = '0.15.0.beta.6'
+  VERSION = '0.15.0.beta.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.15.0.beta.6
+  version: 0.15.0.beta.7
 platform: arm64-darwin
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-23 00:00:00.000000000 Z
+date: 2024-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.3
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.3
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -217,11 +217,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: The engine powering your Rails frontend