proscenium 0.19.0.beta9 → 0.19.0.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 626f28026ff85ae9171c3c219211c8ff793c4f5f92d6139e790380b0150db163
-  data.tar.gz: be61f3291b7b0930d8be64f0c0cc42ee4eddcbe306e8d5b5862d9fe7fb618fbb
+  metadata.gz: 7b98dee04473b7b140c7521cf0c87f176e24fc5f2308f90bce52a9ffd6fd9d01
+  data.tar.gz: 67a2f65151f79296999a1f67519570a43b7ccde535fa29df8ffcae39be3a26b4
 SHA512:
-  metadata.gz: b90f329dff4f536c8359be1696a8d83aac74ccf334382cedf8faad868f18de1d36800c436e19fad7565946fef6b9726c3ad94600e7cb27f9de800627950bf549
-  data.tar.gz: a160134f3d0c6b536e2edc2375173c5776c8b8a739166f5205613886f7299ab95c7c1fdc450c15096f57744951ccf10dcd806be0b13b262e5683d9bee5a6bc7b
+  metadata.gz: 5ff88d28ca35d1a3ef437af74718a90459de2e93f30ecbfcbf89aea69f4655e56f12a36903669c2617a5afde4f042fa3fb1fd11bfc7285bf259665f3ac742919
+  data.tar.gz: 268d23eeec545c80096ecdd7d877c0efbe45fc327bd802c3296f754a19cf5ce6c8f2d25e31c168160bfa18fde8e50a7a2fbe786a35212444662d6fa10b221339

data/lib/proscenium/bundled_gems.rb

@@ -13,7 +13,7 @@ module Proscenium
         bundle = {}
         specs.each do |s|
           bundle[s.name] = if s.name == 'proscenium'
-                             Pathname(s.full_gem_path).join('lib/proscenium/ui').to_s
+                             Pathname(s.full_gem_path).join('lib/proscenium').to_s
                            else
                              s.full_gem_path
                            end

data/lib/proscenium/css_module.rb

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
 module Proscenium::CssModule
-  extend ActiveSupport::Autoload
-
-  autoload :Path
-  autoload :Transformer
-
   class TransformError < StandardError
     def initialize(name, additional_msg = nil)
       msg = "Failed to transform CSS module `#{name}`"

data/lib/proscenium/ensure_loaded.rb

@@ -7,17 +7,21 @@ module Proscenium
     def self.included(child)
       child.class_eval do
         append_after_action do
-          if request.format.html? && Importer.imported?
-            if Importer.js_imported?
-              raise NotIncludedError, 'There are side loaded javascripts to be included, but ' \
-                                      'they have not been included in the page. Did you forget ' \
-                                      'to add the `#include_assets` helper in your views?'
-            end
+          if request.format.html? && !response.redirect? && Importer.imported?
+            msg = <<-TEXT.squish
+              There are side loaded and imported assets to be included, but they have not been
+              included in the page. Did you forget to add the `#include_assets` helper in your
+              views? These assets were imported but not included:
+              #{Importer.imported.keys.to_sentence}
+            TEXT
 
-            if Importer.css_imported?
-              raise NotIncludedError, 'There are side loaded stylesheets to be included, but ' \
-                                      'they have not been included in the page. Did you forget ' \
-                                      'to add the `#include_assets` helper in your views?'
+            if Proscenium.config.ensure_loaded == :log
+              Rails.logger.warn do
+                "#{ActiveSupport::LogSubscriber.new.send(:color, '  [Proscenium]', nil,
+                                                         bold: true)} #{msg}"
+              end
+            elsif Proscenium.config.ensure_loaded == :raise
+              raise NotIncludedError, msg
             end
           end
         end

data/lib/proscenium/middleware.rb

@@ -2,15 +2,9 @@
 
 module Proscenium
   class Middleware
-    extend ActiveSupport::Autoload
-
     # Error when the build command fails.
     class BuildError < StandardError; end
 
-    autoload :Base
-    autoload :Esbuild
-    autoload :RubyGems
-
     def initialize(app)
       @app = app
 

data/lib/proscenium/phlex.rb

@@ -4,12 +4,6 @@ require 'phlex-rails'
 
 module Proscenium
   class Phlex < ::Phlex::HTML
-    extend ActiveSupport::Autoload
-
-    autoload :CssModules
-    autoload :ReactComponent
-    autoload :AssetInclusions
-
     include Proscenium::SourcePath
     include CssModules
     include AssetInclusions

data/lib/proscenium/railtie.rb

@@ -14,7 +14,7 @@ module Proscenium
     config.proscenium.bundle = true
     config.proscenium.side_load = true
     config.proscenium.code_splitting = true
-
+    config.proscenium.ensure_loaded = :raise
     config.proscenium.cache_query_string = Rails.env.production? && ENV.fetch('REVISION', nil)
     config.proscenium.cache_max_age = 2_592_000 # 30 days
 
