proscenium 0.19.0.beta7 → 0.19.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9c86c8fc9ea5069434688a114679c39ea03b431af308efbe0b65360f0b5b935
-  data.tar.gz: 4d74b86e4d0aed1651fdc369c4f830b1f85b9b33dad0d109905df3df9581dddc
+  metadata.gz: 5700515c91113e3ba65329d0a82f91cbf654850c6becd0e19908f9ab98a0678e
+  data.tar.gz: 02e282be2f438d9f875a1bc9ba508d57e99d5a05800d6b1e28f5c41a5ca25d4b
 SHA512:
-  metadata.gz: c64c401d4ef4e70fedf4e6327177dc53645bcd540de6301f64edfb9020cf8686fe444377ea538ef9a09d2b0699229ab3a138f8704f006e89b5acfb0a39666355
-  data.tar.gz: 249ae5d9c8fe4884b2ad5c7ab2712665522007f75ced0c2d56b4f6ee189e868c0e58122a4f96aade3b24443037b3977356595fd3881dc4fd107151e28c3c751d
+  metadata.gz: a2db492fc5134f0da0625c1489cd4ea8b38319af22c9d8a2d102bc4e33f7d27ed97bffe3e01fd12c252b6e11d26fbeba2c13b2d2ca74c7f57dc1e928ad9cf440
+  data.tar.gz: c72e8aa1325c4a6051bae850c9a798845ba8fc1dc492c018133738b267fade2228939fa69a5c517e0d0b700bc9718031b46774346458fb19647eba4da18e965b

data/lib/proscenium/builder.rb

@@ -85,7 +85,7 @@ module Proscenium
     end
 
     def build_to_string(path)
-      ActiveSupport::Notifications.instrument('build_to_string.proscenium', identifier: path) do
+      ActiveSupport::Notifications.instrument('build.proscenium', identifier: path) do
         result = Request.build_to_string(path, @request_config)
 
         raise BuildError, result[:response] unless result[:success]

data/lib/proscenium/css_module/rewriter.rb

@@ -27,9 +27,9 @@ module Proscenium
       def css_module_string(name)
         if (path = Pathname.new(context.path).sub_ext('.module.css')).exist?
           tname = Transformer.new(path).class_name!(name, name.dup).first
-          "Proscenium::CssModule::Name.new(:@#{name}, '#{tname}')"
+          "Proscenium::CssModule::Name.new(:@#{name}, '#{tname}', #{path})"
         else
-          "Proscenium::CssModule::Name.new(:@#{name}, css_module(:#{name}))"
+          "Proscenium::CssModule::Name.new(:@#{name}, css_module(:#{name}), nil)"
         end
       end
     end

data/lib/proscenium/css_module.rb

@@ -16,9 +16,12 @@ module Proscenium::CssModule
   end
 
   class Name
-    def initialize(name, transform)
+    attr_reader :path
+
+    def initialize(name, transform, path = nil)
       @name = name
       @transform = transform
+      @path = path
     end
 
     def to_s

data/lib/proscenium/importer.rb

@@ -24,17 +24,23 @@ module Proscenium
       # @param filepath [String] Absolute URL path (relative to Rails root) of the file to import.
       #   Should be the actual asset file, eg. app.css, some/component.js.
       # @return [String|nil] the digest of the imported file path if a css module (*.module.css).
-      def import(filepath = nil, **)
+      def import(filepath = nil, sideloaded: false, **)
         self.imported ||= {}
 
         filepath = "/node_modules/#{filepath}" if filepath.start_with?('@rubygems/')
         css_module = filepath.end_with?('.module.css')
 
         unless self.imported.key?(filepath)
-          # ActiveSupport::Notifications.instrument('sideload.proscenium', identifier: value)
-
-          self.imported[filepath] = { ** }
-          self.imported[filepath][:digest] = Utils.digest(filepath) if css_module
+          if sideloaded
+            ActiveSupport::Notifications.instrument 'sideload.proscenium', identifier: filepath,
+                                                                           sideloaded: do
+              self.imported[filepath] = { ** }
+              self.imported[filepath][:digest] = Utils.digest(filepath) if css_module
+            end
+          else
+            self.imported[filepath] = { ** }
+            self.imported[filepath][:digest] = Utils.digest(filepath) if css_module
+          end
         end
 
         css_module ? self.imported[filepath][:digest] : nil
@@ -72,12 +78,17 @@ module Proscenium
       end
 
       def sideload_css(filepath, **)
-        _sideload(filepath, CSS_EXTENSIONS, **)
+        _sideload(filepath, ['.css'], **)
+      end
+
+      def sideload_css_module(filepath, **)
+        _sideload(filepath, ['.module.css'], **)
       end
 
       # @param filepath [Pathname] Absolute file system path of the Ruby file to sideload.
       # @param extensions [Array<String>] Supported file extensions to sideload.
       # @param options [Hash] Options to pass to `import`.
+      # @return [Array<String>] The imported file paths.
       # @raise [ArgumentError] if `filepath` is not an absolute file system path.
       private def _sideload(filepath, extensions, **options) # rubocop:disable Style/AccessModifierDeclarations
         return unless Proscenium.config.side_load
@@ -86,13 +97,18 @@ module Proscenium
           raise ArgumentError, "`filepath` (#{filepath}) must be a `Pathname`, and an absolute path"
         end
 
