proscenium 0.21.3-x86_64-linux → 0.21.5-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c765ad9cd96c81a385c11df57df405f9d9307af3ccc87c3d4b12318debc68f2
-  data.tar.gz: 9cfa3cf3f7a819a70fe3edab3a8b87642286c5bb6b3567900eba72ec06922f2a
+  metadata.gz: 25f6246c18b9d369a2204c9a41f7b495bb9b109e5bfed0ad47410f11c21e6201
+  data.tar.gz: 55f1fb615d66307431644cb3fe91aabf299ac23554e88845a15b2d40a1104cfb
 SHA512:
-  metadata.gz: 9dda2a95d888312d0adb679d6df2f60dd9a64312caef2e0da369e13ad127f857fc47dba8db58c2e9e0ea1b4648acfdf19770069fdecdff13f42c8269125de64b
-  data.tar.gz: 14d1e34bbecaea2eec819c0b01d0a26ea352443ec1e79f6ffa1225b02b673c8d78f88605aac012387aaf88b74611ba874d03f9a02abf98c40ea51c0f52863a80
+  metadata.gz: 5eabc36f8d7ed51c862ec572472eb1af249fc46d16cfea1c7b0412540836c357174e64c7fb6cda9af836c697b0437dcc5c0be5cd0bf6b76cf6b2c013f30c538f
+  data.tar.gz: 90fc06d003d7e14570ac3c3172160b9d5cc18207af1077a0d134e3000011f4661193785813b5d93637b2db76a4fdaa8d3725d994c064f63f96faad99ff4f4f9d

data/lib/proscenium/builder.rb

@@ -23,6 +23,7 @@ module Proscenium
 
       attach_function :build_to_string, [
         :string, # Path or entry point.
+        :string, # cache_query_string.
         :pointer # Config as JSON.
       ], Result.by_value
 
@@ -58,8 +59,8 @@ module Proscenium
       end
     end
 
-    def self.build_to_string(path, root: nil)
-      new(root:).build_to_string(path)
+    def self.build_to_string(path, cache_query_string: '', root: nil)
+      new(root:).build_to_string(path, cache_query_string:)
     end
 
     def self.resolve(path, root: nil)
@@ -81,14 +82,14 @@ module Proscenium
         RubyGems: Proscenium::BundledGems.paths,
         Bundle: Proscenium.config.bundle,
         Aliases: Proscenium.config.aliases,
-        QueryString: cache_query_string,
+        QueryString: Proscenium.config.cache_query_string.presence || '',
         Debug: Proscenium.config.debug
       }.to_json)
     end
 
-    def build_to_string(path)
+    def build_to_string(path, cache_query_string: '')
       ActiveSupport::Notifications.instrument('build.proscenium', identifier: path) do
-        result = Request.build_to_string(path, @request_config)
+        result = Request.build_to_string(path, cache_query_string, @request_config)
 
         raise BuildError, result[:response] unless result[:success]
 
@@ -115,10 +116,6 @@ module Proscenium
       ENV.slice(*Proscenium.config.env_vars + Proscenium::DEFAULT_ENV_VARS)
     end
 
-    def cache_query_string
-      Proscenium.config.cache_query_string.presence || ''
-    end
-
     def gem_root
       Pathname.new(__dir__).join('..', '..').to_s
     end

data/lib/proscenium/ext/proscenium.h

@@ -90,7 +90,7 @@ extern void reset_config();
 // - path - The path to build relative to `root`.
 // - config
 //
-extern struct Result build_to_string(char* filePath, char* configJson);
+extern struct Result build_to_string(char* filePath, char* cacheQueryString, char* configJson);
 
 // Resolve the given `path` relative to the `root`.
 //

data/lib/proscenium/log_subscriber.rb

@@ -20,7 +20,7 @@ module Proscenium
       path = CGI.unescape(path) if path.start_with?(/https?%3A%2F%2F/)
 
       info do
