izi_lightup 1.0.3 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b753cd65a5809c20e73ff45888da3522becc09c96cc201716f559f9cc4ee6e
-  data.tar.gz: 2a7081b56841e5d53c9f792ff17f7becdeef6f7eeb062d23a9d48067904ffbb5
+  metadata.gz: e07a49f206c6fb345cf0b7bbc5fbc2b97c7eb7ebe6d0a67b40249c0efcb8d3cb
+  data.tar.gz: c14d54784f732666060f993b8f3dd2c344e9c3cbf4247e836d9a7a92e395b1a0
 SHA512:
-  metadata.gz: cb847e6b534e9b4796078be0ec691a8eeb530bbad14b1c964c8a138b6ebb5166642dfbf3d85e25bbfa25eeb397f98c7ab9fee2efc6bbea2c51036c226fe60d27
-  data.tar.gz: aab2c944301d19dda2f2a088059a2c2bd63d509470b5ae8aebbb203fa474d87d8eb1803a98cf179128aa6e585074f2ef7cf41275a033fc6fb8eecafd50fb0513
+  metadata.gz: 45f511555379a877ce6da9caaea827e5fecb924e63ab2ab1410860fdcd484089fe4ca01fd3fe744b2a65691aca3190c0c795a8e8d96eaf9f326f4aa8263086cb
+  data.tar.gz: 7de673a26083b07cb3c8ad2828c6b6118930aaf71a0baa4e33cc7c0dd4fb57e017c572199b3f9ec8503e84e08f79f8017d1c12a475518c2dea86421083603476

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,23 @@ module CriticalHelper
     inline_js('crit-utils/bundle.js').presence || '<!-- CRIT JS NOT FOUND! -->'.html_safe
   end
 
-  def critical_css
-    name = find_scoped_css('critical')
-    return '<!-- CRIT CSS NOT FOUND! -->'.html_safe if name.blank?
+  def critical_css(params = {})
+    scope = params.fetch(:scope, 'critical')
+    name = find_scoped_css(scope)
+    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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: izi_lightup
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.8
 platform: ruby
 authors:
 - IzikAJ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Utils to speed up page load by using critical css &
@@ -54,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