+        # Ensures extensions with more than one dot are handled correctly.
         filepath = filepath.sub_ext('')
 
+        sideloaded = []
+
         extensions.find do |x|
           if (fp = filepath.sub_ext(x)).exist?
-            import(Resolver.resolve(fp.to_s), sideloaded: true, **options)
+            sideloaded << import(Resolver.resolve(fp.to_s), sideloaded: filepath, **options)
           end
         end
+
+        sideloaded
       end
 
       def each_stylesheet(delete: false)

data/lib/proscenium/log_subscriber.rb

@@ -5,17 +5,32 @@ require 'active_support/log_subscriber'
 module Proscenium
   class LogSubscriber < ActiveSupport::LogSubscriber
     def sideload(event)
+      path = event.payload[:identifier]
+      sideloaded = event.payload[:sideloaded]
+      sideloaded = sideloaded.relative_path_from(Rails.root) if sideloaded.is_a?(Pathname)
+
+      info do
+        msg = "  #{color('[Proscenium]', nil, bold: true)} Sideloading #{path}"
+        sideloaded.is_a?(Pathname) ? msg << " from #{sideloaded}" : msg
+      end
+    end
+
+    def build(event)
+      path = event.payload[:identifier]
+      path = CGI.unescape(path) if path.start_with?(/https?%3A%2F%2F/)
+
       info do
-        "  [Proscenium] Side loaded #{event.payload[:identifier]}"
+        message = "#{color('[Proscenium]', nil, bold: true)} Building /#{path}"
+        message << " (Duration: #{event.duration.round(1)}ms | Allocations: #{event.allocations})"
       end
     end
 
-    def build_to_string(event)
+    def resolve(event)
       path = event.payload[:identifier]
       path = CGI.unescape(path) if path.start_with?(/https?%3A%2F%2F/)
 
       info do
-        message = "  #{color('[Proscenium]', nil, bold: true)} Building (to string) #{path}"
+        message = "  #{color('[Proscenium]', nil, bold: true)} Resolving #{path}"
         message << " (Duration: #{event.duration.round(1)}ms | Allocations: #{event.allocations})"
       end
     end

data/lib/proscenium/phlex/css_modules.rb

@@ -24,7 +24,7 @@ module Proscenium
 
     def after_template
       self.class.resolved_css_module_paths.each do |path|
-        Proscenium::Importer.import path
+        Proscenium::Importer.import path, sideloaded: true
       end
 
       super

data/lib/proscenium/react_componentable.rb

@@ -46,7 +46,6 @@ module Proscenium
     class_methods do
       def sideload(options)
         Importer.import manager, **options, js: { type: 'module' }
-        Importer.sideload source_path, lazy: true, **options
       end
     end
 

data/lib/proscenium/side_load.rb

@@ -86,13 +86,14 @@ module Proscenium
     end
 
     class << self
-      # Side loads the class, and its super classes that respond to `.source_path`.
+      # Side loads assets for the class, and its super classes that respond to `.source_path`, which
+      # should return a Pathname of the class source file.
       #
       # Set the `abstract_class` class variable to true in any class, and it will not be side
       # loaded.
       #
-      # If the class responds to `.sideload`, it will be called instead of the regular side loading.
-      # You can use this to customise what is side loaded.
+      # If the class responds to `.sideload`, it will be called after the regular side loading. You
+      # can use this to customise what is side loaded.
       def sideload_inheritance_chain(obj, options)
         return unless Proscenium.config.side_load
 
@@ -116,18 +117,28 @@ module Proscenium
 
         klass = obj.class
         while klass.respond_to?(:source_path) && klass.source_path && !klass.abstract_class
-          if klass.respond_to?(:sideload)
-            klass.sideload options
-          elsif options[:css] == false
+          if options[:css] == false
             Importer.sideload klass.source_path, **options
           else
             Importer.sideload_js klass.source_path, **options
             css_imports << klass.source_path
           end
 
+          klass.sideload options if klass.respond_to?(:sideload)
+
           klass = klass.superclass
         end
 
+        # All regular CSS files (*.css) are ancestrally sideloaded. However, the first CSS module
+        # in the ancestry is also sideloaded in addition to the regular CSS files. This is because
+        # the CSS module digest will be different for each file, so we only sideload the first CSS
+        # module.
+        css_imports.each do |it|
+          break if Importer.sideload_css_module(it, **options).present?
+        end
+
+        # Sideload regular CSS files in reverse order.
+        #
         # 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 in the
         # right direction.

data/lib/proscenium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Proscenium
-  VERSION = '0.19.0.beta7'
+  VERSION = '0.19.0.beta8'
 end

data/lib/proscenium.rb

@@ -1,12 +1,6 @@
 # frozen_string_literal: true
 
-# require 'zeitwerk'
-
-# loader = Zeitwerk::Loader.for_gem
-# loader.inflector.inflect 'ui' => 'UI'
-# loader.ignore "#{__dir__}/proscenium/ext"
-# loader.ignore "#{__dir__}/proscenium/libs"
-# loader.setup
+require 'active_support'
 
 module Proscenium
   extend ActiveSupport::Autoload

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.19.0.beta7
+  version: 0.19.0.beta8
 platform: ruby
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-31 00:00:00.000000000 Z
+date: 2025-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport