proscenium 0.11.0.pre.3-arm64-darwin → 0.11.0.pre.5-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2f6ab1b0a615089a417d81c8f4fbf491ef14522d3f7bd47b1117ec0a823e4a8
-  data.tar.gz: c91c9777054c6fed5d10620c44e80e70d1285ff447dcf376d85b3ca7ad15f68d
+  metadata.gz: e225f9981d6aa514a15262a19c057a2b911f6c66881ea74dd9ff71bf35b70951
+  data.tar.gz: f4ef42291935bb4054b27c4e8d3a60729b9c03a486fa74bada06c1257a3a3408
 SHA512:
-  metadata.gz: def1da0f531ae5a0feab4714c89c0062eaa45e0114fb779312d727819c24def04d971b0d7615c0c4d1e944fe39e4bbfa340c5ec6631b5775ac9d293b21d1b4a5
-  data.tar.gz: c97072f051e71db3023d09689a043b36c0025ec9e7dd1b0a86e382e848be77525362c02b46da4bc6777bd944ba87d655835eb74ef8250b7b440816111536855c
+  metadata.gz: d64cbf51c573762ca095dc18db2ffa6c3b5106528f0268666ba0e1484d1c093518f1a3f5d15fbe205e019011b5e44a763b405536e2222b16860286cf5e6341a6
+  data.tar.gz: 57509036784d9d70201b36ff426db44656d9e222f1c952a718d3f91e0e7e648fc1d9c996df3e1e6e0eb4cf7c10690882cac3182486e46b1f775c751db5e71ceb

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.11.0.pre.3
+  version: 0.11.0.pre.5
 platform: arm64-darwin
 authors:
 - Joel Moss