proscenium 0.11.0.pre.2-x86_64-darwin → 0.11.0.pre.6-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8d3b2007a7ca8ce8b52c6d7eee7f67335be7b31cc0197ef9c80b555093a8c20
-  data.tar.gz: 4523ce253766e7a4facc1d71b1a4ced93499b0e23da2b2070e34edb973a32acd
+  metadata.gz: d7bdebc2e48e6cd15114f0cc3612a7981e7337e60a14fc4dd2c162423d8d1a61
+  data.tar.gz: 158e265a98b24f5d54c7971206c8eaa23c329b65b9ce9704abb9f0c01df5632f
 SHA512:
-  metadata.gz: 2664081626445a945cd82c17c5c17eac431e33f4a15fe3eb70e77557ccefcaa432f480c7c3df858ea910f5e36915cf7f4bf301b2a8dea4041c294608095f7b24
-  data.tar.gz: a870b3b886b6af3df131d9879ac9f192654f7d3a2716a798370b8e0f5f80d950d2afc27452a1eacc8919d17a005872039cb7c099297b3d228232da487185a46b
+  metadata.gz: 408b44dfbd8b0aa542fbf2e0e2e589d0a59dc955fcbea4f79434f07f684b843f3efc1d01b98e317ee9e96154c195fdd40d9468eb79b5a060c189bb50f8b953a5
+  data.tar.gz: a051dce984ac8b34c74e816521e7282194fc32b248abcb9afb679c550228a35886a88934dbde302505f2a517fa20738b0cceda5dea9ec2cf6efe3042aae95d11

data/lib/proscenium/builder.rb

@@ -25,7 +25,8 @@ module Proscenium
         :string,      # ENV variables as a JSON string
 
         # Config
-        :string,      # root
+        :string,      # Rails application root
+        :string,      # Proscenium gem root
         :environment, # Rails environment as a Symbol
         :bool,        # code splitting enabled?
         :bool         # debugging enabled?
@@ -36,7 +37,8 @@ module Proscenium
         :string,      # path to import map, relative to root
 
         # Config
-        :string,      # root
+        :string,      # Rails application root
+        :string,      # Proscenium gem root
         :environment, # Rails environment as a Symbol
         :bool         # debugging enabled?
       ], Result.by_value
@@ -73,10 +75,11 @@ module Proscenium
       @base_url = base_url
     end
 
-    def build(path)
+    def build(path) # rubocop:disable Metrics/AbcSize
       ActiveSupport::Notifications.instrument('build.proscenium', identifier: path) do
         result = Request.build(path, @base_url, import_map, env_vars.to_json,
                                @root.to_s,
+                               Pathname.new(__dir__).join('..', '..').to_s,
                                Rails.env.to_sym,
                                Proscenium.config.code_splitting,
                                Proscenium.config.debug)
@@ -89,7 +92,9 @@ module Proscenium
 
     def resolve(path)
       ActiveSupport::Notifications.instrument('resolve.proscenium', identifier: path) do