@@ -33,19 +33,6 @@ module Proscenium
       end
     end
 
-    initializer 'proscenium.ui' do
-      ActiveSupport::Inflector.inflections(:en) do |inflect|
-        inflect.acronym 'UI'
-      end
-    end
-
-    initializer 'proscenium.debugging' do
-      if Rails.gem_version >= Gem::Version.new('7.1.0')
-        tpl_path = root.join('lib', 'proscenium', 'templates').to_s
-        ActionDispatch::DebugView::RESCUES_TEMPLATE_PATHS << tpl_path
-      end
-    end
-
     initializer 'proscenium.middleware' do |app|
       app.middleware.insert_after ActionDispatch::Static, Proscenium::Middleware
     end
@@ -63,15 +50,5 @@ module Proscenium
         ActionView::PartialRenderer.prepend Monkey::PartialRenderer
       end
     end
-
-    initializer 'proscenium.public_path' do |app|
-      if app.config.public_file_server.enabled
-        headers = app.config.public_file_server.headers || {}
-        index = app.config.public_file_server.index_name || 'index'
-
-        app.middleware.insert_after(ActionDispatch::Static, ActionDispatch::Static,
-                                    root.join('public').to_s, index:, headers:)
-      end
-    end
   end
 end

data/lib/proscenium/resolver.rb

@@ -19,16 +19,7 @@ module Proscenium
       end
 
       self.resolved[path] ||= if (gem = BundledGems.paths.find { |_, v| path.start_with? "#{v}/" })
-                                # If the path is a rubygem, and it is installed with npm via the
-                                # @rubygems scope, then resolve the path to the symlinked location
-                                # in node_modules.
-                                # npm_path = Rails.root.join("node_modules/@rubygems/#{gem.first}")
-                                # if npm_path.symlink?
-                                #   npm_path.realpath.join(path.sub(/^#{gem.last}/, '.')).to_s
-                                #           .delete_prefix(Rails.root.to_s)
-                                # else
                                 path.sub(/^#{gem.last}/, "/node_modules/@rubygems/#{gem.first}")
-                                # end
                               elsif path.start_with?("#{Rails.root}/")
                                 path.delete_prefix Rails.root.to_s
                               else

data/lib/proscenium/version.rb

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

data/lib/proscenium/view_component.rb

@@ -1,12 +1,6 @@
 # frozen_string_literal: true
 
 class Proscenium::ViewComponent < ViewComponent::Base
-  extend ActiveSupport::Autoload
-
-  autoload :Sideload
-  autoload :ReactComponent
-  autoload :CssModules
-
   include Proscenium::SourcePath
   include CssModules
 

data/lib/proscenium.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'active_support'
-require 'active_record/type' # needed by Literal, even though we're not using ActiveRecord
-require 'literal'
+require 'zeitwerk'
+require 'proscenium/railtie'
 
-module Proscenium
-  extend ActiveSupport::Autoload
+loader = Zeitwerk::Loader.for_gem
+loader.setup
 
+module Proscenium
   FILE_EXTENSIONS = ['js', 'mjs', 'ts', 'jsx', 'tsx', 'css', 'js.map', 'mjs.map', 'jsx.map',
                      'ts.map', 'tsx.map', 'css.map'].freeze
 
@@ -22,25 +22,6 @@ module Proscenium
   # Environment variables that should always be passed to the builder.
   DEFAULT_ENV_VARS = Set['RAILS_ENV', 'NODE_ENV'].freeze
 
-  autoload :SourcePath
-  autoload :Utils
-  autoload :Monkey
-  autoload :Middleware
-  autoload :EnsureLoaded
-  autoload :SideLoad
-  autoload :CssModule
-  autoload :ReactComponentable
-  autoload :ViewComponent
-  autoload :Phlex
-  autoload :Helper
-  autoload :Builder
-  autoload :Importer
-  autoload :Resolver
-  autoload :BundledGems
-  autoload :RubyGems
-  autoload :Registry
-  autoload :UI
-
   class Deprecator
     def deprecation_warning(name, message, _caller_backtrace = nil)
       msg = "`#{name}` is deprecated and will be removed in a near future release of Proscenium"
@@ -65,18 +46,8 @@ module Proscenium
       @config ||= Railtie.config.proscenium
     end
 
-    def ui_path
-      @ui_path ||= Railtie.root.join('lib', 'proscenium', 'ui')
-    end
-
-    def ui_path_regex
-      @ui_path_regex ||= Regexp.new("^#{Proscenium.ui_path}/")
-    end
-
     def root
       Railtie.root
     end
   end
 end
-
-require 'proscenium/railtie'

metadata

@@ -1,28 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.19.0.beta9
+  version: 0.19.0.beta11
 platform: ruby
 authors:
 - Joel Moss
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-09 00:00:00.000000000 Z
+date: 2025-04-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: countries
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 7.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -37,20 +24,6 @@ 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: phlex-rails
   requirement: !ruby/object:Gem::Requirement
@@ -65,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: phonelib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +72,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.2
+description:
 email:
 - joel@developwithstyle.com
 executables: []
@@ -146,83 +120,13 @@ files:
 - 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/registry.rb
-- lib/proscenium/registry/bundled_package.rb
-- lib/proscenium/registry/package.rb
-- lib/proscenium/registry/ruby_gem_package.rb
 - lib/proscenium/resolver.rb
-- lib/proscenium/ruby_gems.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/custom_element.js
-- lib/proscenium/ui/flash.rb
-- lib/proscenium/ui/flash/bun.lock
-- lib/proscenium/ui/flash/index.css
-- lib/proscenium/ui/flash/index.js
-- lib/proscenium/ui/flash/node_modules/dom-mutations/index.d.ts
-- lib/proscenium/ui/flash/node_modules/dom-mutations/index.js
-- lib/proscenium/ui/flash/node_modules/dom-mutations/license
-- lib/proscenium/ui/flash/node_modules/dom-mutations/package.json
-- lib/proscenium/ui/flash/node_modules/dom-mutations/readme.md
-- lib/proscenium/ui/flash/node_modules/sourdough-toast/LICENSE
-- lib/proscenium/ui/flash/node_modules/sourdough-toast/README.md
-- lib/proscenium/ui/flash/node_modules/sourdough-toast/package.json
-- lib/proscenium/ui/flash/node_modules/sourdough-toast/src/sourdough-toast.css
-- lib/proscenium/ui/flash/node_modules/sourdough-toast/src/sourdough-toast.js
-- lib/proscenium/ui/flash/package.json
-- lib/proscenium/ui/form.css
-- lib/proscenium/ui/form.rb
-- lib/proscenium/ui/form/field_methods.rb
-- lib/proscenium/ui/form/fields/base.rb
-- lib/proscenium/ui/form/fields/checkbox.rb
-- lib/proscenium/ui/form/fields/checkbox/index.jsx
-- lib/proscenium/ui/form/fields/checkbox/index.module.css
-- lib/proscenium/ui/form/fields/checkbox/previews/basic.jsx
-- lib/proscenium/ui/form/fields/date.module.css
-- lib/proscenium/ui/form/fields/datetime.rb
-- lib/proscenium/ui/form/fields/hidden.rb
-- lib/proscenium/ui/form/fields/input.rb
-- lib/proscenium/ui/form/fields/input/index.jsx
-- lib/proscenium/ui/form/fields/input/index.module.css
-- lib/proscenium/ui/form/fields/input/previews/basic.jsx
-- lib/proscenium/ui/form/fields/radio_group.rb
-- lib/proscenium/ui/form/fields/radio_input.rb
-- lib/proscenium/ui/form/fields/radio_input/index.jsx
-- lib/proscenium/ui/form/fields/radio_input/index.module.css
-- lib/proscenium/ui/form/fields/radio_input/previews/basic.jsx
-- lib/proscenium/ui/form/fields/rich_textarea.css
-- lib/proscenium/ui/form/fields/rich_textarea.js
-- lib/proscenium/ui/form/fields/rich_textarea.rb
-- lib/proscenium/ui/form/fields/select.jsx
-- lib/proscenium/ui/form/fields/select.module.css
-- lib/proscenium/ui/form/fields/select.rb
-- lib/proscenium/ui/form/fields/tel.css
-- lib/proscenium/ui/form/fields/tel.js
-- lib/proscenium/ui/form/fields/tel.rb
-- lib/proscenium/ui/form/fields/textarea.rb
-- lib/proscenium/ui/form/fields/textarea/index.jsx
-- lib/proscenium/ui/form/fields/textarea/index.module.css
-- lib/proscenium/ui/form/fields/textarea/previews/basic.jsx
-- lib/proscenium/ui/form/translation.rb
-- lib/proscenium/ui/props.css
-- lib/proscenium/ui/react-manager/index.jsx
-- lib/proscenium/ui/react-manager/react.js
-- lib/proscenium/ui/stimulus-loading.js
-- lib/proscenium/ui/test.js
-- lib/proscenium/ui/ujs/class.js
-- lib/proscenium/ui/ujs/data_confirm.js
-- lib/proscenium/ui/ujs/data_disable_with.js
-- lib/proscenium/ui/ujs/index.js
 - lib/proscenium/utils.rb
 - lib/proscenium/version.rb
 - lib/proscenium/view_component.rb
@@ -237,6 +141,7 @@ 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
@@ -244,14 +149,15 @@ 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.6.5
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: The engine powering your Rails frontend
 test_files: []

data/lib/proscenium/registry/bundled_package.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubygems/package'
-
-class Proscenium::Registry
-  class BundledPackage < Package
-    def version = @version ||= spec.version.to_s
-
-    private
-
-    def package_json
-      @package_json ||= begin
-        unless (gem_path = Proscenium::BundledGems.pathname_for(gem_name))
-          raise PackageNotInstalledError, name
-        end
-
-        if (package_path = gem_path.join('package.json')).exist?
-          JSON.parse(package_path.read)
-        else
-          default_package_json
-        end
-      end
-    end
-
-    def spec
-      @spec ||= Bundler.load.specs[gem_name].first
-    end
-  end
-end

data/lib/proscenium/registry/package.rb

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-class Proscenium::Registry
-  # 1. Fetch the gem metadata from RubyGems API.
-  # 2. Extract any package.json from the gem, and populate the response with it.
-  # 3. Create a tarball containing the fetched package.json. This will be downloaded by the npm
-  #    client, and unpacked into node_modules. Proscenium ignores this, as it will pull contents
-  #    directly from location of the installed gem.
-  # 4. Return a valid npm response listing package details, tarball location, and its dependencies.
-  #
-  # See https://wiki.commonjs.org/wiki/Packages/Registry
-  class Package
-    extend Literal::Properties
-
-    prop :name, String, :positional, reader: :private
-    prop :version, _String?
-    prop :host, String
-
-    def as_json
-      {
-        name:,
-        'dist-tags': {
-          latest: version
-        },
-        versions: {
-          version => {
-            name:,
-            version:,
-            dependencies: package_json['dependencies'] || {},
-            dist: {
-              tarball:,
-              integrity:,
-              shasum:
-            }
-          }
-        }
-      }
-    end
-
-    def validate!
-      return self if name.start_with?('@rubygems/')
-
-      raise PackageUnsupportedError, name
-    end
-
-    def gem_name = @gem_name ||= name.gsub('@rubygems/', '')
-    def version = @version # rubocop:disable Style/TrivialAccessors
-    def shasum = Digest::SHA1.file(tarball_path).hexdigest
-    def integrity = "sha512-#{Digest::SHA512.file(tarball_path).base64digest}"
-
-    private
-
-    def tarball
-      create_tarball unless tarball_path.exist?
-
-      "#{@host}/#{tarball_path.relative_path_from(Rails.public_path)}"
-    end
-
-    def tarball_name
-      @tarball_name ||= "#{gem_name}-#{version}"
-    end
-
-    def tarball_path
-      @tarball_path ||= Rails.public_path.join('proscenium_registry_tarballs')
-                             .join("@rubygems/#{gem_name}/#{tarball_name}.tgz")
-    end
-
-    def create_tarball
-      FileUtils.mkdir_p(File.dirname(tarball_path))
-
-      File.open(tarball_path, 'wb') do |file|
-        Zlib::GzipWriter.wrap(file) do |gz|
-          Gem::Package::TarWriter.new(gz) do |tar|
-            contents = package_json.to_json
-            tar.add_file_simple('package/package.json', 0o444, contents.length) do |io|
-              io.write contents
-            end
-          end
-        end
-      end
-    end
-
-    def package_json
-      @package_json ||= default_package_json
-    end
-
-    def default_package_json
-      {
-        name:,
-        version:,
-        dependencies: {}
-      }
-    end
-  end
-end

data/lib/proscenium/registry/ruby_gem_package.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-class Proscenium::Registry
-  class RubyGemPackage < Package
-    def version = spec['version']
-
-    private
-
-    def package_json
-      @package_json ||= begin
-        package_path = Proscenium::RubyGems.path_for(gem_name, version).join('package.json')
-        if package_path.exist?
-          JSON.parse path.read
-        else
-          default_package_json
-        end
-      end
-    end
-
-    def spec
-      @spec ||= if @version.present?
-                  Gems::V2.info gem_name, @version
-                else
-                  Gems.info(gem_name)
-                end
-    end
-  end
-end

data/lib/proscenium/registry.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-class Proscenium::Registry
-  extend ActiveSupport::Autoload
-
-  autoload :Package
-  autoload :BundledPackage
-  autoload :RubyGemPackage
-
-  class PackageUnsupportedError < StandardError
-    def initialize(name)
-      super("Package `#{name}` is not valid; only Ruby gems are supported via the @rubygems scope.")
-    end
-  end
-
-  class PackageNotInstalledError < StandardError
-    def initialize(name)
-      super("Package `#{name}` is not found in your bundle; have you installed the Ruby gem?")
-    end
-  end
-
-  def self.bundled_package(name, host:)
-    BundledPackage.new(name, host:).validate!
-  end
-
-  def self.ruby_gem_package(name, version, host:)
-    RubyGemPackage.new(name, version:, host:).validate!
-  end
-end