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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e01519ca50eae22b78bd8f55b6f55ad4c24327a06dc7ee13667a2d5b3baae5f
-  data.tar.gz: e767cff16534ad0092093a5654f6b4af5fdad769203fe4ae25b3855cd1d380b6
+  metadata.gz: a137f1b95b5c084958dea5e713165c77c5381d9c3c97ab03f2dfd697628de62e
+  data.tar.gz: d1db34ffec74e8d4c8def636a0f42ba332476251d63ee4398ece59cf74b320cf
 SHA512:
-  metadata.gz: 7aeedbf4df14e6f770e1666dd64ff66f0a4c38187ea1cd4bf1688a57a52709f76da67daa12dd296e36bf0107e05fb86092e7d1668714c60daf6da6ec0b8f7ed9
-  data.tar.gz: 499918efe5c3f447160bc49f5ae3287526cf5e5b1cb4cdff6bd1211bd95df7001068ea8285acddceb725425b8a236115732ad75a78780a7c3524736ec8f05867
+  metadata.gz: a0560e06363e1098def397e7f1cfc1f2d305db1e0c3f89298705ef8aa6ec3ce9a3c08ef5445609158529c7df55bf026b0f564430c52ffa8c0888f5ec895e9215
+  data.tar.gz: a50bd5ddcfe68921a1b9e4a738457f0e285b09afccd56f658ef2a454c01fd751300e0692b26fae7922549c488aca76aa8c2eb2e10eb3431e81418fc0563c4fa0

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: x86_64-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