izi_lightup 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5108172541e60f3a8b2eaed8efc03115e2d3eb0c14879e480907fe30a3585536
-  data.tar.gz: 7c4ab5678444f8cc461d514c2cb00d4211b227d26544061a8a684d6d8788bf15
+  metadata.gz: d011babd1a4cfbeea73964467576025f53ef3e3a24dd14a90693078ab245859a
+  data.tar.gz: 720708d4116d9e985f45ad1c5c5e658b0bf315ad9195560a46166585e7b2c199
 SHA512:
-  metadata.gz: 1deb1629850ba7668d77b6037ec3c6c1aba160a3092cae084cc83941bc52f5326a8a9f25b4f9d9387a5cee8bd2479116575e572caea7cd049442ad21679d43a9
-  data.tar.gz: b1d013a65d6a6fdef8eeacb0a282a23b68cd74d61f31aa1702cb28fb5ceda8c1552663f935a432229fc6bb32455f55d31f9a21588fb8530af250cd13fd6edaf9
+  metadata.gz: 6e54a7446886a376f41cfa00fb94786f347413a03d00e070875baf00c6483e131c7b19afa6c745faf9e9be1ca4cea4085fdf454ec5c1e845750298362708937c
+  data.tar.gz: 6d99793e586bff9041a8e3e8cfdfcc207e01ea9a8fe5dae56840f623841001e898edb091c6e60da9448cdde6ee7670576d65c0bfa996d3232ebaa165ff0e845b

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

@@ -16,6 +16,7 @@
     data = __required[id]
     return if data.loaded
     data.callbacks ||= []
+    data.started = true
 
     callback = node.onload
     node.onload = -> _onload(id)
@@ -35,8 +36,8 @@
   window.miniRequire ||= (key, source_url, callback = undefined) ->
     id = "source_#{key.replace(/[^a-z0-9_\-]+/ig, '_')}"
 
-    # subscribe only if already attached
-    return _subscribe(id, callback) if __required[id]?
+    # subscribe only if already attached & started
+    return _subscribe(id, callback) if __required[id]?.started?
 
     __required[id] = {loaded: false, callbacks: []}
     # subscribe only if no source

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,12 +33,22 @@ module IziLightup
       end
 
       def raw_source(asset_path)
+        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)
+        Rails.application.assets.find_asset(asset_path)&.source&.html_safe
+      end
     end
   end
 end

data/lib/izi_lightup/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: izi_lightup
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - IzikAJ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 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