proscenium 0.19.0 → 0.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f45989b5341c8a6c55afab7523537b4da02255783ab866295130ca3a7a3d0be
-  data.tar.gz: 2ba1a421a01a6f6ffe0fa7ce3a196109ea8c44bd13887a4be10daa9e40b29cd3
+  metadata.gz: 785c02513e86678da08ae90a634fb2f8e3ffc2f043da72f2d45ba1a478c31064
+  data.tar.gz: fe3bdf9e103a93c72f499635110cfa338df7b52e0cd0ab85a4ebeff8a064079c
 SHA512:
-  metadata.gz: 6326bd9092d6dbccb09bcc8cfcf9e1157c59b27def4471777bdb509e438328a0faefa9d0d36d7ebc46528fb990a8a9c17f2b07d339144fdfb8e4e37d0a5dc9e2
-  data.tar.gz: ddf91b7602221a4ab45490971a62ff279f1cc14963f185193496c8c75bb61fed67fef00ba489ac9ab6f3d8f880ec82367530870cd3f0c2b6ad21186b348079bd
+  metadata.gz: 8f824861e63e105b6a6f0238ba7a80065b8318ab29c7ac66416597ba1273698d0c5ff9c972b7066e6477576c643099765fbb056b8bdcc4525bd30797be7e6035
+  data.tar.gz: 0db138b90a58c3ac211da7f15f412c080ce38a35c27c5adb1cd890def49dc4dd87c8a0c4c6222599573abbf47158b54937598c19fb5da05edb62852a452178e7

data/README.md

@@ -415,13 +415,17 @@ if (typeof proscenium.env?.UNKNOWN !== "undefined") {
 
 ## i18n
 
-Basic support is provided for importing your Rails locale files from `config/locales/*.yml`, exporting them as JSON.
+Support is provided for importing your Rails locale files from `config/locales/*.yml`, exporting them as JSON.
 
 ```js
 import translations from "proscenium/i18n";
 // translations.en.*
 ```
 
+If you have multiple locale files, they will be merged together. into one json object.
+
+Note that because it is assumed that you will be consuming these translations in the browser, all keys are converted to camelCase, as per the JavaScript conventions.
+
 ## Javascript
 
 By default, Proscenium's output will take advantage of all modern JS features from the ES2022 spec and earlier. For example, `a !== void 0 && a !== null ? a : b` will become `a ?? b` when minifying (enabled by default in production), which makes use of syntax from the ES2020 version of JavaScript. Any syntax feature that is not supported by ES2020 will be transformed into older JavaScript syntax that is more widely supported.

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)
@@ -80,14 +81,15 @@ module Proscenium
         CodeSplitting: Proscenium.config.code_splitting,
         RubyGems: Proscenium::BundledGems.paths,
         Bundle: Proscenium.config.bundle,
-        QueryString: cache_query_string,
+        Aliases: Proscenium.config.aliases,
+        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]
 
@@ -114,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/importer.rb

@@ -98,7 +98,7 @@ module Proscenium
         end
 
         # Ensures extensions with more than one dot are handled correctly.
-        filepath = filepath.sub_ext('')
+        filepath = filepath.sub_ext('').sub_ext('')
 
         sideloaded = []
 

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.rb

@@ -13,10 +13,6 @@ module Proscenium
 
     def initialize(app)
       @app = app
-
-      chunks_path = Rails.public_path.join('assets').to_s
-      headers = Rails.application.config.public_file_server.headers || {}
-      @chunk_handler = ::ActionDispatch::FileHandler.new(chunks_path, headers:)
     end
 
     def call(env)
@@ -24,23 +20,19 @@ module Proscenium
 
       return @app.call(env) if !request.get? && !request.head?
 
+      # 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/})
-        response = Rack::Response[*@chunk_handler.attempt(request.env)]
-        response.etag = request.path.match(/-\$([a-z0-9]+)\$/i)[1]
-
-        if Proscenium.config.cache_query_string && Proscenium.config.cache_max_age
-          response.cache! Proscenium.config.cache_max_age
-        end
-
-        if request.fresh?(response)
-          response.status = 304
-          response.body = []
-        end
-
-        return response.finish
+        ::ActionDispatch::FileHandler.new(
+          Rails.public_path.join('assets').to_s,
+          headers: {
+            'Cache-Control' => "public, max-age=#{100.years}, immutable",
+            'etag' => request.path.match(/-\$([a-z0-9]+)\$/i)[1]
+          }
+        ).attempt(env) || @app.call(env)
+      else
+        attempt(request) || @app.call(env)
       end
-
-      attempt(request) || @app.call(env)
     end
 
     private

data/lib/proscenium/monkey.rb

@@ -9,11 +9,11 @@ module Proscenium
         result = super
         return result if !view.controller || !Proscenium.config.side_load
 
-        to_sideload = if template.respond_to?(:virtual_path) &&
+        to_sideload = if template.respond_to?(:identifier) &&
                          template.respond_to?(:type) && template.type == :html
                         template
                       end
-        if to_sideload
+        if to_sideload && view.controller.respond_to?(:sideload_assets_options)
           options = view.controller.sideload_assets_options
           layout = find_layout(layout_name, locals.keys, [formats.first])
           sideload_template_assets layout, view.controller, options if layout
@@ -24,6 +24,8 @@ module Proscenium
       end
 
       def sideload_template_assets(tpl, controller, options)
+        return unless (tpl_path = Pathname.new(tpl.identifier)).file?
+
         options = {} if options.nil?
         options = { js: options, css: options } unless options.is_a?(Hash)
 
@@ -40,7 +42,7 @@ module Proscenium
           options[k] = controller.instance_eval(&options[k]) if options[k].is_a?(Proc)
         end
 
-        Importer.sideload Rails.root.join("app/views/#{tpl.virtual_path}"), **options
+        Importer.sideload tpl_path, **options
       end
     end
 
@@ -52,8 +54,9 @@ module Proscenium
 
         return result if !view.controller || !Proscenium.config.side_load
 
-        if template.respond_to?(:virtual_path) &&
-           template.respond_to?(:type) && template.type == :html
+        if template.respond_to?(:identifier) &&
+           template.respond_to?(:type) && template.type == :html &&
+           view.controller.respond_to?(:sideload_assets_options)
           options = view.controller.sideload_assets_options
           sideload_template_assets layout, options if layout
           sideload_template_assets template, options
@@ -63,6 +66,8 @@ module Proscenium
       end
 
       def sideload_template_assets(tpl, options)
+        return unless (tpl_path = Pathname.new(tpl.identifier)).file?
+
         options = {} if options.nil?
         options = { js: options, css: options } unless options.is_a?(Hash)
 
@@ -79,7 +84,7 @@ module Proscenium
           options[k] = controller.instance_eval(&options[k]) if options[k].is_a?(Proc)
         end
 
-        Importer.sideload Rails.root.join("app/views/#{tpl.virtual_path}"), **options
+        Importer.sideload tpl_path, **options
       end
     end
   end

data/lib/proscenium/railtie.rb

@@ -18,6 +18,8 @@ module Proscenium
     config.proscenium.cache_query_string = Rails.env.production? && ENV.fetch('REVISION', nil)
     config.proscenium.cache_max_age = 2_592_000 # 30 days
 
+    config.proscenium.aliases = {}
+
     # List of environment variable names that should be passed to the builder, which will then be
     # passed to esbuild's `Define` option. Being explicit about which environment variables are
     # defined means a faster build, as esbuild will have less to do.

data/lib/proscenium/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.21.4
 platform: ruby
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-08 00:00:00.000000000 Z
+date: 2025-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi