condenser-rails 1.0 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcaba08537cdb45c90f7d1e2c899af0d4a405538ba9277c01b945b9592f169d2
-  data.tar.gz: afe90aa86f685ed3f7e96a4273aa453d74d20231370a4b056fa2cd974be49413
+  metadata.gz: 85ea54efa8084fec3370c9109968566c25fc42e2c1dda0117af935509cdd3d04
+  data.tar.gz: 85d88db655be386be3fb03bcd0fdaf176b032a41d6ef0ee5025de6bfb3215bea
 SHA512:
-  metadata.gz: 3efa07e03c561a54c347f4a111c982556febe4f172fca436e6b3f0d85a01b1a1f1e3063fc1a2057de0a32e25a1d9514117ce58891b0e8db7cb3e4ee39d4141a8
-  data.tar.gz: 37a44b6922f19ff17b9acac7a7340c273e80ce9985d3bb905044a0a6f53db3a309138a219362d5a3dddbcf782c447742d8d1a030e50cb86dc259f3326dfa989c
+  metadata.gz: 32f2939a3411dd310790767e50da0dc331421752082a4f548d7e1c5dc2dffa82e3b5ea559afa9d570fc5398f0eaaa933b61184fad727b11c59162441aa390f69
+  data.tar.gz: bdcb847ece9af49935ec5497d053912e7114871463f1af9573e73441c7500609d7a5a80cd675d7971ae16219e84c76c7e15a3b7fe669f3bc7dcc1c58d2028719

data/lib/condenser/rails/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'action_view/helpers'
 require 'condenser'
 

data/lib/condenser/rails/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'action_view'
 require 'condenser'
 require 'active_support/core_ext/class/attribute'
@@ -61,75 +63,115 @@ module Condenser::Rails
     def asset_integrity(path, options = {})
       asset_resolver.integrity(path)
     end
-
-    # Override javascript tag helper to provide debugging support.
+    
+    # Get type for asset path. (module or nil for javascript)
+    #
+    # path    - String path
+    # options - Hash options
     #
-    # Eventually will be deprecated and replaced by source maps.
+    # Returns String integrity attribute or nil if no asset was found.
+    def asset_type(path, options = {})
+      asset_resolver.type(path)
+    end
+
+    # TODO: perhaps prepend this function and add integrity if set to true?
     def javascript_include_tag(*sources)
       options = sources.extract_options!.stringify_keys
       path_options = options.extract!("protocol", "extname", "host", "skip_pipeline").symbolize_keys
-      early_hints_links = []
+      preload_links = []
+      use_preload_links_header = options["preload_links_header"].nil? ? preload_links_header : options.delete("preload_links_header")
+      nopush = options["nopush"].nil? ? true : options.delete("nopush")
+      crossorigin = options.delete("crossorigin")
+      crossorigin = "anonymous" if crossorigin == true
+      integrity = options["integrity"]
 
       sources_tags = sources.uniq.map { |source|
         href = path_to_javascript(source, path_options)
-        early_hints_links << "<#{href}>; rel=preload; as=script"
-        tag_options = {
-          "src" => href
-        }.merge!(options)
+        integrity = if options["integrity"] == true
+          asset_integrity(source.to_s.delete_suffix('.js')+'.js')
+        elsif options["integrity"] != false
+          options["integrity"]
+        end
+        type = if !options.has_key?('type')
+          asset_type(source.to_s.delete_suffix('.js')+'.js') 
+        else
+          options["type"]
+        end
+        rel = options["type"] == "module" ? "modulepreload" : "preload"
         
+        if use_preload_links_header && !options["defer"] && href.present? && !href.start_with?("data:")
+          preload_link = "<#{href}>; rel=#{rel}; as=script"
+          preload_link += "; crossorigin=#{crossorigin}" unless crossorigin.nil?
+          preload_link += "; integrity=#{integrity}" unless integrity.nil?
+          preload_link += "; nonce=#{content_security_policy_nonce}" if options["nonce"] == true
+          preload_link += "; nopush" if nopush
+          preload_links << preload_link
+        end
+        tag_options = {
+          "src" => href,
+          "crossorigin" => crossorigin
+        }.merge!(options.except('integrity', 'type'))
         if tag_options["nonce"] == true
           tag_options["nonce"] = content_security_policy_nonce
         end
-        
-        if secure_subresource_integrity_context?
-          if tag_options["integrity"] == true
-            tag_options["integrity"] = asset_integrity(source.to_s.delete_suffix('.js')+'.js')
-          elsif tag_options["integrity"] == false
-            tag_options.delete('integrity')
-          end
-        else
-          tag_options.delete('integrity')
-        end
+        tag_options['type'] = type if type
+        tag_options['integrity'] = integrity if integrity
         
         content_tag("script", "", tag_options)
       }.join("\n").html_safe
 
-      request.send_early_hints("Link" => early_hints_links.join("\n")) if respond_to?(:request) && request
+      if use_preload_links_header
+        send_preload_links_header(preload_links)
+      end
 
       sources_tags
     end
 
-    # Override stylesheet tag helper to provide debugging support.
-    #
-    # Eventually will be deprecated and replaced by source maps.
+    # TODO: perhaps prepend this function and add integrity if set to true?
     def stylesheet_link_tag(*sources)
       options = sources.extract_options!.stringify_keys
-      path_options = options.extract!("protocol", "host", "skip_pipeline").symbolize_keys
-      early_hints_links = []
-
+      path_options = options.extract!("protocol", "extname", "host", "skip_pipeline").symbolize_keys
+      use_preload_links_header = options["preload_links_header"].nil? ? preload_links_header : options.delete("preload_links_header")
+      preload_links = []
+      crossorigin = options.delete("crossorigin")
+      crossorigin = "anonymous" if crossorigin == true
+      nopush = options["nopush"].nil? ? true : options.delete("nopush")
+      
       sources_tags = sources.uniq.map { |source|
         href = path_to_stylesheet(source, path_options)
-        early_hints_links << "<#{href}>; rel=preload; as=style"
+        integrity = if options["integrity"] == true
+          asset_integrity(source.to_s.delete_suffix('.css')+'.css')
+        elsif options["integrity"] != false
+          options["integrity"]
+        end
+
+        if use_preload_links_header && href.present? && !href.start_with?("data:")
+          preload_link = "<#{href}>; rel=preload; as=style"
+          preload_link += "; crossorigin=#{crossorigin}" unless crossorigin.nil?
+          preload_link += "; integrity=#{integrity}" unless integrity.nil?
+          preload_link += "; nopush" if nopush
+          preload_links << preload_link
+        end
         tag_options = {
           "rel" => "stylesheet",
-          "media" => "screen",
+          "crossorigin" => crossorigin,
           "href" => href
-        }.merge!(options)
-        
-        if secure_subresource_integrity_context?
-          if tag_options["integrity"] == true
-            tag_options["integrity"] = asset_integrity(source.to_s.delete_suffix('.css')+'.css')
-          elsif tag_options["integrity"] == false
-            tag_options.delete('integrity')
-          end
-        else
-          tag_options.delete('integrity')
+        }.merge!(options.except('integrity'))
+        if tag_options["nonce"] == true
+          tag_options["nonce"] = content_security_policy_nonce
         end
+        tag_options['integrity'] = integrity if integrity
 
+        if apply_stylesheet_media_default && tag_options["media"].blank?
+          tag_options["media"] = "screen"
+        end
+        
         tag(:link, tag_options)
       }.join("\n").html_safe
 
-      request.send_early_hints("Link" => early_hints_links.join("\n")) if respond_to?(:request) && request
+      if use_preload_links_header
+        send_preload_links_header(preload_links)
+      end
 
       sources_tags
     end
@@ -175,13 +217,16 @@ module Condenser::Rails
       end
 
       def asset_path(path)
-        @manifest[path]['path']
+        @manifest[path][:path]
       end
 
       def integrity(path)
-        @manifest[path]['integrity']
+        @manifest[path]&.[](:integrity)
       end
 
+      def type(path)
+        @manifest[path]&.[](:type)
+      end
     end
 
     class Environment #:nodoc:
@@ -201,7 +246,11 @@ module Condenser::Rails
       end
 
       def integrity(path)
-        @env.find(path)&.integrity
+        @env.find(path)&.export&.integrity
+      end
+
+      def type(path)
+        @env.find(path)&.export&.type
       end
 
       private

data/lib/condenser/rails/task.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 require 'rake/condensertask'
 require 'condenser'

data/lib/condenser/rails/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # based on http://cpan.uwinnipeg.ca/htdocs/Text-Glob/Text/Glob.pm.html#glob_to_regex_string from https://github.com/alexch/rerun/blob/master/lib/rerun/glob.rb
 
 module Condenser::Rails

data/lib/condenser/rails/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class Condenser
   module Rails
-    VERSION = "1.0"
+    VERSION = "1.2"
   end
 end

data/lib/condenser/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'condenser/rails/version'
 if defined? Rails::Railtie
   require 'condenser/railtie'

data/lib/condenser/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails'
 require 'rails/railtie'
 require 'action_controller/railtie'
@@ -58,14 +60,9 @@ class Condenser::Railtie < ::Rails::Railtie
     end
   end
   
-  module SassFunctions
-    def asset_path(path, options = {})
-      SassC::Script::Value::String.new(condenser_context.asset_path(path.value, options), :string)
-    end
-  end
-
   config.assets = OrderedOptions.new
   config.assets._blocks     = []
+  config.assets._pipeline   = nil
   config.assets.path        = []
   config.assets.precompile  = %w(application.css application.js **/*.jpg **/*.png **/*.gif)
   config.assets.prefix      = "/assets"
@@ -73,7 +70,7 @@ class Condenser::Railtie < ::Rails::Railtie
   
   config.assets.compile     = true
   config.assets.digest      = true
-  config.assets.cache_limit = 100.megabytes
+  config.assets.cache_limit = 1_000.megabytes
   config.assets.compressors = [:zlib]
 
   config.assets.configure do |app, env|
@@ -128,18 +125,10 @@ class Condenser::Railtie < ::Rails::Railtie
     config = app.config
 
     if config.assets._pipeline
-
+      config.assets._pipeline.call(env)
     else
-      env.register_transformer  'text/scss', 'text/css', Condenser::ScssTransformer.new({
-        functions: Condenser::Railtie::SassFunctions
-      })
-
-      if ::Rails.env == 'development'
-        env.register_preprocessor 'application/javascript', Condenser::JSAnalyzer
-      else
-        env.register_preprocessor 'application/javascript', Condenser::BabelProcessor
-      end
-    
+      env.register_transformer  'text/scss', 'text/css', Condenser::ScssTransformer.new
+      env.register_preprocessor 'application/javascript', Condenser::JSAnalyzer
       env.register_exporter       'application/javascript', Condenser::RollupProcessor
 
       if ::Rails.env != 'development'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condenser-rails
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.2'
 platform: ruby
 authors:
 - Jonathan Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2025-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: condenser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.rc1
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.rc1
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: Condenser integration for Rails