proscenium 0.16.0 → 0.19.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea20e1bed70777b024924449c5ea927bf535035c261f9d3381120c3a4346550d
-  data.tar.gz: fcc83bddd40e876b0da2ebd13892216dbf4a430cfcf037ae016530b9d8b7cf20
+  metadata.gz: c0ef99a0b3eea897d899b62e5cd298770db886a8271376eb04c8686a6078fcc9
+  data.tar.gz: 9787122129710ba85c76f6c762804d2e50ff6b7667a7949bc016f044f10cb983
 SHA512:
-  metadata.gz: b654f721f1fcfae87e3c0b6533dfd05a436343b81f7d67d32b12b0f29696d2d78f3da1817516d4fcd1c0263cf344504704ecbccbe1dad01a3dc3f99dcc23682a
-  data.tar.gz: 53b9089d2ee0e2d79867cbe4c09316ac6a724355a0cf87aed4fcd1483273e19b99b0f2a256e2672e2cd1a492a9f310e86f2a779a5048ab81b7b88d43bbc82890
+  metadata.gz: e5a4d81385d795d350681e8150bccccd84fea0aaae377cf6ae060754fd3d1fb05eae207be86fb2390d8d75bac7e5d1351e4c5cbc0f38a4320e7b2616930fbae2
+  data.tar.gz: 58099ab856fa75ddacaee87c185ba228fa49e681525cc0711f0dded22b34535caf49508db53bbe2726b8c147d7e941398dd55079f13a106fd8c24d69ee053e4a

data/README.md

@@ -1,13 +1,20 @@
-# Proscenium - Modern client-side development for Rails
+# Proscenium - Integrated Frontend Development for Rails
 
-Proscenium treats your client-side code as first class citizens of your Rails app, and assumes a "fast by default" internet. It bundles your JavaScript and CSS in real time, on demand, and with zero configuration.
+> 🗣️ prow · see · nee · uhm
+>
+> _noun_: **proscenium**
+>
+> - _the part of a theatre stage in front of the curtain._
+
+**_Proscenium_** treats your frontend and client-side code as first class citizens of your Rails app, and assumes a "fast by default" internet. It bundles and minifies JavaScript (+ JSX), TypeScript (+TSX) and CSS in real time, on demand, and with zero configuration.
 
 **The highlights:**
 
-- Fast real-time bundling, tree-shaking, code-splitting and minification of Javascript (.js,.jsx), Typescript (.ts,.tsx) and CSS (.css).
-- NO JavaScript runtime needed - just the browser!
+- Fast, real-time bundling, tree-shaking, code-splitting and minification of Javascript (.js,.jsx), Typescript (.ts,.tsx) and CSS (.css).
+- NO JavaScript runtime needed (eg. Node) - just the browser!
 - NO build step or pre-compilation.
-- NO additional process or server - Just run Rails!
+- NO additional process or server - Just run `rails s`!
+- Transforms newer JavaScript and CSS syntax to older syntax for older browsers.
 - Deep integration with Rails.
 - Automatically side-load your layouts, views, and partials.
 - Import from NPM, URL's, and locally.
@@ -22,7 +29,6 @@ Proscenium treats your client-side code as first class citizens of your Rails ap
 - [Client-Side Code Anywhere](#client-side-code-anywhere)
 - [Side Loading](#side-loading)
 - [Importing](#importing-assets)
-  - [URL Imports](#url-imports)
   - [Local Imports](#local-imports)
 - [Import Maps](#import-maps)
 - [Source Maps](#source-maps)
@@ -70,7 +76,9 @@ Add this line to your Rails application's Gemfile, and you're good to go:
 gem 'proscenium'
 ```
 
-Please note that Proscenium is designed solely for use with Rails, so will not work - at least out of the box - anywhere else.
+Please note that Proscenium is designed solely for use with Rails.
+
+Now if you start your Rails app, you can open any front end code (JS, CSS, etc.). For example, a file at `app/assets/stylesheets/application.css` can be accessed at `https://localhost:3000/app/assets/stylesheets/application.css`, which will be bundled, transformed, and minified [in production] in real time.
 
 ## Client-Side Code Anywhere
 
@@ -82,23 +90,21 @@ Simply put your JS(X) and CSS anywhere you want, and they will be served by your
 
 Using the examples above...
 
-- `app/views/users/index.js` => `https://yourapp.com/app/views/users/index.js`
-- `app/views/layouts/application.css` => `https://yourapp.com/app/views/layouts/application.css`
-- `lib/utils.js` => `https://yourapp.com/lib/utils.js`
-- `app/components/menu_component.jsx` => `https://yourapp.com/app/components/menu_component.jsx`
-- `config/properties.css` => `https://yourapp.com/config/properties.css`
+- `app/views/users/index.js` => `https://localhost:3000/app/views/users/index.js`
+- `app/views/layouts/application.css` => `https://localhost:3000/app/views/layouts/application.css`
+- `lib/utils.js` => `https://localhost:3000/lib/utils.js`
+- `app/components/menu_component.jsx` => `https://localhost:3000/app/components/menu_component.jsx`
+- `config/properties.css` => `https://localhost:3000/config/properties.css`
 
 ## Side Loading
 
-> Prior to **0.10.0**, only assets with the extension `.js`, `.ts` and `.css` were side loaded. From 0.10.0, all assets are side loaded, including `.jsx`, `.tsx`, and `.module.css`. Also partials were not side loaded prior to 0.10.0.
-
-Proscenium is best experienced when you side load your assets.
+Proscenium is best experienced when your assets are automtically side loaded.
 
 ### The Problem
 
 With Rails you would typically declaratively load your JavaScript and CSS assets using the `javascript_include_tag` and `stylesheet_link_tag` helpers.
 
-For example, you may have top-level "application" CSS located in a file at `/app/assets/application.css`. Likewise, you may have some global JavaScript located in a file at `/app/assets/application.js`.
+For example, you may have top-level "application" CSS located in a file at `/app/assets/stylesheets/application.css`. Likewise, you may have some global JavaScript located in a file at `/app/javascript/application.js`.
 
 You would manually and declaratively include those two files in your application layout, something like this:
 
@@ -177,45 +183,55 @@ Now, in your layout and view, replace the `javascript_include_tag` and `styleshe
 </html>
 ```
 
-On each page request, Proscenium will check if any of your views, layouts and partials have a
-JS/TS/CSS file of the same name, and then include them wherever your placed the `include_assets`
-helper.
+On each page request, Proscenium will check if any of your views, layouts and partials have a JS/TS/CSS file of the same name, and then include them wherever your placed the `include_assets` helper.
+
+Now you never have to remember to include your assets again. Just create them alongside your views, partials and layouts, and Proscenium will take care of the rest.
+
+Side loading is enabled by default, but you can disable it by setting `config.proscenium.side_load` to `false` in your `/config/application.rb`.
+
+There are also `include_stylesheets` and `include_javascripts` helpers to allow you to control where the CSS and JS assets are included in the HTML. These helpers should be used instead of `include_assets` if you want to control exactly where the assets are included.
 
-Now you never have to remember to include your assets again. Just create them alongside your views,
-partials and layouts, and Proscenium will take care of the rest.
+## Bundling
 
-Side loading is enabled by default, but you can disable it by setting `config.proscenium.side_load`
-to `false` in your `/config/application.rb`.
+To bundle a file means to inline any imported dependencies into the file itself. This process is recursive so dependencies of dependencies (and so on) will also be inlined.
 
-There are also `include_stylesheets` and `include_javascripts` helpers to allow you to control where
-the CSS and JS assets are included in the HTML. These helpers should be used instead of
-`include_assets` if you want to control exactly where the assets are included.
+Proscenium will bundle by default, and in real time. So there is no separate build step or pre-compilation.
 
-## Importing Assets
+Proscenium supports importing JS, JSX, TS, TSX, CSS and SVG from NPM, by URL, your local app, and even from other Ruby Gems.
 
-Proscenium supports importing JS, JSX, TS, TSX, CSS and SVG from NPM, by URL, your local app, and even from Ruby Gems.
+Both static ([`import`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import)) and dynamic ([`import()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import)) imports are supported for JavaScript and TypeScript, and can be used to import JS, TS, JSX, TSX, JSON, CSS and SVG files.
 
-Imported files are bundled together in real time. So no build step or pre-compilation is needed.
+The [`@import`](https://developer.mozilla.org/en-US/docs/Web/CSS/@import) CSS at-rule is supported for CSS.
 
-Imports are assumed to be JS files, so there is no need to specify the file extesnion in such cases. But you can if you like. All other file types must be specified using their full file name and extension.
+### Non-analyzable imports
 
-### URL Imports
+Import paths are currently only bundled if they are a string literal or a glob pattern. Other forms of import paths are not bundled, and are instead preserved verbatim in the generated output. This is because bundling is a compile-time operation and Proscenium doesn't support all forms of run-time path resolution.
 
-Any import beginning with `http://` or `https://` will be fetched from the URL provided. For example:
+Here are some examples:
 
 ```js
-import React from "https://esm.sh/react";
-```
+// Analyzable imports (will be bundled)
+import "pkg";
+import("pkg");
+import(`./locale-${foo}.json`);
 
-```css
-@import "https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css";
+// Non-analyzable imports (will not be bundled)
+import(`pkg/${foo}`);
 ```
 
-URL imports are cached, so that each import is only fetched once per server restart.
+The way to work around non-analyzable imports is to mark the package containing this problematic code as [unbundled](#Unbundling) so that it's not included in the bundle. You will then need to ensure that a copy of the external package is available to your bundled code at run-time.
 
 ### Import from NPM (`node_modules`)
 
-Bare imports (imports not beginning with `./`, `/`, `https://`, `http://`) are fully supported, and will use your package manager of choice (eg, NPM, Yarn, pnpm) via the `package.json` file:
+Bare imports (imports not beginning with `./`, `/`, `https://`, `http://`) are fully supported, and will use your package manager of choice (eg, NPM, Yarn, pnpm) via the `package.json` file located at the root of your Rails app.
+
+Install the package you want to import using your package manager of choice...
+
+```
+npm install react
+```
+
+...and then import it as you would any other package.
 
 ```js
 import React from "react";
@@ -223,26 +239,18 @@ import React from "react";
 
 ### Local Imports
 
-And of course you can import your own code, using relative or absolute paths (file extension is optional):
+And of course you can import your own code, using relative or absolute paths (file extension is optional, and absolute paths use your Rails root as the base):
 
-```js /app/views/layouts/application.js
+```js
 import utils from "/lib/utils";
-```
-
-```js /lib/utils.js
 import constants from "./constants";
+import Header from "/app/components/header";
 ```
 
-```css /app/views/layouts/application.css
+```css
 @import "/lib/reset";
 ```
 
-```css /lib/reset.css
-body {
-  /* some styles... */
-}
-```
-
 ### Unbundling
 
 Sometimes you don't want to bundle an import. For example, you want to ensure that only one instance of React is loaded. In this cases, you can use the `unbundle` prefix
@@ -253,7 +261,7 @@ import React from "unbundle:react";
 
 This only works any bare and local imports.
 
-You can also use the `unbundle` prefix in your import map, which ensures that all imports of a particular path is always unbundled:
+You can also use the `unbundle` prefix in your [import map](#import-maps), which ensures that all imports of a particular path is always unbundled:
 
 ```json
 {
@@ -411,7 +419,7 @@ import translations from "@proscenium/i18n";
 
 ## Javascript
 
-By default, Proscenium's output will take advantage of all modern JS features. 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.
+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.
 
 ### Tree Shaking
 
@@ -491,6 +499,8 @@ Note that by default, Proscenium's output will take advantage of all modern CSS
 
 The new CSS nesting syntax is supported, and transformed into non-nested CSS for older browsers.
 
+Proscenium will also automatically insert vendor prefixes so that your CSS will work in older browsers.
+
 ### Importing CSS from JavaScript
 
 You can also import CSS from JavaScript. When you do this, Proscenium will automatically append each stylesheet to the document's head as a `<link>` element.
@@ -835,7 +845,7 @@ Proscenium brings back RJS! Any path ending in .rjs will be served from your Rai
 
 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`.
 
-So a file at `/app/views/users/index.js` will be served from `https://yourapp.com/app/views/users/index.js`.
+So a file at `/app/views/users/index.js` will be served from `https://localhost:3000/app/views/users/index.js`.
 
 You can continue to access any file in the `/public` directory as you normally would. Proscenium will not process files in the `/public` directory.
 
@@ -880,7 +890,7 @@ bundle exec rake compile:local
 We have tests for both Ruby and Go. To run the Ruby tests:
 
 ```bash
-bundle exec sus
+bin/test
 ```
 
 To run the Go tests:

data/lib/proscenium/builder.rb

@@ -7,6 +7,8 @@ module Proscenium
   class Builder
     class CompileError < StandardError; end
 
+    ENVIRONMENTS = { development: 1, test: 2, production: 3 }.freeze
+
     class Result < FFI::Struct
       layout :success, :bool,
              :response, :string
@@ -19,45 +21,21 @@ module Proscenium
       enum :environment, [:development, 1, :test, :production]
 
       attach_function :build_to_string, [
-        :string,      # Path or entry point.
-        :string,      # Base URL of the Rails app. eg. https://example.com
-        :string,      # Path to import map, relative to root
-        :string,      # ENV variables as a JSON string
-
-        # Config
-        :string,      # Rails application root
-        :string,      # Proscenium gem root
-        :environment, # Rails environment as a Symbol
-        :bool,        # Code splitting enabled?
-        :string,      # Engine names and paths as a JSON string
-        :bool         # Debugging enabled?
+        :string, # Path or entry point.
+        :pointer # Config as JSON.
       ], Result.by_value
 
       attach_function :build_to_path, [
-        :string,      # Path or entry point. Multiple can be given by separating with a semi-colon
-        :string,      # Base URL of the Rails app. eg. https://example.com
-        :string,      # Path to import map, relative to root
-        :string,      # ENV variables as a JSON string
-
-        # Config
-        :string,      # Rails application root
-        :string,      # Proscenium gem root
-        :environment, # Rails environment as a Symbol
-        :bool,        # Code splitting enabled?
-        :string,      # Engine names and paths as a JSON string
-        :bool         # Debugging enabled?
+        :string, # Path or entry point. Multiple can be given by separating with a semi-colon
+        :pointer # Config as JSON.
       ], Result.by_value
 
       attach_function :resolve, [
-        :string,      # path or entry point
-        :string,      # path to import map, relative to root
-
-        # Config
-        :string,      # Rails application root
-        :string,      # Proscenium gem root
-        :environment, # Rails environment as a Symbol
-        :bool         # debugging enabled?
+        :string, # path or entry point
+        :pointer # Config as JSON.
       ], Result.by_value
+
+      attach_function :reset_config, [], :void
     end
 
     class BuildError < StandardError
@@ -83,21 +61,34 @@ module Proscenium
       end
     end
 
-    def self.build_to_path(path, root: nil, base_url: nil)
-      new(root:, base_url:).build_to_path(path)
+    def self.build_to_path(path, root: nil)
+      new(root:).build_to_path(path)
     end
 
-    def self.build_to_string(path, root: nil, base_url: nil)
-      new(root:, base_url:).build_to_string(path)
+    def self.build_to_string(path, root: nil)
+      new(root:).build_to_string(path)
     end
 
     def self.resolve(path, root: nil)
       new(root:).resolve(path)
     end
 
-    def initialize(root: nil, base_url: nil)
-      @root = root || Rails.root
-      @base_url = base_url
+    # Intended for tests only.
+    def self.reset_config!
+      Request.reset_config
+    end
+
+    def initialize(root: nil)
+      @request_config = FFI::MemoryPointer.from_string({
+        RootPath: (root || Rails.root).to_s,
+        GemPath: gem_root,
+        Environment: ENVIRONMENTS.fetch(Rails.env.to_sym, 2),
+        Engines: engines,
+        EnvVars: env_vars,
+        CodeSplitting: Proscenium.config.code_splitting,
+        Bundle: Proscenium.config.bundle,
+        Debug: Proscenium.config.debug
+      }.to_json)
     end
 
     def build_to_path(path)
@@ -105,13 +96,7 @@ module Proscenium
                                               identifier: path,
                                               cached: Proscenium.cache.exist?(path)) do
         Proscenium.cache.fetch path do
-          result = Request.build_to_path(path, @base_url, import_map, env_vars.to_json,
-                                         @root.to_s,
-                                         gem_root,
-                                         Rails.env.to_sym,
-                                         Proscenium.config.code_splitting,
-                                         engines.to_json,
-                                         Proscenium.config.debug)
+          result = Request.build_to_path(path, @request_config)
 
           raise BuildError, result[:response] unless result[:success]
 
@@ -122,13 +107,7 @@ module Proscenium
 
     def build_to_string(path)
       ActiveSupport::Notifications.instrument('build_to_string.proscenium', identifier: path) do
-        result = Request.build_to_string(path, @base_url, import_map, env_vars.to_json,
-                                         @root.to_s,
-                                         gem_root,
-                                         Rails.env.to_sym,
-                                         Proscenium.config.code_splitting,
-                                         engines.to_json,
-                                         Proscenium.config.debug)
+        result = Request.build_to_string(path, @request_config)
 
         raise BuildError, result[:response] unless result[:success]
 
@@ -138,10 +117,8 @@ module Proscenium
 
     def resolve(path)
       ActiveSupport::Notifications.instrument('resolve.proscenium', identifier: path) do
-        result = Request.resolve(path, import_map, @root.to_s,
-                                 gem_root,
-                                 Rails.env.to_sym,
-                                 Proscenium.config.debug)
+        result = Request.resolve(path, @request_config)
+
         raise ResolveError.new(path, result[:response]) unless result[:success]
 
         result[:response]
@@ -168,20 +145,6 @@ module Proscenium
       end
     end
 
-    def import_map
-      return unless (path = Rails.root&.join('config'))
-
-      if (json = path.join('import_map.json')).exist?
-        return json.relative_path_from(@root).to_s
-      end
-
-      if (js = path.join('import_map.js')).exist?
-        return js.relative_path_from(@root).to_s
-      end
-
-      nil
-    end
-
     def gem_root
       Pathname.new(__dir__).join('..', '..').to_s
     end

data/lib/proscenium/ext/proscenium.h

@@ -82,49 +82,28 @@ typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
 extern "C" {
 #endif
 
+extern void reset_config();
 
-// Build the given `path` in the `root`.
+// Build the given `path` using the `config`.
 //
-//	BuildOptions
-//	- path - The path to build relative to `root`.
-//	- baseUrl - base URL of the Rails app. eg. https://example.com
-//	- importMap - Path to the import map relative to `root`.
-//	- envVars - JSON string of environment variables.
-//	Config:
-//	- root - The working directory.
-//	- env - The environment (1 = development, 2 = test, 3 = production)
-//	- codeSpitting?
-//	- debug?
+// - path - The path to build relative to `root`.
+// - config
 //
-extern struct Result build_to_string(char* filepath, char* baseUrl, char* importMap, char* envVars, char* appRoot, char* gemPath, unsigned int env, GoUint8 codeSplitting, char* engines, GoUint8 debug);
+extern struct Result build_to_string(char* filePath, char* configJson);
 
 // Build the given `path` in the `root`.
 //
-//	BuildOptions
-//	- path - The path to build relative to `root`. Multiple paths can be given by separating them
-//	  with a semi-colon.
-//	- baseUrl - base URL of the Rails app. eg. https://example.com
-//	- importMap - Path to the import map relative to `root`.
-//	- envVars - JSON string of environment variables.
-//	Config:
-//	- root - The working directory.
-//	- env - The environment (1 = development, 2 = test, 3 = production)
-//	- codeSpitting?
-//	- debug?
+// - path - The path to build relative to `root`.
+// - config
 //
-extern struct Result build_to_path(char* filepath, char* baseUrl, char* importMap, char* envVars, char* appRoot, char* gemPath, unsigned int env, GoUint8 codeSplitting, char* engines, GoUint8 debug);
+extern struct Result build_to_path(char* filePath, char* configJson);
 
 // Resolve the given `path` relative to the `root`.
 //
-//	ResolveOptions
-//	- path - The path to build relative to `root`.
-//	- importMap - Path to the import map relative to `root`.
-//	Config
-//	- root - The working directory.
-//	- env - The environment (1 = development, 2 = test, 3 = production)
-//	- debug?
+// - path - The path to build relative to `root`.
+// - config
 //
-extern struct Result resolve(char* path, char* importMap, char* appRoot, char* gemPath, unsigned int env, GoUint8 debug);
+extern struct Result resolve(char* filePath, char* configJson);
 
 #ifdef __cplusplus
 }

data/lib/proscenium/helper.rb

@@ -15,9 +15,15 @@ module Proscenium
     # building with Proscenium. It's important to note that `include_assets` will not call this, as
     # those asset paths all begin with a slash, which the Rails asset helpers do not pass through to
     # here.
+    #
+    # If the given `path` is a bare path (does not start with `./` or `../`), then we use
+    # Rails default conventions, and serve CSS from /app/assets/stylesheets and JS from
+    # /app/javascript.
     def compute_asset_path(path, options = {})
       if %i[javascript stylesheet].include?(options[:type])
-        result = Proscenium::Builder.build_to_path(path, base_url: request.base_url)
+        path.prepend DEFAULT_RAILS_ASSET_PATHS[options[:type]] unless path.start_with?('./', '../')
+
+        result = Proscenium::Builder.build_to_path(path)
         return result.split('::').last.delete_prefix 'public'
       end
 
@@ -53,7 +59,7 @@ module Proscenium
     end
 
     def include_stylesheets
-      '<!-- [PROSCENIUM_STYLESHEETS] -->'.html_safe
+      SideLoad::CSS_COMMENT.html_safe
     end
     alias side_load_stylesheets include_stylesheets
     deprecate side_load_stylesheets: 'Use `include_stylesheets` instead', deprecator: Deprecator.new
@@ -62,7 +68,7 @@ module Proscenium
     #
     # @return [String] the HTML tags for the javascripts.
     def include_javascripts
-      '<!-- [PROSCENIUM_LAZY_SCRIPTS] --><!-- [PROSCENIUM_JAVASCRIPTS] -->'.html_safe
+      (SideLoad::LAZY_COMMENT + SideLoad::JS_COMMENT).html_safe
     end
     alias side_load_javascripts include_javascripts
     deprecate side_load_javascripts: 'Use `include_javascripts` instead', deprecator: Deprecator.new

data/lib/proscenium/log_subscriber.rb

@@ -27,7 +27,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 (to string) #{path}"
         message << " (Duration: #{event.duration.round(1)}ms | Allocations: #{event.allocations})"
       end
     end

data/lib/proscenium/middleware/esbuild.rb

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

data/lib/proscenium/middleware.rb

@@ -11,7 +11,6 @@ module Proscenium
     autoload :Esbuild
     autoload :Engines
     autoload :Runtime
-    autoload :Url
 
     def initialize(app)
       @app = app
@@ -41,7 +40,6 @@ module Proscenium
     end
 
     def find_type(request)
-      return Url if request.path.match?(%r{^/https?%3A%2F%2F})
       return Runtime if request.path.match?(%r{^/@proscenium/})
       return Esbuild if Pathname.new(request.path).fnmatch?(app_path_glob, File::FNM_EXTGLOB)
 

data/lib/proscenium/railtie.rb

@@ -11,6 +11,7 @@ module Proscenium
 
     config.proscenium = ActiveSupport::OrderedOptions.new
     config.proscenium.debug = false
+    config.proscenium.bundle = true
     config.proscenium.side_load = true
     config.proscenium.code_splitting = true
 

data/lib/proscenium/resolver.rb

@@ -26,7 +26,11 @@ module Proscenium
         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}")
+          if engine.root.to_s.start_with?("#{Rails.root}/")
+            path.delete_prefix Rails.root.to_s
+          else
+            path.sub(/^#{engine.root}/, "/#{engine.engine_name}")
+          end
         elsif path.start_with?("#{Rails.root}/")
           path.delete_prefix Rails.root.to_s
         else

data/lib/proscenium/side_load.rb

@@ -2,6 +2,10 @@
 
 module Proscenium
   class SideLoad
+    JS_COMMENT = '<!-- [PROSCENIUM_JAVASCRIPTS] -->'
+    CSS_COMMENT = '<!-- [PROSCENIUM_STYLESHEETS] -->'
+    LAZY_COMMENT = '<!-- [PROSCENIUM_LAZY_SCRIPTS] -->'
+
     module Controller
       def self.included(child)
         child.class_eval do
@@ -23,7 +27,13 @@ module Proscenium
       def capture_and_replace_proscenium_stylesheets
         return if response_body.nil?
         return if response_body.first.blank? || !Proscenium::Importer.css_imported?
-        return unless response_body.first.include? '<!-- [PROSCENIUM_STYLESHEETS] -->'
+
+        included_comment = response_body.first.include?(CSS_COMMENT)
+        fragments = if (fragment_header = request.headers['X-Fragment'])
+                      fragment_header.split
+                    end
+
+        return if !fragments && !included_comment
 
         imports = Proscenium::Importer.imported.dup
         paths_to_build = []
@@ -31,8 +41,7 @@ module Proscenium
           paths_to_build << x.delete_prefix('/')
         end
 
-        result = Proscenium::Builder.build_to_path(paths_to_build.join(';'),
-                                                   base_url: helpers.request.base_url)
+        result = Proscenium::Builder.build_to_path(paths_to_build.join(';'))
 
         out = []
         result.split(';').each do |x|
@@ -44,12 +53,17 @@ module Proscenium
 
           import = imports[inpath]
           opts = import[:css].is_a?(Hash) ? import[:css] : {}
+          opts[:preload_links_header] = false if fragments
           opts[:data] ||= {}
           opts[:data][:original_href] = inpath
           out << helpers.stylesheet_link_tag(outpath, extname: false, **opts)
         end
 
-        response_body.first.gsub! '<!-- [PROSCENIUM_STYLESHEETS] -->', out.join.html_safe
+        if fragments
+          response_body.first.prepend out.join.html_safe
+        elsif included_comment
+          response_body.first.gsub! CSS_COMMENT, out.join.html_safe
+        end
       end
 
       def capture_and_replace_proscenium_javascripts
@@ -62,10 +76,15 @@ module Proscenium
           paths_to_build << x.delete_prefix('/')
         end
 
-        result = Proscenium::Builder.build_to_path(paths_to_build.join(';'),
-                                                   base_url: helpers.request.base_url)
+        result = Proscenium::Builder.build_to_path(paths_to_build.join(';'))
 
-        if response_body.first.include? '<!-- [PROSCENIUM_JAVASCRIPTS] -->'
+        included_js_comment = response_body.first.include?(JS_COMMENT)
+        included_lazy_comment = response_body.first.include?(LAZY_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|
@@ -79,14 +98,19 @@ module Proscenium
               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
 
-          response_body.first.gsub! '<!-- [PROSCENIUM_JAVASCRIPTS] -->', out.join.html_safe
+          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
 
-        return unless response_body.first.include? '<!-- [PROSCENIUM_LAZY_SCRIPTS] -->'
+        return if !fragments && !included_lazy_comment
 
         lazy_script = ''
         if scripts.present?
@@ -96,7 +120,11 @@ module Proscenium
           end
         end
 
-        response_body.first.gsub! '<!-- [PROSCENIUM_LAZY_SCRIPTS] -->', lazy_script
+        if fragments
+          response_body.first.prepend lazy_script
+        elsif included_lazy_comment
+          response_body.first.gsub! LAZY_COMMENT, lazy_script
+        end
       end
     end
 

data/lib/proscenium/ui/breadcrumbs/component.module.css

@@ -1,6 +1,6 @@
 @layer proscenium-ui-component {
   /*
-   * Custom properties:
+   * Properties:
    *
    *   --puiBreadcrumbs--link-color: LinkText;
    *   --puiBreadcrumbs--link-hover-color: HighlightText;

data/lib/proscenium/ui/breadcrumbs/component.rb

@@ -1,28 +1,22 @@
 # frozen_string_literal: true
 
+require 'literal'
+
 module Proscenium::UI
   class Breadcrumbs::Component < Component
+    extend Literal::Properties
     include Phlex::Rails::Helpers::URLFor
 
     # The path (route) to use as the HREF for the home segment. Defaults to `:root`.
-    option :home_path, Types::String | Types::Symbol, default: -> { :root }
+    prop :home_path, _Union(String, Symbol), default: -> { :root }
 
     # Assign false to hide the home segment.
-    option :with_home, Types::Bool, default: -> { true }
-
-    # One or more class name(s) for the base div element which will be appended to the default.
-    option :class, Types::Coercible::String | Types::Array.of(Types::Coercible::String),
-           as: :class_name, default: -> { [] }
-
-    # One or more class name(s) for the base div element which will replace the default. If both
-    # `class` and `class!` are provided, all values will be merged. Defaults to `:@base`.
-    option :class!, Types::Coercible::String | Types::Array.of(Types::Coercible::String),
-           as: :class_name_override, default: -> { :@base }
+    prop :with_home, _Boolean, default: -> { true }
 
     def view_template
-      div class: [*class_name_override, *class_name] do
+      div class: :@base do
         ol do
-          if with_home
+          if @with_home
             li do
               home_template
             end
@@ -48,7 +42,7 @@ module Proscenium::UI
     #    super { 'hello' }
     #  end
     def home_template(&block)
-      a(href: url_for(home_path)) do
+      a(href: url_for(@home_path)) do
         if block
           yield
         else

data/lib/proscenium/ui/component.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry-initializer'
-
 module Proscenium::UI
   class Component < Proscenium::Phlex
     self.abstract_class = true
-
-    extend Dry::Initializer
   end
 end

data/lib/proscenium/ui/test.js

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

data/lib/proscenium/{libs → ui}/ujs/index.js

@@ -2,7 +2,7 @@ export default async () => {
   window.Proscenium = window.Proscenium || {};
 
   if (!window.Proscenium.UJS) {
-    const classPath = "/@proscenium/ujs/class.js";
+    const classPath = "/proscenium/ui/ujs/class.js";
     const module = await import(classPath);
     window.Proscenium.UJS = new module.default();
   }

data/lib/proscenium/ui.rb

@@ -1,14 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry-types'
-
 module Proscenium::UI
   extend ActiveSupport::Autoload
 
   autoload :Component
   autoload :Breadcrumbs
-
-  module Types
-    include Dry.Types()
-  end
 end

data/lib/proscenium/version.rb

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

data/lib/proscenium.rb

@@ -8,6 +8,13 @@ module Proscenium
   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 = {
+    stylesheet: 'app/assets/stylesheets/',
+    javascript: 'app/javascript/'
+  }.freeze
+
   ALLOWED_DIRECTORIES = 'app,lib,config,vendor,node_modules'
 
   # Environment variables that should always be passed to the builder.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.19.0.beta2
 platform: ruby
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2024-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,34 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '8.0'
-- !ruby/object:Gem::Dependency
-  name: dry-initializer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: dry-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -73,33 +45,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.17.0
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: literal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: phlex-rails
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '3.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -156,22 +128,12 @@ files:
 - 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/url.rb
 - lib/proscenium/monkey.rb
 - lib/proscenium/phlex.rb
 - lib/proscenium/phlex/asset_inclusions.rb
@@ -191,7 +153,15 @@ files:
 - 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/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

data/lib/proscenium/libs/test.js

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

data/lib/proscenium/middleware/url.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Proscenium
-  class Middleware
-    # Handles requests for URL encoded URL's.
-    class Url < Esbuild
-      private
-
-      # @override [Esbuild] It's a URL, so always assume it is renderable (we won't actually know
-      #   until it's downloaded).
-      def renderable?
-        true
-      end
-    end
-  end
-end