proscenium 0.18.0-arm64-darwin → 0.19.0-arm64-darwin

data/lib/proscenium/resolver.rb

@@ -4,36 +4,27 @@ require 'active_support/current_attributes'
 
 module Proscenium
   class Resolver < ActiveSupport::CurrentAttributes
-    # TODO: cache this across requests in production.
-    attribute :resolved
+    attribute :resolved unless Rails.env.production?
+    mattr_accessor :resolved if Rails.env.production?
 
-    # Resolve the given `path` to a URL path.
+    # Resolve the given `path` to a fully qualified URL path.
     #
-    # @param path [String] Can be URL path, file system path, or bare specifier (ie. NPM package).
+    # @param path [String] URL path, file system path, or bare specifier (ie. NPM package).
     # @return [String] URL path.
-    #
-    # rubocop:disable Metrics/*
     def self.resolve(path)
       self.resolved ||= {}
 
-      self.resolved[path] ||= begin
-        if path.start_with?('./', '../')
-          raise ArgumentError, 'path must be an absolute file system or URL path'
-        end
-
-        if path.start_with?('@proscenium/')
-          "/#{path}"
-        elsif path.start_with?(Proscenium.ui_path.to_s)
-          path.delete_prefix Proscenium.root.join('lib').to_s
-        elsif (engine = Proscenium.config.engines.find { |e| path.start_with? "#{e.root}/" })
-          path.sub(/^#{engine.root}/, "/#{engine.engine_name}")
-        elsif path.start_with?("#{Rails.root}/")
-          path.delete_prefix Rails.root.to_s
-        else
-          Builder.resolve path
-        end
+      if path.start_with?('./', '../')
+        raise ArgumentError, '`path` must be an absolute file system or URL path'
       end
+
+      self.resolved[path] ||= if (gem = BundledGems.paths.find { |_, v| path.start_with? "#{v}/" })
+                                path.sub(/^#{gem.last}/, "/node_modules/@rubygems/#{gem.first}")
+                              elsif path.start_with?("#{Rails.root}/")
+                                path.delete_prefix Rails.root.to_s
+                              else
+                                Builder.resolve path
+                              end
     end
-    # rubocop:enable Metrics/*
   end
 end

data/lib/proscenium/side_load.rb

@@ -4,7 +4,6 @@ module Proscenium
   class SideLoad
     JS_COMMENT = '<!-- [PROSCENIUM_JAVASCRIPTS] -->'
     CSS_COMMENT = '<!-- [PROSCENIUM_STYLESHEETS] -->'
-    LAZY_COMMENT = '<!-- [PROSCENIUM_LAZY_SCRIPTS] -->'
 
     module Controller
       def self.included(child)
@@ -35,29 +34,16 @@ module Proscenium
 
         return if !fragments && !included_comment
 
-        imports = Proscenium::Importer.imported.dup
-        paths_to_build = []
-        Proscenium::Importer.each_stylesheet(delete: true) do |x, _|
-          paths_to_build << x.delete_prefix('/')
-        end
-
-        result = Proscenium::Builder.build_to_path(paths_to_build.join(';'),
-                                                   base_url: helpers.request.base_url)
-
         out = []
-        result.split(';').each do |x|
-          inpath, outpath = x.split('::')
-          inpath.prepend '/'
-          outpath.delete_prefix! 'public'
-
-          next unless imports.key?(inpath)
-
-          import = imports[inpath]
-          opts = import[:css].is_a?(Hash) ? import[:css] : {}
+        Proscenium::Importer.each_stylesheet(delete: true) do |path, opts|
+          opts = opts[:css].is_a?(Hash) ? opts[:css] : {}
           opts[:preload_links_header] = false if fragments
           opts[:data] ||= {}
-          opts[:data][:original_href] = inpath
-          out << helpers.stylesheet_link_tag(outpath, extname: false, **opts)
+
+          if Proscenium.config.cache_query_string.present?
+            path += "?#{Proscenium.config.cache_query_string}"
+          end
+          out << helpers.stylesheet_link_tag(path, extname: false, **opts)
         end
 
         if fragments
@@ -71,73 +57,43 @@ module Proscenium
         return if response_body.nil?
         return if response_body.first.blank? || !Proscenium::Importer.js_imported?
 
-        imports = Proscenium::Importer.imported.dup
-        paths_to_build = []
-        Proscenium::Importer.each_javascript(delete: true) do |x, _|
-          paths_to_build << x.delete_prefix('/')
-        end
-
-        result = Proscenium::Builder.build_to_path(paths_to_build.join(';'),
-                                                   base_url: helpers.request.base_url)
-
-        included_js_comment = response_body.first.include?(JS_COMMENT)
-        included_lazy_comment = response_body.first.include?(LAZY_COMMENT)
+        included_comment = response_body.first.include?(JS_COMMENT)
         fragments = if (fragment_header = request.headers['X-Fragment'])
                       fragment_header.split
                     end
 
-        if fragments || included_js_comment
-          out = []
-          scripts = {}
-          result.split(';').each do |x|
-            inpath, outpath = x.split('::')
-            inpath.prepend '/'
-            outpath.delete_prefix! 'public'
-
-            next unless imports.key?(inpath)
-
-            if (import = imports[inpath]).delete(:lazy)
-              scripts[inpath] = import.merge(outpath:)
-            else
-              opts = import[:js].is_a?(Hash) ? import[:js] : {}
-              opts[:preload_links_header] = false if fragments
-              out << helpers.javascript_include_tag(outpath, extname: false, **opts)
-            end
-          end
+        return if !fragments && !included_comment
 
-          if fragments
-            response_body.first.prepend out.join.html_safe
-          elsif included_js_comment
-            response_body.first.gsub! JS_COMMENT, out.join.html_safe
-          end
-        end
+        out = []
+        Proscenium::Importer.each_javascript(delete: true) do |path, opts|
+          next if opts.delete(:lazy)
 
-        return if !fragments && !included_lazy_comment
+          opts = opts[:js].is_a?(Hash) ? opts[:js] : {}
+          opts[:preload_links_header] = false if fragments
 
-        lazy_script = ''
-        if scripts.present?
-          lazy_script = helpers.content_tag 'script', type: 'application/json',
-                                                      id: 'prosceniumLazyScripts' do
-            scripts.to_json.html_safe
+          if Proscenium.config.cache_query_string.present?
+            path += "?#{Proscenium.config.cache_query_string}"
           end
+          out << helpers.javascript_include_tag(path, extname: false, **opts)
         end
 
         if fragments
-          response_body.first.prepend lazy_script
-        elsif included_lazy_comment
-          response_body.first.gsub! LAZY_COMMENT, lazy_script
+          response_body.first.prepend out.join.html_safe
+        elsif included_comment
+          response_body.first.gsub! JS_COMMENT, out.join.html_safe
         end
       end
     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
 
@@ -160,23 +116,34 @@ module Proscenium
         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
-          elsif options[:css] == false
+        while klass.respond_to?(:source_path) && klass.source_path &&
+              (klass.respond_to?(:abstract_class) ? !klass.abstract_class : true)
+          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| # rubocop:disable Style/ItAssignment
+          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 i9n the
+        # Basically, the layout should be loaded before the view so that CSS cascading works in the
         # right direction.
-        css_imports.reverse_each do |it|
+        css_imports.reverse_each do |it| # rubocop:disable Style/ItAssignment
           Importer.sideload_css it, **options
         end
       end

data/lib/proscenium/utils.rb

@@ -9,5 +9,38 @@ module Proscenium
     def digest(value)
       Digest::SHA1.hexdigest(value.to_s)[..7]
     end
+
+    # Merges the given array of attribute `name`'s into the `kw_arguments`. A bang attribute is one
+    # that ends with an exclamation mark or - in Ruby parlance - a "bang", and has a boolean value.
+    # Modifies the given `kw_attributes`, and only attribute names in `allowed` will be merged.
+    #
+    # @param names [Array(Symbol)] of argument names
+    # @param kw_attributes [Hash] attributes to be merged with
+    # @param allowed [Array(Symbol)] attribute names allowed to be merged as bang attributes
+    #
+    # Example:
+    #
+    #   def tab(name, *args, href:, **attributes)
+    #     Hue::Utils.merge_bang_attributes!(args, attributes, [:current])
+    #   end
+    #
+    # Allowing you to use either of the following API's:
+    #
+    #   tab 'Tab 1', required: true
+    #   tab 'Tab 1', :required!
+    #
+    def merge_bang_attributes!(names, kw_attributes, allowed)
+      allowed.each do |name|
+        sym_name = name.to_sym
+        bang_name = :"#{sym_name}!"
+
+        next unless names.include?(bang_name)
+
+        names.delete(bang_name)
+
+        # Keyword arguments should override the bang.
+        kw_attributes[sym_name] = true unless kw_attributes.key?(sym_name)
+      end
+    end
   end
 end

data/lib/proscenium/version.rb

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

data/lib/proscenium.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/dependencies/autoload'
+require 'active_support'
 
 module Proscenium
   extend ActiveSupport::Autoload
@@ -28,13 +28,11 @@ module Proscenium
   autoload :SideLoad
   autoload :CssModule
   autoload :ReactComponentable
-  autoload :ViewComponent
-  autoload :Phlex
   autoload :Helper
   autoload :Builder
   autoload :Importer
   autoload :Resolver
-  autoload :UI
+  autoload :BundledGems
 
   class Deprecator
     def deprecation_warning(name, message, _caller_backtrace = nil)
@@ -60,14 +58,6 @@ module Proscenium
       @config ||= Railtie.config.proscenium
     end
 
-    def cache
-      @cache ||= config.cache || ActiveSupport::Cache::NullStore.new
-    end
-
-    def ui_path
-      Railtie.root.join('lib', 'proscenium', 'ui')
-    end
-
     def root
       Railtie.root
     end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: arm64-darwin
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-15 00:00:00.000000000 Z
+date: 2025-09-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.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: '8.0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -45,35 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.17.0
 - !ruby/object:Gem::Dependency
-  name: literal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.13'
-- !ruby/object:Gem::Dependency
-  name: railties
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +33,7 @@ dependencies:
         version: 7.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,21 +43,7 @@ dependencies:
         version: 7.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
-- !ruby/object:Gem::Dependency
-  name: ruby-next
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '9.0'
 description:
 email:
 - joel@developwithstyle.com
@@ -118,57 +56,31 @@ files:
 - README.md
 - lib/proscenium.rb
 - lib/proscenium/builder.rb
-- lib/proscenium/core_ext/object/css_module_ivars.rb
+- lib/proscenium/bundled_gems.rb
 - lib/proscenium/css_module.rb
 - lib/proscenium/css_module/path.rb
-- lib/proscenium/css_module/rewriter.rb
 - lib/proscenium/css_module/transformer.rb
 - lib/proscenium/ensure_loaded.rb
 - lib/proscenium/ext/proscenium
 - lib/proscenium/ext/proscenium.h
 - lib/proscenium/helper.rb
 - lib/proscenium/importer.rb
-- lib/proscenium/libs/custom_element.js
-- lib/proscenium/libs/react-manager/index.jsx
-- lib/proscenium/libs/react-manager/react.js
-- lib/proscenium/libs/stimulus-loading.js
-- lib/proscenium/libs/test.js
-- lib/proscenium/libs/ujs/class.js
-- lib/proscenium/libs/ujs/data_confirm.js
-- lib/proscenium/libs/ujs/data_disable_with.js
-- lib/proscenium/libs/ujs/index.js
 - lib/proscenium/log_subscriber.rb
 - lib/proscenium/middleware.rb
 - lib/proscenium/middleware/base.rb
-- lib/proscenium/middleware/engines.rb
 - lib/proscenium/middleware/esbuild.rb
-- lib/proscenium/middleware/runtime.rb
+- lib/proscenium/middleware/ruby_gems.rb
 - lib/proscenium/monkey.rb
-- lib/proscenium/phlex.rb
-- lib/proscenium/phlex/asset_inclusions.rb
-- lib/proscenium/phlex/css_modules.rb
-- lib/proscenium/phlex/react_component.rb
 - lib/proscenium/railtie.rb
+- lib/proscenium/react-manager/index.jsx
+- lib/proscenium/react-manager/react.js
 - lib/proscenium/react_componentable.rb
 - lib/proscenium/resolver.rb
 - lib/proscenium/side_load.rb
 - lib/proscenium/source_path.rb
 - lib/proscenium/templates/rescues/build_error.html.erb
-- lib/proscenium/ui.rb
-- lib/proscenium/ui/breadcrumbs.rb
-- lib/proscenium/ui/breadcrumbs/component.module.css
-- lib/proscenium/ui/breadcrumbs/component.rb
-- lib/proscenium/ui/breadcrumbs/computed_element.rb
-- lib/proscenium/ui/breadcrumbs/control.rb
-- lib/proscenium/ui/breadcrumbs/mixins.css
-- lib/proscenium/ui/component.rb
-- lib/proscenium/ui/test.js
 - lib/proscenium/utils.rb
 - lib/proscenium/version.rb
-- lib/proscenium/view_component.rb
-- lib/proscenium/view_component/css_modules.rb
-- lib/proscenium/view_component/react_component.rb
-- lib/proscenium/view_component/sideload.rb
 homepage: https://github.com/joelmoss/proscenium
 licenses:
 - MIT
@@ -185,14 +97,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.21
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: The engine powering your Rails frontend

data/lib/proscenium/core_ext/object/css_module_ivars.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class Object
-  def instance_variable_get(name)
-    name.is_a?(::Proscenium::CssModule::Name) ? super(name.to_sym) : super
-  end
-
-  def instance_variable_set(name, obj)
-    name.is_a?(::Proscenium::CssModule::Name) ? super(name.to_sym, obj) : super
-  end
-
-  def instance_variable_defined?(name)
-    name.is_a?(::Proscenium::CssModule::Name) ? super(name.to_sym) : super
-  end
-
-  def remove_instance_variable(name)
-    name.is_a?(::Proscenium::CssModule::Name) ? super(name.to_sym) : super
-  end
-end

data/lib/proscenium/css_module/rewriter.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'ruby-next/language'
-require 'proscenium/core_ext/object/css_module_ivars'
-
-module Proscenium
-  module CssModule
-    class Rewriter < RubyNext::Language::Rewriters::Text
-      NAME = 'proscenium-css-module'
-
-      def rewrite(source)
-        source = source.gsub(/%i\[((@[\w@ ]+)|([\w@ ]+ @[\w@ ]+))\]/) do |_|
-          arr = ::Regexp.last_match(1).split.map do |x|
-            x.start_with?('@') ? css_module_string(x[1..]) : ":#{x}"
-          end
-          "[#{arr.join(',')}]"
-        end
-
-        source.gsub(/:@([\w]+)/) do |_|
-          context.track!(self)
-          css_module_string(::Regexp.last_match(1))
-        end
-      end
-
-      private
-
-      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}')"
-        else
-          "Proscenium::CssModule::Name.new(:@#{name}, css_module(:#{name}))"
-        end
-      end
-    end
-  end
-end
-
-RubyNext::Language.send :include_patterns=, []
-RubyNext::Language.include_patterns << "#{Rails.root.join('app', 'components')}/*.rb"
-RubyNext::Language.include_patterns << "#{Rails.root.join('app', 'views')}/*.rb"
-RubyNext::Language.rewriters = [Proscenium::CssModule::Rewriter]
-
-require 'ruby-next/language/runtime'

data/lib/proscenium/libs/custom_element.js

@@ -1,54 +0,0 @@
-/**
- * Base class for custom elements, providing support for event delegation, and idempotent
- * customElement registration.
- *
- * The `handleEvent` method is called any time an event defined in `delegatedEvents` is triggered.
- * It's a central handler to handle events for this custom element.
- *
- * @example
- *   class MyComponent extends CustomElement {
- *     static componentName = 'my-component'
- *     static delegatedEvents = ['click']
- *
- *     handleEvent(event) {
- *       console.log('Hello, world!')
- *     }
- *   }
- *   MyComponent.register()
- */
-export default class CustomElement extends HTMLElement {
-  /**
-   * Register the component as a custom element, inferring the component name from the kebab-cased
-   * class name. You can override the component name by setting a static `componentName` property.
-   *
-   * This method is idempotent.
-   */
-  static register() {
-    if (this.componentName === undefined) {
-      this.componentName = this.name
-        .replaceAll(/(.)([A-Z])/g, "$1-$2")
-        .toLowerCase();
-    }
-
-    if (!customElements.get(this.componentName)) {
-      customElements.define(this.componentName, this);
-    }
-  }
-
-  /**
-   * A list of event types to be delegated for the lifetime of the custom element.
-   *
-   * @type {Array}
-   */
-  static delegatedEvents = [];
-
-  constructor() {
-    super();
-
-    if (typeof this.handleEvent !== "undefined") {
-      this.constructor.delegatedEvents?.forEach((event) => {
-        this.addEventListener(event, this);
-      });
-    }
-  }
-}

data/lib/proscenium/libs/stimulus-loading.js

@@ -1,65 +0,0 @@
-export function lazyLoadControllersFrom(under, app, element = document) {
-  const { controllerAttribute } = app.schema;
-
-  lazyLoadExistingControllers(element);
-
-  // Lazy load new controllers.
-  new MutationObserver((mutationsList) => {
-    for (const { attributeName, target, type } of mutationsList) {
-      switch (type) {
-        case "attributes": {
-          if (
-            attributeName == controllerAttribute &&
-            target.getAttribute(controllerAttribute)
-          ) {
-            extractControllerNamesFrom(target).forEach((controllerName) =>
-              loadController(controllerName)
-            );
-          }
-        }
-
-        case "childList": {
-          lazyLoadExistingControllers(target);
-        }
-      }
-    }
-  }).observe(element, {
-    attributeFilter: [controllerAttribute],
-    subtree: true,
-    childList: true,
-  });
-
-  function lazyLoadExistingControllers(element) {
-    Array.from(element.querySelectorAll(`[${controllerAttribute}]`))
-      .map(extractControllerNamesFrom)
-      .flat()
-      .forEach(loadController);
-  }
-
-  function extractControllerNamesFrom(element) {
-    return element
-      .getAttribute(controllerAttribute)
-      .split(/\s+/)
-      .filter((content) => content.length);
-  }
-
-  function loadController(name) {
-    if (canRegisterController(name)) {
-      const fileToImport = `${under}/${name
-        .replace(/--/g, "/")
-        .replace(/-/g, "_")}_controller.js`;
-
-      import(fileToImport)
-        .then((module) => {
-          canRegisterController(name) && app.register(name, module.default);
-        })
-        .catch((error) =>
-          console.error(`Failed to autoload controller: ${name}`, error)
-        );
-    }
-  }
-
-  function canRegisterController(name) {
-    return !app.router.modulesByIdentifier.has(name);
-  }
-}

data/lib/proscenium/libs/test.js

@@ -1 +0,0 @@
-console.log("/@proscenium/test.js");