proscenium 0.22.1-x86_64-linux → 0.22.3-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89a3b3c57c117f57579a301ba8e137e9d3c1bc328dbde17744dbf83a0044698e
-  data.tar.gz: 04be1d48ae1a314fdd7bff6e24f418d2bcab73608544df7ad407a6826e5a9f5f
+  metadata.gz: fecf2b97a7604dab567f331b9293d66b192fc8fd16c700a07a2f709f4a9248a8
+  data.tar.gz: ad94a7bb10bae3aef5900b1b61d6152e8ec869316fc92e930a394a974d5e1e90
 SHA512:
-  metadata.gz: 765ac1842f9ecfc6552b49912538512f3639d410e961325020db5cb7bcf92487e7e224a59457c321c683b727492afa69539d93d136522999965bf8f6567e7397
-  data.tar.gz: 46c6b9d0d018b2f3e8e4891adc3251902b75b996d9ba3b099a37d09931be4a74e463a35b28874e6b9ffdfcc8501d71ed3bcad2a44fc6a743d4fdcea3edb589c6
+  metadata.gz: c0d24a29259ccb5f2e8e64041b2ce0bfaecdac75d53f9d0ccc336507af24cd3c00ffa2eedab4dfe5e53cec94afc5d61d769dc8b68f9e1964ad793b7ca2d45b87
+  data.tar.gz: 28c1ef751beacc5ef618f39f8c597d412b04228a9ec7d7027f85c601169ecf11505da90ed3a43642ad519d5e663200836965cd05a17481869552d654bc4e500d

data/lib/proscenium/css_module/transformer.rb

@@ -66,11 +66,15 @@ module Proscenium
         raise Proscenium::CssModule::TransformError.new(original_name, 'CSS module path not given')
       end
 
-      resolved_path = Resolver.resolve(path.to_s)
-      digest = Importer.import(resolved_path)
+      manifest_path, non_manifest_path = Resolver.resolve(path.to_s, as_array: true)
+      digest = Importer.import(manifest_path || non_manifest_path, digest: lambda {
+        Utils.digest non_manifest_path
+      })
 
       transformed_path = ''
-      transformed_path = "__#{resolved_path[1..].gsub(%r{[@/.+]}, '-')}" if Rails.env.development?
+      if Rails.env.development?
+        transformed_path = "__#{non_manifest_path[1..].gsub(%r{[@/.+]}, '-')}"
+      end
       transformed_name = name.to_s
       transformed_name = if transformed_name.start_with?('_')
                            "_#{transformed_name[1..]}-#{digest}#{transformed_path}"
@@ -78,7 +82,7 @@ module Proscenium
                            "#{transformed_name}-#{digest}#{transformed_path}"
                          end
 
-      [transformed_name, resolved_path]
+      [transformed_name, non_manifest_path]
     end
   end
 end

data/lib/proscenium/ext/proscenium.h

@@ -12,6 +12,8 @@
 
 #ifndef GO_CGO_GOSTRING_TYPEDEF
 typedef struct { const char *p; ptrdiff_t n; } _GoString_;
+extern size_t _GoStringLen(_GoString_ s);
+extern const char *_GoStringPtr(_GoString_ s);
 #endif
 
 #endif
@@ -57,10 +59,16 @@ typedef size_t GoUintptr;
 typedef float GoFloat32;
 typedef double GoFloat64;
 #ifdef _MSC_VER
+#if !defined(__cplusplus) || _MSVC_LANG <= 201402L
 #include <complex.h>
 typedef _Fcomplex GoComplex64;
 typedef _Dcomplex GoComplex128;
 #else
+#include <complex>
+typedef std::complex<float> GoComplex64;
+typedef std::complex<double> GoComplex128;
+#endif
+#else
 typedef float _Complex GoComplex64;
 typedef double _Complex GoComplex128;
 #endif
@@ -87,7 +95,7 @@ typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
 extern "C" {
 #endif
 
-extern void reset_config();
+extern void reset_config(void);
 
 // Build the given `path` using the `config`.
 //

data/lib/proscenium/importer.rb

@@ -28,18 +28,26 @@ module Proscenium
         self.imported ||= {}
 
         filepath = "/node_modules/#{filepath}" if filepath.start_with?('@rubygems/')
-        css_module = filepath.end_with?('.module.css')
+        css_module = filepath.match?(/\.module(-\$[a-z0-9]+\$)?\.css$/i)
 
         unless self.imported.key?(filepath)
           if sideloaded
             ActiveSupport::Notifications.instrument 'sideload.proscenium', identifier: filepath,
                                                                            sideloaded: do
               self.imported[filepath] = { ** }
-              self.imported[filepath][:digest] = Utils.digest(filepath) if css_module
+              self.imported[filepath][:digest] ||= Utils.digest(filepath) if css_module
+
+              if self.imported[filepath][:digest].is_a?(Proc)
+                self.imported[filepath][:digest] = self.imported[filepath][:digest].call
+              end
             end
           else
             self.imported[filepath] = { ** }
-            self.imported[filepath][:digest] = Utils.digest(filepath) if css_module
+            self.imported[filepath][:digest] ||= Utils.digest(filepath) if css_module
+
+            if self.imported[filepath][:digest].is_a?(Proc)
+              self.imported[filepath][:digest] = self.imported[filepath][:digest].call
+            end
           end
         end
 
@@ -103,9 +111,18 @@ module Proscenium
         sideloaded = []
 
         extensions.find do |x|
-          if (fp = filepath.sub_ext(x)).exist?
-            sideloaded << import(Resolver.resolve(fp.to_s), sideloaded: filepath, **options)
-          end
+          next unless (fp = filepath.sub_ext(x)).exist?
+
+          sideloaded << if extensions.include?('.module.css')
+                          manifest_path, non_manifest_path = Resolver.resolve(fp.to_s,
+                                                                              as_array: true)
+                          import(manifest_path || non_manifest_path,
+                                 sideloaded: filepath,
+                                 digest: -> { Utils.digest non_manifest_path },
+                                 **options)
+                        else
+                          import(Resolver.resolve(fp.to_s), sideloaded: filepath, **options)
+                        end
         end
 
         sideloaded

data/lib/proscenium/manifest.rb

@@ -12,16 +12,26 @@ module Proscenium
     end
 
     def load!
+      public_path = Rails.configuration.paths['public'].first
       self.manifest = {}
       self.loaded = false
 
       if Proscenium.config.manifest_path.exist?
         self.loaded = true
 
-        JSON.parse(Proscenium.config.manifest_path.read)['outputs'].each do |output_path, details|
+        JSON.parse(Proscenium.config.manifest_path.read)['outputs'].each do |outpath, details|
           next if !details.key?('entryPoint')
 
-          manifest[details['entryPoint']] = "/#{output_path.delete_prefix('public/')}"
+          outpath = outpath.delete_prefix "#{public_path}/"
+
+          ep = details['entryPoint']
+          ep = if (gem = BundledGems.paths.find { |_, v| ep.start_with? "#{v}/" })
+                 "@rubygems/#{gem[0]}#{ep.delete_prefix(gem[1])}"
+               else
+                 ep.delete_prefix(Rails.root.to_s)
+               end
+
+          manifest[ep] = "/#{outpath}"
         end
       end
 
@@ -34,7 +44,7 @@ module Proscenium
     end
 
     def [](key)
-      loaded? ? manifest[key] : "/#{key}"
+      loaded? ? manifest[key] : nil
     end
   end
 end

data/lib/proscenium/react_componentable.rb

@@ -45,7 +45,7 @@ module Proscenium
 
     class_methods do
       def sideload(options)
-        Importer.import manager, **options, js: { type: 'module' }
+        Importer.import Resolver.resolve(manager.to_s), **options, js: { type: 'module' }
       end
     end
 

data/lib/proscenium/resolver.rb

@@ -10,8 +10,10 @@ module Proscenium
     # Resolve the given `path` to a fully qualified URL path.
     #
     # @param path [String] URL path, file system path, or bare specifier (ie. NPM package).
+    # @param as_array [Boolean] whether or not to return both the manifest path and
+    #   non-manifest path as an array. Only returns the resolved path if false (default).
     # @return [String] URL path.
-    def self.resolve(path)
+    def self.resolve(path, as_array: false)
       self.resolved ||= {}
 
       if path.start_with?('./', '../')
@@ -19,12 +21,16 @@ module Proscenium
       end
 
       self.resolved[path] ||= if (gem = BundledGems.paths.find { |_, v| path.start_with? "#{v}/" })
-                                path.sub(/^#{gem.last}/, "/node_modules/@rubygems/#{gem.first}")
+                                vpath = path.sub(/^#{gem.last}/, "@rubygems/#{gem.first}")
+                                [Proscenium::Manifest[vpath], "/node_modules/#{vpath}"]
                               elsif path.start_with?("#{Rails.root}/")
-                                path.delete_prefix Rails.root.to_s
+                                vpath = path.delete_prefix(Rails.root.to_s)
+                                [Proscenium::Manifest[vpath], vpath]
                               else
-                                Builder.resolve path
+                                [Proscenium::Manifest[path], Builder.resolve(path)]
                               end
+
+      as_array ? self.resolved[path] : self.resolved[path][0] || self.resolved[path][1]
     end
   end
 end

data/lib/proscenium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Proscenium
-  VERSION = '0.22.1'
+  VERSION = '0.22.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.22.3
 platform: x86_64-linux
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-04 00:00:00.000000000 Z
+date: 2025-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi