proscenium 0.15.0.beta.6-x86_64-linux → 0.15.0.beta.7-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b4d428fbf68baaf6031e7813f622929337a1c620fba5f8b27685feb024999ef
-  data.tar.gz: 2c1608e82bdf642496e150b5873d897f98c71469ae83a51e1704e07a4e2215cb
+  metadata.gz: ee3f15d3e012c29b9ccaf4407e4cc2c5cdc44b20a2e880bf1f42a7486f917a84
+  data.tar.gz: 622933b2d4cd21bd1f27b64e1a6659609007c3b2f2dcdab6c7d16f18576925a0
 SHA512:
-  metadata.gz: 6a847f4fdb0c7d31a04ed4bdf9b0ce557f6d842971e4ffe599bbebc41c89e8be6261f048078d9c896c340dbedbae629152cbe00e04c94e87c56c412ecb979fcd
-  data.tar.gz: 3c094ab074aef75e13d35298262bd2aa84da94aa9a21f1decf08b333018cfd4d247b51ec2feab7d72a0d2db91a5f0b22e41834986735ee80b0cdc6ab7774aa02
+  metadata.gz: 64c5a1f1f38d0f0611fd7a30eafbbecfa79c490daedde990af76aea49491df15d862ee42dc43039d4f6530804acf1f87fb5ad793c77b4ee61926be58688abbc7
+  data.tar.gz: d2a61a850cd492f141a77685d3d2fe6ad4d085daf9f417ce333c74257fb8675f158d5026627111e906a585f1752c7f646e27186b29fec57195afe1f6e15b328e

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: x86_64-linux
 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