-        message = "#{color('[Proscenium]', nil, bold: true)} Building /#{path}"
+        message = "  #{color('[Proscenium]', nil, bold: true)} Building /#{path}"
         message << " (Duration: #{event.duration.round(1)}ms | Allocations: #{event.allocations})"
       end
     end

data/lib/proscenium/middleware/base.rb

@@ -40,6 +40,17 @@ module Proscenium
         @path_to_build ||= @request.path[1..]
       end
 
+      def cache_query_string
+        @cache_query_string ||= begin
+          params = @request.query_parameters
+          if params.one? && params.first[0] != '' && params.first[1].nil?
+            params.keys.first
+          else
+            Proscenium.config.cache_query_string
+          end
+        end.presence || ''
+      end
+
       def sourcemap?
         @request.path.ends_with?('.map')
       end
@@ -86,7 +97,7 @@ module Proscenium
         response.content_type = content_type
         response.etag = result[:content_hash]
 
-        if Proscenium.config.cache_query_string && Proscenium.config.cache_max_age
+        if !cache_query_string.blank? && Proscenium.config.cache_max_age
           response.cache! Proscenium.config.cache_max_age
         end
 

data/lib/proscenium/middleware/esbuild.rb

@@ -20,7 +20,7 @@ module Proscenium
       end
 
       def attempt
-        render_response Builder.build_to_string(path_to_build)
+        render_response Builder.build_to_string(path_to_build, cache_query_string:)
       rescue Builder::CompileError => e
         raise self.class::CompileError, { file: @request.fullpath, detail: e.message }, caller
       end

data/lib/proscenium/middleware/silence_request.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'active_support/logger_silence'
+
+module Proscenium
+  class Middleware::SilenceRequest
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      request = ActionDispatch::Request.new(env)
+
+      if (request.get? || request.head?) && proscenium_request?(request)
+        Rails.logger.silence { @app.call(env) }
+      else
+        @app.call(env)
+      end
+    end
+
+    private
+
+    def proscenium_request?(request)
+      return true if request.path.match?(CHUNKS_PATH)
+
+      pathname = Pathname.new(request.path)
+      pathname.fnmatch?(GEMS_PATH_GLOB, File::FNM_EXTGLOB) ||
+        pathname.fnmatch?(APP_PATH_GLOB, File::FNM_EXTGLOB)
+    end
+  end
+end

data/lib/proscenium/middleware.rb

@@ -4,12 +4,12 @@ module Proscenium
   class Middleware
     extend ActiveSupport::Autoload
 
-    # Error when the build command fails.
     class BuildError < StandardError; end
 
     autoload :Base
     autoload :Esbuild
     autoload :RubyGems
+    autoload :SilenceRequest
 
     def initialize(app)
       @app = app
@@ -22,7 +22,7 @@ module Proscenium
 
       # If this is a request for an asset chunk, we want to serve it with a very long
       # cache lifetime, since these are content-hashed and will never change.