-        result = Request.resolve(path, import_map, @root.to_s, Rails.env.to_sym,
+        result = Request.resolve(path, import_map, @root.to_s,
+                                 Pathname.new(__dir__).join('..', '..').to_s,
+                                 Rails.env.to_sym,
                                  Proscenium.config.debug)
         raise ResolveError.new(path, result[:response]) unless result[:success]
 

data/lib/proscenium/ext/proscenium.h

@@ -97,7 +97,7 @@ extern "C" {
 //	- codeSpitting?
 //	- debug?
 //
-extern struct Result build(char* filepath, char* baseUrl, char* importMap, char* envVars, char* root, unsigned int env, GoUint8 codeSplitting, GoUint8 debug);
+extern struct Result build(char* filepath, char* baseUrl, char* importMap, char* envVars, char* appRoot, char* gemPath, unsigned int env, GoUint8 codeSplitting, GoUint8 debug);
 
 // Resolve the given `path` relative to the `root`.
 //
@@ -109,7 +109,7 @@ extern struct Result build(char* filepath, char* baseUrl, char* importMap, char*
 //	- env - The environment (1 = development, 2 = test, 3 = production)
 //	- debug?
 //
-extern struct Result resolve(char* path, char* importMap, char* root, unsigned int env, GoUint8 debug);
+extern struct Result resolve(char* path, char* importMap, char* appRoot, char* gemPath, unsigned int env, GoUint8 debug);
 
 #ifdef __cplusplus
 }

data/lib/proscenium/libs/react-manager/index.jsx

@@ -31,27 +31,31 @@ function init() {
       "prosceniumComponentForwardChildren" in element.dataset &&
       element.innerHTML !== "";
 
-    Promise.all([react, Component]).then(([r, c]) => {
-      if (proscenium.env.RAILS_ENV === "development") {
-        console.groupCollapsed(
-          `[proscenium/react/manager] 🔥 %o mounted!`,
-          path
-        );
-        console.log("props: %o", props);
-        console.groupEnd();
-      }
+    Promise.all([react, Component])
+      .then(([r, c]) => {
+        if (proscenium.env.RAILS_ENV === "development") {
+          console.groupCollapsed(
+            `[proscenium/react/manager] 🔥 %o mounted!`,
+            path
+          );
+          console.log("props: %o", props);
+          console.groupEnd();
+        }
 
-      let component;
-      if (forwardChildren) {
-        component = r.createElement(c.default, props, element.innerHTML);
-      } else if (children) {
-        component = r.createElement(c.default, props, children);
-      } else {
-        component = r.createElement(c.default, props);
-      }
+        let component;
+        if (forwardChildren) {
+          component = r.createElement(c.default, props, element.innerHTML);
+        } else if (children) {
+          component = r.createElement(c.default, props, children);
+        } else {
+          component = r.createElement(c.default, props);
+        }
 
-      r.createRoot(element).render(component);
-    });
+        r.createRoot(element).render(component);
+      })
+      .catch((error) => {
+        console.error("[proscenium/react/manager] %o - %o", path, error);
+      });
   }
 
   Array.from(elements, (element) => {

data/lib/proscenium/middleware/base.rb

@@ -53,22 +53,22 @@ module Proscenium
       def file_readable?
         return false unless (path = clean_path(sourcemap? ? real_path[0...-4] : real_path))
 
-        file_stat = File.stat(Pathname(root).join(path.delete_prefix('/').b).to_s)
+        file_stat = File.stat(root_for_readable.join(path.delete_prefix('/').b).to_s)
       rescue SystemCallError
         false
       else
         file_stat.file? && file_stat.readable?
       end
 
+      def root_for_readable
+        Rails.root
+      end
+
       def clean_path(file)
         path = Rack::Utils.unescape_path file.chomp('/').delete_prefix('/')
         Rack::Utils.clean_path_info path if Rack::Utils.valid_path? path
       end
 
-      def root
-        @root ||= Rails.root.to_s
-      end
-
       def content_type
         case ::File.extname(path_to_build)
         when '.js', '.mjs', '.ts', '.tsx', '.jsx' then 'application/javascript'

data/lib/proscenium/middleware/esbuild.rb

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

data/lib/proscenium/middleware/runtime.rb

@@ -10,8 +10,8 @@ module Proscenium
                                                       '/lib/proscenium/libs')).to_s
       end
 
-      def root
-        @root ||= Proscenium::Railtie.root.to_s
+      def root_for_readable
+        Proscenium::Railtie.root
       end
     end
   end

data/lib/proscenium/react_componentable.rb

@@ -38,13 +38,14 @@ module Proscenium
       class_attribute :lazy, default: false
 
       class_attribute :loader
+
+      # @return [String] the URL path to the component manager.
+      class_attribute :manager, default: '/@proscenium/react-manager/index.jsx'
     end
 
     class_methods do
-      # Import only the component manager. The component itself is side loaded in the initializer,
-      # so that it can be lazy loaded based on the value of the `lazy` instance variable.
       def sideload
-        Importer.import resolve: '@proscenium/react-manager/index.jsx'
+        Importer.import manager
         Importer.sideload source_path, lazy: true
       end
     end

data/lib/proscenium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Proscenium
-  VERSION = '0.11.0.pre.2'
+  VERSION = '0.11.0.pre.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.11.0.pre.2
+  version: 0.11.0.pre.6
 platform: x86_64-darwin
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport