proscenium 0.15.0.beta.5-arm64-darwin → 0.15.0.beta.7-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba987377abbaebbf4eb211dd824fead6dcb97676dcb7499c9edce7fc42eaafa9
-  data.tar.gz: faaecb2565d83c961788235b906392386cfd6c423210f28752e6343fc97db035
+  metadata.gz: 22220a996970e7d68157de006512c184796c9716279bf5ab1aa37d7c5baaff2c
+  data.tar.gz: 88eb65f121070d784d8755ff99a4ff98c873627e85dbd88b7e970ccb55558b52
 SHA512:
-  metadata.gz: 610dcbd471c985770f9a0b7a24701feb9ce098baf385b169e09929450f6d49799cc574c94ad35e5e72f1bda7a35876610820ce4d730f16889dfeb87435f29edf
-  data.tar.gz: 9711ff219beb2ca42d60a482b2508b6c18f8a4dd49f6a68f8a2558f897e8cce9e660c3613ca505e37fee4feeb68e73a1ab57b1961a3fef0d82db59b54b3a36c6
+  metadata.gz: a839a7d81bc463f486b1453cdecd258e0268282de72a7faadd598e3cc953ba582381e43cf3d95cd21e30c179b190e544c87af20dec8f0ba204d82ffef7ef833f
+  data.tar.gz: dd142648607c8a846a51bcab4f65acf5d83f678ab98afd027a34f29fddd8271e2270308c47e2052351def2ecca7b9b090661b52c8fde45c24f2db4298e4ea131

data/lib/proscenium/importer.rb

@@ -61,19 +61,36 @@ module Proscenium
       #
       # @param filepath [Pathname] Absolute file system path of the Ruby file to sideload.
       def sideload(filepath, **options)
+        return if !Proscenium.config.side_load || (options[:js] == false && options[:css] == false)
+
+        sideload_js(filepath, **options) unless options[:js] == false
+        sideload_css(filepath, **options) unless options[:css] == false
+      end
+
+      def sideload_js(filepath, **options)
         return unless Proscenium.config.side_load
 
         filepath = Rails.root.join(filepath) unless filepath.is_a?(Pathname)
         filepath = filepath.sub_ext('')
 
-        import_if_exists = lambda do |x|
+        JS_EXTENSIONS.find do |x|
           if (fp = filepath.sub_ext(x)).exist?
             import(Resolver.resolve(fp.to_s), sideloaded: true, **options)
           end
         end
+      end
 
-        JS_EXTENSIONS.find(&import_if_exists) unless options[:js] == false
-        CSS_EXTENSIONS.find(&import_if_exists) unless options[:css] == false
+      def sideload_css(filepath, **options)
+        return unless Proscenium.config.side_load
+
+        filepath = Rails.root.join(filepath) unless filepath.is_a?(Pathname)
+        filepath = filepath.sub_ext('')
+
+        CSS_EXTENSIONS.find do |x|
+          if (fp = filepath.sub_ext(x)).exist?
+            import(Resolver.resolve(fp.to_s), sideloaded: true, **options)
+          end
+        end
       end
 
       def each_stylesheet(delete: false)

data/lib/proscenium/libs/ujs/data_confirm.js

@@ -1,16 +1,23 @@
 export default class DataConfirm {
-  onSubmit = event => {
-    if (!event.target.matches('[data-turbo=true]') && 'confirm' in event.submitter.dataset) {
-      const v = event.submitter.dataset.confirm
+  onSubmit = (event) => {
+    if (
+      !event.target.matches("[data-turbo=true]") &&
+      event.submitter &&
+      "confirm" in event.submitter.dataset
+    ) {
+      const v = event.submitter.dataset.confirm;
 
-      if (v !== 'false' && !confirm(v === 'true' || v === '' ? 'Are you sure?' : v)) {
-        event.preventDefault()
-        event.stopPropagation()
-        event.stopImmediatePropagation()
-        return false
+      if (
+        v !== "false" &&
+        !confirm(v === "true" || v === "" ? "Are you sure?" : v)
+      ) {
+        event.preventDefault();
+        event.stopPropagation();
+        event.stopImmediatePropagation();
+        return false;
       }
     }
 
-    return true
-  }
+    return true;
+  };
 }

data/lib/proscenium/side_load.rb

@@ -127,16 +127,28 @@ module Proscenium
           options[k] = obj.instance_eval(&options[k]) if options[k].is_a?(Proc)
         end
 
+        css_imports = []
+
         klass = obj.class
         while klass.respond_to?(:source_path) && klass.source_path && !klass.abstract_class
           if klass.respond_to?(:sideload)
             klass.sideload options
-          else
+          elsif options[:css] == false
             Importer.sideload klass.source_path, **options
+          else
+            Importer.sideload_js klass.source_path, **options
+            css_imports << klass.source_path
           end
 
           klass = klass.superclass
         end
+
+        # The reason why we sideload CSS after JS is because the order of CSS is important.
+        # Basically, the layout should be loaded before the view so that CSS cascading works i9n the
+        # right direction.
+        css_imports.reverse_each do |it|
+          Importer.sideload_css it, **options
+        end
       end
     end
   end

data/lib/proscenium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Proscenium
-  VERSION = '0.15.0.beta.5'
+  VERSION = '0.15.0.beta.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.15.0.beta.5
+  version: 0.15.0.beta.7
 platform: arm64-darwin
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-15 00:00:00.000000000 Z
+date: 2024-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.3
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.3
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: The engine powering your Rails frontend