izi_lightup 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0ddd7b35185578e102f284a179246105ec9acb0f3c77c44fd7dee54d72933e1
-  data.tar.gz: 62872691110bfda58f936641bb05c86ff7093416d81f23bc153fb6a9282555d5
+  metadata.gz: 5073e2bc71a83daded40f2e37f2fef08c898ad94a0bcc3eaa9eb4e681c976f25
+  data.tar.gz: 007fbd9ef27b45f3be8bfd3a9c4f9d0d5e75c58b9b088b058601d3ce7bd5d39b
 SHA512:
-  metadata.gz: de7acb385a35f06e9ce332cb04d5d7564482758b48826a5a2926b19fa7499e3816976fcefddfcedc4bd671ce0c4a42c92bd491d90ba2c7012d022969bbef04ab
-  data.tar.gz: 4672a0cc352ffb84c2937c5b08a78b1e10870126238c3a338e5e485779bd97dc0224fd1b3db6fb0569bbed1157bb690138038e69f29422035f9207fc4cdc718e
+  metadata.gz: 2b64daf46ffba3f48ba0be2c3663be9eb140c4b15e486b3d0842ebfec7bfb393715c4d44753cae098f24479d2848a43e7f70f7aa85a48ee67dc2f3513e5b8a29
+  data.tar.gz: 3ea7878407d5c0a244e2f03f6bcc3f5dc7915ea32a0376bd3999c73abf29ffd52e3f2a08cd94a84b9937e70fbe816a3bcefe9e5cb9168a2ddd497fb2a9f81cdb

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

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

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/engine.rb

@@ -12,6 +12,7 @@ module IziLightup
 
       loadCSS.js
       cssrelpreload.js
+      crit-utils/async-css.js
     ]
   end
 end

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.0'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: izi_lightup
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - IzikAJ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Utils to speed up page load by using critical css &
@@ -20,6 +20,7 @@ extra_rdoc_files: []
 files:
 - README.rdoc
 - app/assets/javascripts/crit-utils/active_emit.js.coffee
+- app/assets/javascripts/crit-utils/async-css.js
 - app/assets/javascripts/crit-utils/bundle.js
 - app/assets/javascripts/crit-utils/measure.js
 - app/assets/javascripts/crit-utils/measure/cls.js.coffee
@@ -35,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: []