proscenium 0.19.0.beta7-x86_64-linux → 0.19.0.beta9-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e59b0397e0bd676d64b2b3d5a11d87f48a26d65273a697583f257bb31fbc1b
-  data.tar.gz: 5613aaf5176de69818ce04f7d6ffcf90db58d46a21c832bc5556756bdbd83a4d
+  metadata.gz: f04d39d42c27ca3a65dd38d39bf7494c2a8a42d0ed86e73882d92cdc209b3c5c
+  data.tar.gz: bd52e00bd2c2eafaeab5d2a868f6edabf5d7e832f1792dc285fecd1a78a8e546
 SHA512:
-  metadata.gz: 6d94a81f9f990a87a6ad0decd2a37ef5e362dd42874285026013240583e1819f4a0d5e074813f8ee6f2b4cfc9ad1fa28db4f34d9a8526215632024c04ddcec9b
-  data.tar.gz: 120a1717860ee0faa07a21d02c06d99eb4eee443056a0fa0fa43335cf17036a3a0502731e559d6796bd4747d96ee03299f5c9e34ea7e6e15811cdc930ce0fe85
+  metadata.gz: ee53c5ec7c4fa3906ade09464fe5fda71a4bb66d17f768defe69653c3b707cf2ba67f256111470f70ee6c009afac86eaf1ee88c261315e7ad06e8efde479c69c
+  data.tar.gz: 287757c6ad880ef96727e1e19db2387ca612c88609eae22e3d1195abc019a103b20a13afdbb4c1020fb0ad55e7112ee55ed7cf7300a4d9b445dcf789cd2510f5

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

@@ -23,8 +23,9 @@ module Proscenium
     end
 
     def after_template
+      self.class.resolved_css_module_paths ||= Concurrent::Set.new
       self.class.resolved_css_module_paths.each do |path|
-        Proscenium::Importer.import path
+        Proscenium::Importer.import path, sideloaded: true
       end
 
       super
@@ -67,6 +68,8 @@ module Proscenium
       if attributes.key?(:class) && (attributes[:class] = tokens(attributes[:class])).include?('@')
         names = attributes[:class].is_a?(Array) ? attributes[:class] : attributes[:class].split
 
+        self.class.resolved_css_module_paths ||= Concurrent::Set.new
+
         attributes[:class] = cssm.class_names(*names).map do |name, path|
           self.class.resolved_css_module_paths << path if path
           name

data/lib/proscenium/railtie.rb

@@ -48,8 +48,6 @@ module Proscenium
 
     initializer 'proscenium.middleware' do |app|
       app.middleware.insert_after ActionDispatch::Static, Proscenium::Middleware
-      # app.middleware.insert_after ActionDispatch::Static, Rack::ETag, 'no-cache'
-      # app.middleware.insert_after ActionDispatch::Static, Rack::ConditionalGet
     end
 
     initializer 'proscenium.sideloading' do
@@ -77,14 +75,3 @@ module Proscenium
     end
   end
 end
-
-if Rails.gem_version < Gem::Version.new('7.1.0')
-  class ActionDispatch::DebugView
-    def initialize(assigns)
-      tpl_path = Proscenium::Railtie.root.join('lib', 'proscenium', 'templates').to_s
-      paths = [RESCUES_TEMPLATE_PATH, tpl_path]
-      lookup_context = ActionView::LookupContext.new(paths)
-      super(lookup_context, assigns, nil)
-    end
-  end
-end

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/ui/breadcrumbs/component.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'literal'
-
 module Proscenium::UI
   class Breadcrumbs::Component < Component
     extend Literal::Properties

data/lib/proscenium/ui/form.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'literal'
-
 module Proscenium::UI
   # Helpers to aid in building forms and associated inputs with built-in styling, and inspired by
   # Rails form helpers and SimpleForm.

data/lib/proscenium/version.rb

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

data/lib/proscenium.rb

@@ -1,12 +1,8 @@
 # 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'
+require 'active_record/type' # needed by Literal, even though we're not using ActiveRecord
+require 'literal'
 
 module Proscenium
   extend ActiveSupport::Autoload

metadata

@@ -1,77 +1,70 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.19.0.beta7
+  version: 0.19.0.beta9
 platform: x86_64-linux
 authors:
 - Joel Moss
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-31 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: countries
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 7.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 7.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '9.0'
 - !ruby/object:Gem::Dependency
-  name: countries
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: literal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: literal
+  name: phlex-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: phonelib
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.3
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,15 +105,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
-description:
+        version: 1.1.1
 email:
 - joel@developwithstyle.com
 executables: []
@@ -245,7 +237,6 @@ metadata:
   source_code_uri: https://github.com/joelmoss/proscenium
   changelog_uri: https://github.com/joelmoss/proscenium/releases
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -260,8 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: The engine powering your Rails frontend
 test_files: []