proscenium 0.15.0.beta.6-x86_64-darwin → 0.16.0-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a498ef4b92e703e95804cc28c0076df3da4331533aec7fd0e314cd598a532de6
-  data.tar.gz: 141c88e143f857910ad7544322bd6ea11fc280a1a8db359ffeb063e2decdbc12
+  metadata.gz: 479d3b5ead246fb0f02afc95f9b274cf45eda3e8cf36dd2d9da25e9204e39433
+  data.tar.gz: a95291f48d2f582f9781f7a504ee35317ff5ac5c6b12b7cedf5a7b3f1934e971
 SHA512:
-  metadata.gz: 686b3850a3ebc2bdfbc457a66174525ff2b4b8e1646d4da150204d15c1ff2d77a14e5900ff07db68486ac61746d798db16ae71a07362a3e90fe2799cff76aab0
-  data.tar.gz: b4d0d9b54c30b23b0cc21b9a35018af89cc414f99e0d1ba1557bd4bea519d194ead89aa783ea0dac723da7719ea9e2cb1858ebae1078838649b9e8a3446a3147
+  metadata.gz: a9b5ab728976d9d3b80435e9ae5a9103fde26d1926ca0bf30cf49853f34cfc50e7aad197ee8e842e08c874d0c4dfc8a5c4a2113ca1fd6350df291c25700117ff
+  data.tar.gz: f3f75fec50b5324ff608e40ec683c21212bf3d4495d8a81eb87db86fc8008bd6be857d09a85643c757b26caf68cb5ce8bc7614ac4c20a2b3138d66d51daef985

data/README.md

@@ -415,7 +415,7 @@ By default, Proscenium's output will take advantage of all modern JS features. F
 
 ### Tree Shaking
 
-Tree shaking is the term the JavaScript community uses for dead code elimination, a common compiler optimization that automatically removes unreachable code. Tree shaking is enabled by default in Proascenium.
+Tree shaking is the term the JavaScript community uses for dead code elimination, a common compiler optimization that automatically removes unreachable code. Tree shaking is enabled by default in Proscenium.
 
 ```javascript
 function one() {

data/lib/proscenium/builder.rb

@@ -84,15 +84,15 @@ module Proscenium
     end
 
     def self.build_to_path(path, root: nil, base_url: nil)
-      new(root: root, base_url: base_url).build_to_path(path)
+      new(root:, base_url:).build_to_path(path)
     end
 
     def self.build_to_string(path, root: nil, base_url: nil)
-      new(root: root, base_url: base_url).build_to_string(path)
+      new(root:, base_url:).build_to_string(path)
     end
 
     def self.resolve(path, root: nil)
-      new(root: root).resolve(path)
+      new(root:).resolve(path)
     end
 
     def initialize(root: nil, base_url: nil)

data/lib/proscenium/importer.rb

@@ -25,7 +25,7 @@ module Proscenium
       #   Should be the actual asset file, eg. app.css, some/component.js.
       # @param resolve [String] description of the file to resolve and import.
       # @return [String] the digest of the imported file path if a css module (*.module.css).
-      def import(filepath = nil, resolve: nil, **options)
+      def import(filepath = nil, resolve: nil, **)
         self.imported ||= {}
 
         filepath = Resolver.resolve(resolve) if !filepath && resolve
@@ -34,7 +34,7 @@ module Proscenium
         unless self.imported.key?(filepath)
           # ActiveSupport::Notifications.instrument('sideload.proscenium', identifier: value)
 
-          self.imported[filepath] = { **options }
+          self.imported[filepath] = { ** }
           self.imported[filepath][:digest] = Utils.digest(filepath) if css_module
         end
 
@@ -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/log_subscriber.rb

@@ -16,7 +16,7 @@ module Proscenium
       path = CGI.unescape(path) if path.start_with?(/https?%3A%2F%2F/)
 
       info do
-        message = +"  #{color('[Proscenium]', nil, bold: true)} Building (to path) #{path}"
+        message = "  #{color('[Proscenium]', nil, bold: true)} Building (to path) #{path}"
         message << " (Duration: #{event.duration.round(1)}ms | " \
                    "Allocations: #{event.allocations}#{cached})"
       end
@@ -27,7 +27,7 @@ module Proscenium
       path = CGI.unescape(path) if path.start_with?(/https?%3A%2F%2F/)
 
       info do
-        message = +"  #{color('[Proscenium]', nil, bold: true)} Building #{path}"
+        message = "  #{color('[Proscenium]', nil, bold: true)} Building #{path}"
         message << " (Duration: #{event.duration.round(1)}ms | Allocations: #{event.allocations})"
       end
     end

data/lib/proscenium/middleware/esbuild.rb

@@ -15,7 +15,7 @@ module Proscenium
                             detail[:text]
                           end
 
-          super(args)
+          super
         end
       end
 

data/lib/proscenium/middleware.rb

@@ -18,7 +18,7 @@ module Proscenium
 
       chunks_path = Rails.public_path.join('assets').to_s
       headers = Rails.application.config.public_file_server.headers || {}
-      @chunk_handler = ::ActionDispatch::FileHandler.new(chunks_path, headers: headers)
+      @chunk_handler = ::ActionDispatch::FileHandler.new(chunks_path, headers:)
     end
 
     def call(env)

data/lib/proscenium/phlex/react_component.rb

@@ -25,8 +25,8 @@ module Proscenium
     #   end
     #
     # @yield the given block to a `div` within the top level component div.
-    def view_template(**attributes, &block)
-      send root_tag, **{ data: data_attributes }.deep_merge(attributes), &block
+    def view_template(**attributes, &)
+      send(root_tag, **{ data: data_attributes }.deep_merge(attributes), &)
     end
   end
 end

data/lib/proscenium/railtie.rb

@@ -88,7 +88,7 @@ module Proscenium
         index = app.config.public_file_server.index_name || 'index'
 
         app.middleware.insert_after(ActionDispatch::Static, ActionDispatch::Static,
-                                    root.join('public').to_s, index: index, headers: headers)
+                                    root.join('public').to_s, index:, headers:)
       end
     end
   end

data/lib/proscenium/side_load.rb

@@ -76,7 +76,7 @@ module Proscenium
             next unless imports.key?(inpath)
 
             if (import = imports[inpath]).delete(:lazy)
-              scripts[inpath] = import.merge(outpath: outpath)
+              scripts[inpath] = import.merge(outpath:)
             else
               opts = import[:js].is_a?(Hash) ? import[:js] : {}
               out << helpers.javascript_include_tag(outpath, extname: false, **opts)
@@ -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.16.0'
 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.16.0
 platform: x86_64-darwin
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-23 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8.0'
@@ -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
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8.0'
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8.0'
@@ -214,14 +214,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.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.21
 signing_key:
 specification_version: 4
 summary: The engine powering your Rails frontend