proscenium 0.11.0.pre.1-x86_64-darwin → 0.11.0.pre.5-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ba51d67d2c6c2befac8704baeeb65b18d14991af344900edd9e187096f7108c
-  data.tar.gz: 7303432ccf8f03d18cfd76bf98a7e6ba81be067e2855f8cb92b0f150064ec9c5
+  metadata.gz: 8c36b57a4023d8440bb695653665d16177455a928f6db1f83a0fb67d9bd239db
+  data.tar.gz: 1d58d6551714bd4739f595ccf7d8cd52feaf2425315ee6a54bee20d9fbe906f9
 SHA512:
-  metadata.gz: 03c303f97cd7c7cb45e8261b11bd6e011277e52f427f59866c148a36a7d6bb72aef8b30a11bf6eea39fc3356454444d62bb814922bffedf0041e2d7ac3f77bdd
-  data.tar.gz: ede216dd5c30f4950b704f0f0b4eb6760bd336747794c8130d816654aed4cba73d9e9671f5d1173343c9ffcf424dcba75b808f085725a62206451ad70251df9d
+  metadata.gz: 682bd22dc1972e1813b40c174185c887999cc7865408e5eca5cf8bbf84974f41c29534bf967a78eb4562df67e06b70fe511e7d808e49f4069aaddb98063ffef6
+  data.tar.gz: 41160899de48bd2e85d550daaa7354cce3d8eebd894deead7c02290fb3a121dcdf1a42ec39554e84d529d81584524e4f6908984de5cc05ca153302a21a1eba1a

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,8 +37,10 @@ module Proscenium
         :string,      # path to import map, relative to root
 
         # Config
-        :string,      # root
-        :environment  # Rails environment as a Symbol
+        :string,      # Rails application root
+        :string,      # Proscenium gem root
+        :environment, # Rails environment as a Symbol
+        :bool         # debugging enabled?
       ], Result.by_value
     end
 
@@ -72,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)
@@ -88,7 +92,10 @@ 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]
 
         result[:response]

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`.
 //
@@ -107,8 +107,9 @@ extern struct Result build(char* filepath, char* baseUrl, char* importMap, char*
 //	Config
 //	- root - The working directory.
 //	- env - The environment (1 = development, 2 = test, 3 = production)
+//	- debug?
 //
-extern struct Result resolve(char* path, char* importMap, char* root, unsigned int env);
+extern struct Result resolve(char* path, char* importMap, char* appRoot, char* gemPath, unsigned int env, GoUint8 debug);
 
 #ifdef __cplusplus
 }

data/lib/proscenium/libs/test.js

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

data/lib/proscenium/middleware/base.rb

@@ -34,12 +34,12 @@ module Proscenium
       private
 
       def real_path
-        @request.path
+        @real_path ||= @request.path
       end
 
       # @return [String] the path to the file without the leading slash which will be built.
       def path_to_build
-        @request.path[1..]
+        @path_to_build ||= @request.path[1..]
       end
 
       def sourcemap?
@@ -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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Proscenium
+  class Middleware
+    class Runtime < Esbuild
+      private
+
+      def real_path
+        @real_path ||= Pathname.new(@request.path.sub(%r{^/@proscenium},
+                                                      '/lib/proscenium/libs')).to_s
+      end
+
+      def root_for_readable
+        Proscenium::Railtie.root
+      end
+    end
+  end
+end

data/lib/proscenium/middleware.rb

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

data/lib/proscenium/resolver.rb

@@ -11,7 +11,7 @@ module Proscenium
     #
     # @param path [String] Can be URL path, file system path, or bare specifier (ie. NPM package).
     # @return [String] URL path.
-    def self.resolve(path) # rubocop:disable Metrics/AbcSize
+    def self.resolve(path) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
       self.resolved ||= {}
 
       self.resolved[path] ||= begin
@@ -19,7 +19,11 @@ module Proscenium
           raise ArgumentError, 'path must be an absolute file system or URL path'
         end
 
-        if (gem = Proscenium.config.side_load_gems.find { |_, x| path.start_with? "#{x[:root]}/" })
+        if path.start_with?('@proscenium/')
+          "/#{path}"
+        elsif (gem = Proscenium.config.side_load_gems.find do |_, x|
+                 path.start_with? "#{x[:root]}/"
+               end)
           unless (package_name = gem[1][:package_name] || gem[0])
             # TODO: manually resolve the path without esbuild
             raise PathResolutionFailed, path

data/lib/proscenium/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.11.0.pre.1
+  version: 0.11.0.pre.5
 platform: x86_64-darwin
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -101,10 +101,12 @@ files:
 - 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/log_subscriber.rb
 - lib/proscenium/middleware.rb
 - lib/proscenium/middleware/base.rb
 - lib/proscenium/middleware/esbuild.rb
+- lib/proscenium/middleware/runtime.rb
 - lib/proscenium/middleware/url.rb
 - lib/proscenium/monkey.rb
 - lib/proscenium/phlex.rb
@@ -145,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: The engine powering your Rails frontend