proscenium 0.18.0-arm64-darwin → 0.19.0.beta1-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97b6762190186f202a4c47c31df4b917b1ac8aba94617a556bab8a3b405f10cb
-  data.tar.gz: 1aafadc1a8b26192d92982399e00552e3e2e21c2fe2cabb1699e2ce5bc19a371
+  metadata.gz: b8f7da6691f37b07f85554a9954625e209f16e04d2dd66f90f8aa16bc69ff3ca
+  data.tar.gz: dc1b1ebd66ca17be4debc8cd5d50419158570f57ab51a8ecbf17301672c55ceb
 SHA512:
-  metadata.gz: 955b20a69c4dab9a8ec2fc17892a819dbda39ddfb440e9a0a7b184f3f124f40a82dcb4b31c46c13b91d231b66811399fb465e493ce6399499583c27a15309bce
-  data.tar.gz: e10d3aec815547b202fffa97242f40afd76f16e8adf01405192135f26dc267cb271fa0e54560931775cba61b24d88a9ac3f0bccf9ba594fa2cd02ee8e9f9d9c3
+  metadata.gz: 2063dc60f2627de6bf8e0b0ad7aaa7735ab11ff1a47c264319dd86a8da15b98b752c22df9c5046e28348653d45fc9a2489b036fd76997660578427118034a5ac
+  data.tar.gz: 60bf0f1aaa0488f5831c24a2da3bed95f186fc202fd4469abd9a1d53ee5f138389a35feb484152e20c408eab7d792bf0601c12ff978e287f4d7e7115e9d53ec5

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

@@ -16,14 +16,14 @@ module Proscenium
     # 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 `./` or `../`), then we use
+    # 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])
         path.prepend DEFAULT_RAILS_ASSET_PATHS[options[:type]] unless path.start_with?('./', '../')
 
-        result = Proscenium::Builder.build_to_path(path, base_url: request.base_url)
+        result = Proscenium::Builder.build_to_path(path)
         return result.split('::').last.delete_prefix 'public'
       end
 

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/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

@@ -25,10 +25,10 @@ module Proscenium
           "/#{path}"
         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}")
         elsif path.start_with?("#{Rails.root}/")
           path.delete_prefix Rails.root.to_s
+        elsif (engine = Proscenium.config.engines.find { |e| path.start_with? "#{e.root}/" })
+          path.sub(/^#{engine.root}/, "/#{engine.engine_name}")
         else
           Builder.resolve path
         end

data/lib/proscenium/side_load.rb

@@ -41,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|
@@ -77,8 +76,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(';'))
 
         included_js_comment = response_body.first.include?(JS_COMMENT)
         included_lazy_comment = response_body.first.include?(LAZY_COMMENT)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0.beta1
 platform: arm64-darwin
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-15 00:00:00.000000000 Z
+date: 2024-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,15 +128,6 @@ 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
@@ -162,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");