proscenium 0.22.0.beta2 → 0.22.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 707375c9a539b28a3aaf9e1001dc1a2a5071ba6c9af629fa8fe817cb7b0aa75b
-  data.tar.gz: 48fce338315f5469c94659b211d38d498483da84ce670730a1ff5fe0eba0f983
+  metadata.gz: 9d0c8dd7c274032064d5c0b93eb8453f25b7cbdac3ad8bec9564b9c861d93310
+  data.tar.gz: bbc9259f705192b00a5882a9e0870555f34c10873668c408cbb60e02346d762e
 SHA512:
-  metadata.gz: 54107e9670be466a97e09a520299ce25df4c390b848b1dc9bada33da3178596f37fc8701ae725007bb33422e838a00b168dfe2e16365b4096a66c78f59fe9579
-  data.tar.gz: 119edaf379fa4b556427cb0456dc9391152d0435af16f0d4865dd0ce6954369268d38c63d97fefcb68addbd95b9fc1075b8118320b6052258e96c98f477e8d5a
+  metadata.gz: 5439a6f64fd7dbb342e4d0aab91032250e7431391519a791abfda0b7e3270b06f7875b8f0d4521e575da6982c2889ce93407887e5325af440574db7652064fbf
+  data.tar.gz: f018dec7e935e9347267a62e43a0c7ae33da6194f9b416a6954ec6f17f28938df28d07d7f7ff59709950d9dc4b668e3c2d4dd80de281e4415bb7068070369aaf

data/README.md

@@ -18,7 +18,6 @@
 - Deep integration with Rails.
 - Automatically side-load JS and CSS for your layouts, views, and partials.
 - Import from NPM, URL's, and locally.
-- Server-side import map support.
 - CSS Modules & mixins.
 - Source maps.
 
@@ -30,7 +29,6 @@
 - [Side Loading](#side-loading)
 - [Importing](#importing-assets)
   - [Local Imports](#local-imports)
-- [Import Maps](#import-maps)
 - [Source Maps](#source-maps)
 - [SVG](#svg)
 - [Environment Variables](#environment-variables)
@@ -48,9 +46,10 @@
   - [Typescript Caveats](#typescript-caveats)
 - [JSX](#jsx)
 - [JSON](#json)
-- [Cache Busting](#cache-busting)
 - [rjs is back!](#rjs-is-back)
 - [Resolution](#resolution)
+- [Aliases](#aliases)
+- [Pre-compilation](#precompilation)
 - [Thanks](#thanks)
 - [Development](#development)
 
@@ -258,13 +257,11 @@ Sometimes you don't want to bundle an import. For example, you want to ensure th
 import React from "react" with { unbundle: 'true' };
 ```
 
-You can also unbundle entries in your [import map](#import-maps) using an `unbundle:` prefix, which ensures that all imports of a particular path are always unbundled:
+You can also unbundle entries in [`aliases`](#aliases) using an `unbundle:` prefix, which ensures that all imports of a particular path are always unbundled:
 
-```json
-{
-  "imports": {
-    "react": "unbundle:react"
-  }
+```ruby
+config.proscenium.aliases = {
+  "react": "unbundle:react"
 }
 ```
 
@@ -282,55 +279,6 @@ config.proscenium.bundle = false
 
 This will mean every asset and import will be loaded independently.
 
-## Import Maps
-
-> **[WIP]**
-
-[Import maps](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script/type/importmap) for both JS and CSS is supported out of the box, and works with no regard to the browser being used. This is because the import map is parsed and resolved by Proscenium on the server, instead of by the browser. This is faster, and also allows you to use import maps in browsers that do not support them yet.
-
-If you are not familiar with import maps, think of them as a way to define aliases.
-
-Just create `config/import_map.json` and specify the imports you want to use. For example:
-
-```json
-{
-  "imports": {
-    "react": "https://esm.sh/react@18.2.0",
-    "start": "/lib/start.js",
-    "common": "/lib/common.css",
-    "@radix-ui/colors/": "https://esm.sh/@radix-ui/colors@0.1.8/"
-  }
-}
-```
-
-Using the above import map, we can do...
-
-```js
-import { useCallback } from "react";
-import startHere from "start";
-import styles from "common";
-```
-
-and for CSS...
-
-```css
-@import "common";
-@import "@radix-ui/colors/blue.css";
-```
-
-You can also write your import map in JavaScript instead of JSON. So instead of `config/import_map.json`, create `config/import_map.js`, and define an anonymous function. This function accepts a single `environment` argument.
-
-```js
-(env) => ({
-  imports: {
-    react:
-      env === "development"
-        ? "https://esm.sh/react@18.2.0?dev"
-        : "https://esm.sh/react@18.2.0",
-  },
-});
-```
-
 ## Source Maps
 
 Source maps can make it easier to debug your code. They encode the information necessary to translate from a line/column offset in a generated output file back to a line/column offset in the corresponding original input file. This is useful if your generated code is sufficiently different from your original code (e.g. your original code is TypeScript or you enabled minification). This is also useful if you prefer looking at individual files in your browser's developer tools instead of one big bundled file.
@@ -692,39 +640,59 @@ import { version } from "./package.json";
 console.log(version);
 ```
 
-## Cache Busting
+## rjs is back
 
-By default, all assets are not cached by the browser. But if in production, you populate the `REVISION` env variable, all CSS and JS URL's will be appended with its value as a query string, and the `Cache-Control` response header will be set to `public` and a max-age of 30 days.
+Proscenium brings back RJS! Any path ending in .rjs will be served from your Rails app. This allows you to import server rendered javascript.
 
-For example, if you set `REVISION=v1`, URL's will be appended with `?v1`: `/my/imported/file.js?v1`.
+## Resolution
 
-It is assumed that the `REVISION` env var will be unique between deploys. If it isn't, then assets will continue to be cached as the same version between deploys. I recommend you assign a version number or to use the Git commit hash of the deploy. Just make sure it is unique for each deploy.
+Proscenium will serve files ending with any of these extension: `js,mjs,ts,css,jsx,tsx` from the following directories, and their sub-directories of your Rails application's root: `/app`, `/lib`, `/config`, `/node_modules`, `/vendor`.
 
-You can set the `cache_query_string` config option directly to define any query string you wish:
+So a file at `/app/views/users/index.js` will be served from `https://localhost:3000/app/views/users/index.js`.
 
-```ruby
-Rails.application.config.proscenium.cache_query_string = 'my-cache-busting-version-string'
-```
+You can continue to access any file in the `/public` directory as you normally would. Proscenium will not process files in the `/public` directory.
+
+If requesting a file that exists in a root directory and the public directory, the file in the public directory will be served. For example, if you have a file at `/lib/foo.js` and `/public/lib/foo.js`, and you request `/lib/foo.js`, the file in the public directory (`/public/lib/foo.js`) will be served.
+
+## Aliases
 
-The cache is set with a `max-age` of 30 days. You can customise this with the `cache_max_age` config option:
+You can define import aliases via the `config.proscenium.aliases` config option. This allows you to create shorter or more meaningful import paths.
 
 ```ruby
-Rails.application.config.proscenium.cache_max_age = 12.months.to_i
+config.proscenium.aliases = {
+  "utils": "/lib/utils.js",
+  "components": "/app/components"
+}
 ```
 
-## rjs is back
+You can then import using the alias:
 
-Proscenium brings back RJS! Any path ending in .rjs will be served from your Rails app. This allows you to import server rendered javascript.
+```js
+import utils from "utils";
+import Header from "components/header";
+```
 
-## Resolution
+## Pre-compilation
 
-Proscenium will serve files ending with any of these extension: `js,mjs,ts,css,jsx,tsx` from the following directories, and their sub-directories of your Rails application's root: `/app`, `/lib`, `/config`, `/node_modules`, `/vendor`.
+Proscenium is designed to bundle and minify your frontend code in real time, on demand, with no build step or pre-compilation needed. However, if you want to pre-compile your assets for production deployment, you can do so using the `assets:precompile` Rake task.
 
-So a file at `/app/views/users/index.js` will be served from `https://localhost:3000/app/views/users/index.js`.
+```bash
+rails assets:precompile
+```
 
-You can continue to access any file in the `/public` directory as you normally would. Proscenium will not process files in the `/public` directory.
+Be sure to specify a `Set` of paths which you want to pre-compile via the `config.proscenium.precompile` configuration option. Each path should be a glob pattern that matches the files which are your entry points. Don't include paths that are not entry points. For example:
 
-If requesting a file that exists in a root directory and the public directory, the file in the public directory will be served. For example, if you have a file at `/lib/foo.js` and `/public/lib/foo.js`, and you request `/lib/foo.js`, the file in the public directory (`/public/lib/foo.js`) will be served.
+```ruby
+Rails.configuration.proscenium.precompile = Set[
+  "./app/components/**/*.js",
+  "./app/components/**/*.jsx",
+  "./app/views/**/*.js",
+  "./app/views/**/*.css",
+  "./app/views/**/*.module.css"
+]
+```
+
+This will bundle, code split, tree shake, and compile all your JS, TS, JSX, TSX and CSS files and place them in the `public/assets` directory, ready to be served in production.
 
 ## Thanks
 

data/lib/proscenium/builder.rb

@@ -26,7 +26,6 @@ module Proscenium
 
       attach_function :build_to_string, [
         :string, # Path or entry point.
-        :string, # cache_query_string.
         :pointer # Config as JSON.
       ], Result.by_value
 
@@ -68,8 +67,8 @@ module Proscenium
       end
     end
 
-    def self.build_to_string(path, cache_query_string: '', root: nil)
-      new(root:).build_to_string(path, cache_query_string:)
+    def self.build_to_string(path, root: nil)
+      new(root:).build_to_string(path)
     end
 
     def self.resolve(path, root: nil)
@@ -96,15 +95,15 @@ module Proscenium
         RubyGems: Proscenium::BundledGems.paths,
         Bundle: Proscenium.config.bundle,
         Aliases: Proscenium.config.aliases,
+        External: Proscenium.config.external,
         Precompile: Proscenium.config.precompile,
-        QueryString: Proscenium.config.cache_query_string.presence || '',
         Debug: Proscenium.config.debug
       }.to_json)
     end
 
-    def build_to_string(path, cache_query_string: '')
+    def build_to_string(path)
       ActiveSupport::Notifications.instrument('build.proscenium', identifier: path) do
-        result = Request.build_to_string(path, cache_query_string, @request_config)
+        result = Request.build_to_string(path, @request_config)
 
         raise BuildError.new(path, result[:response]) unless result[:success]
 

data/lib/proscenium/ext/proscenium.h

@@ -92,10 +92,9 @@ extern void reset_config();
 // Build the given `path` using the `config`.
 //
 // - path - The path to build relative to `root`.
-// - cache_query_string - The current query string used for cache busting, taken from the URL.
 // - config
 //
-extern struct Result build_to_string(char* filePath, char* cacheQueryString, char* configJson);
+extern struct Result build_to_string(char* filePath, char* configJson);
 
 // Resolve the given `path` relative to the `root`.
 //

data/lib/proscenium/middleware/base.rb

@@ -28,17 +28,6 @@ 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
@@ -85,10 +74,6 @@ module Proscenium
         response.content_type = content_type
         response.etag = result[:content_hash]
 
-        if !cache_query_string.blank? && Proscenium.config.cache_max_age
-          response.cache! Proscenium.config.cache_max_age
-        end
-
         if @request.fresh?(response)
           response.status = 304
           response.body = []

data/lib/proscenium/middleware/chunks.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Proscenium
+  class Middleware
+    class Chunks
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        request = ActionDispatch::Request.new(env)
+
+        return @app.call(env) unless request.path.match?(CHUNKS_PATH)
+
+        ActionDispatch::FileHandler.new(
+          Proscenium.config.output_path.to_s,
+          headers: {
+            'X-Proscenium-Middleware' => 'chunks',
+            'Cache-Control' => "public, max-age=#{100.years}, immutable",
+            'ETag' => request.path.match(/-\$([a-z0-9]+)\$/i)[1]
+          }
+        ).attempt(request.env) || @app.call(env)
+      end
+    end
+  end
+end

data/lib/proscenium/middleware/esbuild.rb

@@ -4,7 +4,7 @@ module Proscenium
   class Middleware
     class Esbuild < Base
       def attempt
-        render_response Builder.build_to_string(path_to_build, cache_query_string:)
+        render_response Builder.build_to_string(path_to_build)
       end
     end
   end

data/lib/proscenium/middleware/vendor.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Proscenium
+  class Middleware
+    class Vendor
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        request = ActionDispatch::Request.new(env)
+        pathname = Pathname.new(request.path)
+
+        return @app.call(env) unless pathname.fnmatch?(VENDOR_PATH_GLOB, File::FNM_EXTGLOB)
+
+        request.path_info = request.path.delete_prefix('/vendor')
+
+        ActionDispatch::FileHandler.new(
+          Rails.root.join('vendor').to_s,
+          headers: {
+            'X-Proscenium-Middleware' => 'vendor',
+            'Cache-Control' => "public, max-age=#{100.years}, immutable"
+          }
+        ).attempt(request.env) || @app.call(env)
+      end
+    end
+  end
+end

data/lib/proscenium/middleware.rb

@@ -9,6 +9,8 @@ module Proscenium
     autoload :Base
     autoload :Esbuild
     autoload :RubyGems
+    autoload :Vendor
+    autoload :Chunks
     autoload :SilenceRequest
 
     def initialize(app)
@@ -20,19 +22,7 @@ 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?(CHUNKS_PATH)
-        ::ActionDispatch::FileHandler.new(
-          Proscenium.config.output_path.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
@@ -40,7 +30,7 @@ module Proscenium
     def attempt(request)
       return unless (type = find_type(request))
 
-      type.attempt request
+      type.attempt(request)
     end
 
     def find_type(request)

data/lib/proscenium/railtie.rb

@@ -15,9 +15,8 @@ module Proscenium
     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
     config.proscenium.aliases = {}
+    config.proscenium.external = Set['*.rjs', '*.gif', '*.jpg', '*.png', '*.woff2', '*.woff']
     config.proscenium.precompile = Set.new
     config.proscenium.output_dir = '/assets'
 
@@ -56,7 +55,18 @@ module Proscenium
       unless config.proscenium.logging
         app.middleware.insert_before Rails::Rack::Logger, Proscenium::Middleware::SilenceRequest
       end
-      app.middleware.insert_before ActionDispatch::Callbacks, Proscenium::Middleware
+
+      app.middleware.insert_after Rack::Sendfile, Proscenium::Middleware::Vendor
+      app.middleware.insert_after Rack::Sendfile, Proscenium::Middleware::Chunks
+
+      # Ensure the middleware is inserted as early as possible.
+      if app.config.consider_all_requests_local
+        app.middleware.insert_before ActionDispatch::ActionableExceptions, Proscenium::Middleware
+      elsif app.config.reloading_enabled?
+        app.middleware.insert_before ActionDispatch::Reloader, Proscenium::Middleware
+      else
+        app.middleware.insert_before ActionDispatch::Callbacks, Proscenium::Middleware
+      end
     end
 
     initializer 'proscenium.sideloading' do

data/lib/proscenium/side_load.rb

@@ -40,9 +40,6 @@ module Proscenium
           opts[:preload_links_header] = false if fragments
           opts[:data] ||= {}
 
-          if Proscenium.config.cache_query_string.present?
-            path += "?#{Proscenium.config.cache_query_string}"
-          end
           out << helpers.stylesheet_link_tag(path.delete_prefix('/'), extname: false, **opts)
         end
 
@@ -71,9 +68,6 @@ module Proscenium
           opts = opts[:js].is_a?(Hash) ? opts[:js] : {}
           opts[:preload_links_header] = false if fragments
 
-          if Proscenium.config.cache_query_string.present?
-            path += "?#{Proscenium.config.cache_query_string}"
-          end
           out << helpers.javascript_include_tag(path.delete_prefix('/'), extname: false, **opts)
         end
 

data/lib/proscenium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Proscenium
-  VERSION = '0.22.0.beta2'
+  VERSION = '0.22.0.beta4'
 end

data/lib/proscenium.rb

@@ -14,7 +14,8 @@ module Proscenium
 
   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'
+  ALLOWED_DIRECTORIES = 'app,lib,config,node_modules'
+  VENDOR_PATH_GLOB = '/vendor/**.{js,css}'
   APP_PATH_GLOB = "/{#{ALLOWED_DIRECTORIES}}/**.{#{FILE_EXTENSIONS.join(',')}}".freeze
   GEMS_PATH_GLOB = "/node_modules/@rubygems/**.{#{FILE_EXTENSIONS.join(',')}}".freeze
   CHUNKS_PATH = %r{^/_asset_chunks/}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.22.0.beta2
+  version: 0.22.0.beta4
 platform: ruby
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-31 00:00:00.000000000 Z
+date: 2025-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -69,9 +69,11 @@ files:
 - lib/proscenium/manifest.rb
 - lib/proscenium/middleware.rb
 - lib/proscenium/middleware/base.rb
+- lib/proscenium/middleware/chunks.rb
 - lib/proscenium/middleware/esbuild.rb
 - lib/proscenium/middleware/ruby_gems.rb
 - lib/proscenium/middleware/silence_request.rb
+- lib/proscenium/middleware/vendor.rb
 - lib/proscenium/monkey.rb
 - lib/proscenium/railtie.rb
 - lib/proscenium/railties/assets.rake