proscenium 0.11.0.pre.3-x86_64-linux → 0.11.0.pre.5-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77664a8a3ca38be441ff51bcc6ed3d14b1429d137b8dfe0ed91e809ce8938d65
-  data.tar.gz: 9183b2ca71a13c998b5174d0fba82382da9251b489c27a7415f6a318abf66ab3
+  metadata.gz: 55d308e705e5edc2a7157a05272334fd34dd1dfe97c6cf2d551345376f7b75ca
+  data.tar.gz: 2d16c9ac5b15b63c252ad69eafccde16ee92c00e6efdf291a2944ec2cfcd8d92
 SHA512:
-  metadata.gz: 61ff96ce831429237e5a550672a4d93b319a5ec26e9191ce6948e7e1afe32f660b98d6a2844eda0f33056d69f8ce14f6e7c428d3889247d89a5b29eeb12947ed
-  data.tar.gz: 318dd11d7aab04c642c38cdcf33cb2454e15e2e86f8de8ff1428042a3e0fd458ea1ec9d909854012c58cf00a8439d4775648f8fe26788a61b31c2e02bdd59369
+  metadata.gz: c3df7bed5a9a168db209e06fb18bd6aadf5028f8f5981c7a0ebb79524ee5dbf6c73300b01983a6ff929dda087f3733fd2bfcbe4604693a5a2221c81f07fe26a4
+  data.tar.gz: d61ec92e1e760e5c2885cd656a1ea3b32f44d1cd91f6928f0c6e736d1327491b2b556456baea4d231dc16c7cd7ef854a11518963a65a371261d714ad7ca3d142

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: x86_64-linux
 authors:
 - Joel Moss