-      if request.path.match?(%r{^/_asset_chunks/})
+      if request.path.match?(CHUNKS_PATH)
         ::ActionDispatch::FileHandler.new(
           Rails.public_path.join('assets').to_s,
           headers: {
@@ -46,23 +46,11 @@ module Proscenium
     def find_type(request)
       pathname = Pathname.new(request.path)
 
-      if pathname.fnmatch?(gems_path_glob, File::FNM_EXTGLOB)
+      if pathname.fnmatch?(GEMS_PATH_GLOB, File::FNM_EXTGLOB)
         RubyGems
-      elsif pathname.fnmatch?(app_path_glob, File::FNM_EXTGLOB)
+      elsif pathname.fnmatch?(APP_PATH_GLOB, File::FNM_EXTGLOB)
         Esbuild
       end
     end
-
-    def app_path_glob
-      "/{#{Proscenium::ALLOWED_DIRECTORIES}}/**.{#{file_extensions}}"
-    end
-
-    def gems_path_glob
-      "/node_modules/@rubygems/**.{#{file_extensions}}"
-    end
-
-    def file_extensions
-      @file_extensions ||= FILE_EXTENSIONS.join(',')
-    end
   end
 end

data/lib/proscenium/railtie.rb

@@ -46,7 +46,10 @@ module Proscenium
     end
 
     initializer 'proscenium.middleware' do |app|
-      app.middleware.insert_after ActionDispatch::Static, Proscenium::Middleware
+      unless config.proscenium.logging
+        app.middleware.insert_before Rails::Rack::Logger, Proscenium::Middleware::SilenceRequest
+      end
+      app.middleware.insert_before ActionDispatch::ActionableExceptions, Proscenium::Middleware
     end
 
     initializer 'proscenium.sideloading' do
@@ -62,5 +65,9 @@ module Proscenium
         ActionView::PartialRenderer.prepend Monkey::PartialRenderer
       end
     end
+
+    rake_tasks do
+      load 'proscenium/railties/compile.rake'
+    end
   end
 end

data/lib/proscenium/templates/rescues/build_error.html.erb

@@ -19,8 +19,8 @@
 
 <%= @exception.error['location']['line'].to_s.rjust 5 %> │    <%= @exception.error['location']['line_text'] %>
       │    <%= (@exception.error['location']['length'] > 1 ? "~" * @exception.error['location']['length'] : "^").rjust(@exception.error['location']['column'] + @exception.error['location']['length']) %>
-<%- if @exception.error['location']['suggestion'].present? -%>    + │    <%= @exception.error['location']['suggestion'].rjust(@exception.error['location']['column'] + 1) %>
-<% else %> <%- end -%>
+<%- if @exception.error['location']['suggestion'].present? %>    + │    <%= @exception.error['location']['suggestion'].rjust(@exception.error['location']['column'] + 1) %>
+<% else %> <%- end %>
 </pre>
       </div>
     </div>

data/lib/proscenium/version.rb

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

data/lib/proscenium.rb

@@ -5,9 +5,6 @@ require 'active_support'
 module Proscenium
   extend ActiveSupport::Autoload
 
-  FILE_EXTENSIONS = ['js', 'mjs', 'ts', 'jsx', 'tsx', 'css', 'js.map', 'mjs.map', 'jsx.map',
-                     'ts.map', 'tsx.map', 'css.map'].freeze
-
   # Default paths for Rails assets. Used by the `compute_asset_path` helper to maintain Rails
   # default conventions of where JS and CSS files are located.
   DEFAULT_RAILS_ASSET_PATHS = {
@@ -15,7 +12,12 @@ module Proscenium
     javascript: 'app/javascript/'
   }.freeze
 
+  FILE_EXTENSIONS = ['js', 'mjs', 'ts', 'jsx', 'tsx', 'css', 'js.map', 'mjs.map', 'jsx.map',
+                     'ts.map', 'tsx.map', 'css.map'].freeze
   ALLOWED_DIRECTORIES = 'app,lib,config,vendor,node_modules'
+  APP_PATH_GLOB = "/{#{ALLOWED_DIRECTORIES}}/**.{#{FILE_EXTENSIONS.join(',')}}".freeze
+  GEMS_PATH_GLOB = "/node_modules/@rubygems/**.{#{FILE_EXTENSIONS.join(',')}}".freeze
+  CHUNKS_PATH = %r{^/_asset_chunks/}
 
   # Environment variables that should always be passed to the builder.
   DEFAULT_ENV_VARS = Set['RAILS_ENV', 'NODE_ENV'].freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.21.3
+  version: 0.21.5
 platform: x86_64-linux
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-17 00:00:00.000000000 Z
+date: 2025-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -70,6 +70,7 @@ files:
 - lib/proscenium/middleware/base.rb
 - lib/proscenium/middleware/esbuild.rb
 - lib/proscenium/middleware/ruby_gems.rb
+- lib/proscenium/middleware/silence_request.rb
 - lib/proscenium/monkey.rb
 - lib/proscenium/railtie.rb
 - lib/proscenium/react-manager/index.jsx