izi_lightup 1.0.2 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 971ccdb8cdb13d496b89ae7e2cd8ebe7847f55be9c4549ac4915741ed10edaab
-  data.tar.gz: 7c896250889a297cbd849b310fa6bda450e6258fb30f3d8fb5eeff6fe072b29e
+  metadata.gz: 53eb89af799d0a5092528a4159f8f67f042e3ce4eb30903fba949e116857c924
+  data.tar.gz: 9ae8a7f1c98d7b35fd4c31653f516845d190e3cd8d2642388765c44c5fee8e6f
 SHA512:
-  metadata.gz: b36f6456c5b05096e32166f658b4e5f1452bd530bc90d0ce9f817b19f768599092ed623e88dce68d2c7a1b44dd4491ffdc52a6959ca7cc24ebcd4d3608ff2f1e
-  data.tar.gz: d025222d627f6a9621608db1fd8fa7127938a9e749dc9bfc263e8a9c18afb912aa57ec6ebc86712fabd564e40b5972362a583d8924cd8992a556e54eaca8e595
+  metadata.gz: 1a424b4f1b656fd599cdb0e73a8e30dd86116ae4bf73fba550fdafea3eae52e7460627bc8f014fd8d8fb7d2e94a39d2fd7ce6ffc5825cc308197ccbc41473040
+  data.tar.gz: 80befcb20e4b325c8362a8da9f8b9b7f9d19573ea0cadc5e7d441f9a5b9c6ef59432b6e63ff0b435111bfe847343a320a279ad7a7d2db9b0850643e5d0894da0

data/app/assets/javascripts/crit-utils/async-css.js

@@ -1,2 +1,3 @@
-//= require cssrelpreload.js
+// loadCSS should be always BEFORE cssrelpreload
 //= require loadCSS.js
+//= require cssrelpreload.js

data/app/assets/javascripts/crit-utils/mini_require.js.coffee

@@ -15,7 +15,6 @@
   _buildSubscriptions = (id, node) ->
     data = __required[id]
     return if data.loaded
-    data.callbacks ||= []
 
     callback = node.onload
     node.onload = -> _onload(id)
@@ -34,13 +33,16 @@
 
   window.miniRequire ||= (key, source_url, callback = undefined) ->
     id = "source_#{key.replace(/[^a-z0-9_\-]+/ig, '_')}"
+    __required[id] ||= {loaded: false, callbacks: [], started: false}
 
-    # subscribe only if already attached
-    return _subscribe(id, callback) if __required[id]?
-
-    __required[id] = {loaded: false, callbacks: []}
     # subscribe only if no source
-    return _subscribe(id, callback) unless source_url?
+    return _subscribe(id, callback) unless source_url?.length > 0
+
+    # subscribe only if already attached & started
+    return _subscribe(id, callback) if __required[id].started
+
+    # mark as started
+    __required[id].started = true
 
     # attach script
     src = document.createElement('script')

data/app/helpers/critical_helper.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 module CriticalHelper
-  def css_preload(name)
-    link = content_tag :link, '', rel: 'preload', href: stylesheet_path(name), as: 'style', onload: 'this.rel="stylesheet"'
+  def css_preload(names)
+    return '' if names.blank?
+    names = Array.wrap(names)
+
+    link = stylesheet_link_tag(*names, rel: 'preload', as: 'style', onload: 'this.rel="stylesheet"')
     noscript = content_tag :noscript do
-      content_tag :link, '', rel: 'stylesheet', href: stylesheet_path(name)
+      stylesheet_link_tag(*names)
     end
 
     link + noscript
@@ -24,14 +27,22 @@ module CriticalHelper
     inline_js('crit-utils/bundle.js').presence || '<!-- CRIT JS NOT FOUND! -->'.html_safe
   end
 
-  def critical_css
+  def critical_css(params = {})
     name = find_scoped_css('critical')
-    return '<!-- CRIT CSS NOT FOUND! -->'.html_safe if name.blank?
+    stylesheets = Array.wrap(params.fetch(:stylesheets, []))
+    data = StringIO.new
 
-    return inline_css(name) if Rails.env.production?
+    if name.blank?
+      # insert stylesheets directly if not crit css
+      data << '<!-- CRIT CSS NOT FOUND! -->'
+      data << stylesheet_link_tag(*stylesheets) if stylesheets.present?
+    else
+      data << inline_css(name)
+      data << css_preload(stylesheets) if stylesheets.present?
+      data << inline_js('crit-utils/measure.js') if Rails.env.development?
+    end
 
-    # inject measure js for development
-    inline_css(name) + inline_js('crit-utils/measure.js')
+    data.string.html_safe
   end
 
   def smart_picture(object, *args, **xargs, &block)

data/lib/izi_lightup/inline_asset.rb

@@ -33,19 +33,21 @@ module IziLightup
       end
 
       def raw_source(asset_path)
-        return find_sources_fallback(asset_path) unless manifest.respond_to?(:find_sources)
+        return find_sources_fallback(asset_path) if old_manifest?
 
         manifest.find_sources(asset_path).first&.html_safe
       end
 
+      def old_manifest?
+        !manifest.respond_to?(:find_sources)
+      end
+
       def manifest
         @manifest ||= Rails.application.assets_manifest
       end
 
       def find_sources_fallback(asset_path)
-        src = manifest.send(:find_asset, asset_path)
-
-        src&.source&.html_safe || ''
+        Rails.application.assets.find_asset(asset_path)&.source&.html_safe
       end
     end
   end

data/lib/izi_lightup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IziLightup
-  VERSION = '1.0.2'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: izi_lightup
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.7
 platform: ruby
 authors:
 - IzikAJ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Utils to speed up page load by using critical css &
@@ -36,7 +36,8 @@ files:
 - vendor/assets/javascripts/cssrelpreload.js
 - vendor/assets/javascripts/loadCSS.js
 homepage: https://bitbucket.org/netfixllc/izi_lightup
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -53,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Izi Lightup