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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b32b5cbadeca029ce04a376125a924b059d388b60e90835b9a8e6d7a152a9c72
-  data.tar.gz: ff4a5b0ca38e8b028313f1a4bfc6fc214a11f2bf3cd6a49f89125d15ba26190f
+  metadata.gz: ee3f15d3e012c29b9ccaf4407e4cc2c5cdc44b20a2e880bf1f42a7486f917a84
+  data.tar.gz: 622933b2d4cd21bd1f27b64e1a6659609007c3b2f2dcdab6c7d16f18576925a0
 SHA512:
-  metadata.gz: 3b900744ef723e3cb4d6d7c83a242d8fd8635d72fdcd7b297df131db407def41f934641125c230bc4feeab3a8694710d6300804558812bd8374dc1e4fb93618a
-  data.tar.gz: b24280e853b5d57051af8f681d3b4b7923902dcb45226451fa8e01663c3025dc94987c534ddc740a08936a46a6a3ac14935ebbf08fefe2c732431c08e37cffce
+  metadata.gz: 64c5a1f1f38d0f0611fd7a30eafbbecfa79c490daedde990af76aea49491df15d862ee42dc43039d4f6530804acf1f87fb5ad793c77b4ee61926be58688abbc7
+  data.tar.gz: d2a61a850cd492f141a77685d3d2fe6ad4d085daf9f417ce333c74257fb8675f158d5026627111e906a585f1752c7f646e27186b29fec57195afe1f6e15b328e

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-linux
 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