proscenium 0.11.0.pre.8-x86_64-darwin → 0.11.0.pre.10-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec72bb2fdbfb6fdc6862af4a350188e6a1a851be686cff124b528fa4764a659
-  data.tar.gz: 657d521ec0f5b6baea484baf80495114c58421eee7a20d11cb2ce264b32e1515
+  metadata.gz: 2830fab8a04207b16ce26439994e8cb5ae6882a2f78e90f49faca58f1c3db2b4
+  data.tar.gz: 87549366f8decdda2fdcb5e63461fac3cff46e75fa4f1bc00661cf5d24b4552c
 SHA512:
-  metadata.gz: 689f2dc2829a7260c13a5881941da8ecc4c7b8c16a89d572ab297872be5118ca7a2b4c667ddc218a8f352bcc03a0802bb08f52b65fdaf136dea9aa1b422b2f2e
-  data.tar.gz: 8ed0cb3e9ed37e60b0782346032ad2036266e7a58e761ed0accbc927afc91732bfc83eaafa18487ad90fdb6876bac9302f651eb8732b2c2862c3579f2a11607d
+  metadata.gz: f134a7364fdb029e1c5f2195934ee57fd2111eefd0d3dcebd84651ce593be69d40ca50a3feca9104a3540947eadf6648160c19bb0976e1d68847fd5e91d43a76
+  data.tar.gz: fef4d6c37eefac4acc926793abb61ffff76936056ef8c9b619107b13034440900dceb5454bf59824886b5ee7988bfc2820d59023940f968d1cfb557699ad1a09

data/lib/proscenium/css_module/transformer.rb

@@ -9,7 +9,8 @@ module Proscenium
     end
 
     def initialize(source_path)
-      @source_path = source_path
+      return unless (@source_path = source_path)
+
       @source_path = Pathname.new(@source_path) unless @source_path.is_a?(Pathname)
       @source_path = @source_path.sub_ext(FILE_EXT) unless @source_path.to_s.end_with?(FILE_EXT)
     end
@@ -37,6 +38,7 @@ module Proscenium
     # @return [Array<String>] the transformed CSS module names.
     def class_names(*names, require_prefix: true)
       names.map do |name|
+        original_name = name.dup
         name = name.to_s if name.is_a?(Symbol)
 
         if name.include?('/')
@@ -44,33 +46,37 @@ module Proscenium
             # Scoped bare specifier (eg. "@scoped/package/lib/button@default").
             _, path, name = name.split('@')
             path = "@#{path}"
-          elsif name.start_with?('/')
-            # Local path with leading slash.
-            path, name = name[1..].split('@')
           else
-            # Bare specifier (eg. "mypackage/lib/button@default").
+            # Local path (eg. /some/path/to/button@default") or bare specifier (eg.
+            # "mypackage/lib/button@default").
             path, name = name.split('@')
           end
 
-          class_name! name, path: "#{path}#{FILE_EXT}"
+          class_name! name, original_name, path: "#{path}#{FILE_EXT}"
         elsif name.start_with?('@')
-          class_name! name[1..]
+          class_name! name[1..], original_name
         else
-          require_prefix ? name : class_name!(name)
+          require_prefix ? name : class_name!(name, original_name)
         end
       end
     end
 
-    def class_name!(name, path: @source_path)
+    def class_name!(name, original_name, path: @source_path)
+      unless path
+        raise Proscenium::CssModule::TransformError.new(original_name, 'CSS module path not given')
+      end
+
       resolved_path = Resolver.resolve(path.to_s)
       digest = Importer.import(resolved_path)
 
-      sname = name.to_s
-      if sname.start_with?('_')
-        "_#{sname[1..]}-#{digest}"
-      else
-        "#{sname}-#{digest}"
-      end
+      transformed_name = name.to_s
+      transformed_name = if transformed_name.start_with?('_')
+                           "_#{transformed_name[1..]}-#{digest}"
+                         else
+                           "#{transformed_name}-#{digest}"
+                         end
+
+      [transformed_name, resolved_path]
     end
   end
 end

data/lib/proscenium/css_module.rb

@@ -6,11 +6,20 @@ module Proscenium::CssModule
   autoload :Path
   autoload :Transformer
 
+  class TransformError < StandardError
+    def initialize(name, additional_msg = nil)
+      msg = "Failed to transform CSS module `#{name}`"
+      msg << ' - ' << additional_msg if additional_msg
+
+      super msg
+    end
+  end
+
   # Accepts one or more CSS class names, and transforms them into CSS module names.
   #
   # @param name [String,Symbol,Array<String,Symbol>]
   def css_module(*names)
-    cssm.class_names(*names, require_prefix: false).join ' '
+    cssm.class_names(*names, require_prefix: false).map { |name, _| name }.join(' ')
   end
 
   private

data/lib/proscenium/helper.rb

@@ -22,7 +22,9 @@ module Proscenium
     # @param name [String,Symbol,Array<String,Symbol>]
     def css_module(*names)
       path = Pathname.new(@lookup_context.find(@virtual_path).identifier).sub_ext('')
-      CssModule::Transformer.new(path).class_names(*names, require_prefix: false).join ' '
+      CssModule::Transformer.new(path).class_names(*names, require_prefix: false).map do |name, _|
+        name
+      end.join(' ')
     end
 
     def include_stylesheets(**options)

data/lib/proscenium/phlex/css_modules.rb

@@ -6,6 +6,28 @@ module Proscenium
 
     def self.included(base)
       base.extend CssModule::Path
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      # Set of CSS module paths that have been resolved after being transformed from 'class' HTML
+      # attributes. See #process_attributes. This is here because Phlex caches attributes. Which
+      # means while the CSS class names will be transformed, any resolved paths will be lost in
+      # subsequent requests.
+      attr_accessor :resolved_css_module_paths
+    end
+
+    def before_template
+      self.class.resolved_css_module_paths ||= Concurrent::Set.new
+      super
+    end
+
+    def after_template
+      self.class.resolved_css_module_paths.each do |path|
+        Proscenium::Importer.import path
+      end
+
+      super
     end
 
     # Resolve and side load any CSS modules in the "class" attributes, where a CSS module is a class
@@ -44,7 +66,11 @@ module Proscenium
     def process_attributes(**attributes)
       if attributes.key?(:class) && (attributes[:class] = tokens(attributes[:class])).include?('@')
         names = attributes[:class].is_a?(Array) ? attributes[:class] : attributes[:class].split
-        attributes[:class] = cssm.class_names(*names)
+
+        attributes[:class] = cssm.class_names(*names).map do |name, path|
+          self.class.resolved_css_module_paths << path if path
+          name
+        end
       end
 
       attributes

data/lib/proscenium/phlex.rb

@@ -6,7 +6,6 @@ module Proscenium
   class Phlex < ::Phlex::HTML
     extend ActiveSupport::Autoload
 
-    autoload :Page
     autoload :CssModules
     autoload :ReactComponent
 

data/lib/proscenium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Proscenium
-  VERSION = '0.11.0.pre.8'
+  VERSION = '0.11.0.pre.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.11.0.pre.8
+  version: 0.11.0.pre.10
 platform: x86_64-darwin
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.5
+        version: 1.16.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.5
+        version: 1.16.3
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,6 @@ files:
 - lib/proscenium/monkey.rb
 - lib/proscenium/phlex.rb
 - lib/proscenium/phlex/css_modules.rb
-- lib/proscenium/phlex/page.rb
 - lib/proscenium/phlex/react_component.rb
 - lib/proscenium/railtie.rb
 - lib/proscenium/react_componentable.rb
@@ -149,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: The engine powering your Rails frontend

data/lib/proscenium/phlex/page.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'phlex/rails'
-
-# Include this in your view for additional logic for rendering a full HTML page, usually from a
-# controller.
-module Proscenium::Phlex::Page
-  include Phlex::Rails::Helpers::CSPMetaTag
-  include Phlex::Rails::Helpers::CSRFMetaTags
-  include Phlex::Rails::Helpers::FaviconLinkTag
-  include Phlex::Rails::Helpers::PreloadLinkTag
-  include Phlex::Rails::Helpers::StyleSheetLinkTag
-  include Phlex::Rails::Helpers::ActionCableMetaTag
-  include Phlex::Rails::Helpers::AutoDiscoveryLinkTag
-  include Phlex::Rails::Helpers::JavaScriptIncludeTag
-  include Phlex::Rails::Helpers::JavaScriptImportMapTags
-  include Phlex::Rails::Helpers::JavaScriptImportModuleTag
-
-  def self.included(klass)
-    klass.extend(Phlex::Rails::Layout::Interface)
-  end
-
-  def template(&block)
-    doctype
-    html do
-      head
-      body(&block)
-    end
-  end
-
-  private
-
-  def after_template
-    super
-    @_buffer.gsub!('<!-- [SIDE_LOAD_STYLESHEETS] -->', capture { include_stylesheets })
-  end
-
-  def page_title
-    Rails.application.class.name.deconstantize
-  end
-
-  def head
-    super do
-      title { page_title }
-
-      yield if block_given?
-
-      csp_meta_tag
-      csrf_meta_tags
-
-      comment { '[SIDE_LOAD_STYLESHEETS]' }
-    end
-  end
-
-  def body
-    super do
-      yield if block_given?
-
-      include_javascripts type: :module, defer: true
-    end
-  end
-end