minipack 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc8eca1d1f23c89720efbc82ceaa6afe4b914295e42be8edd661a22bdedafe43
-  data.tar.gz: b8fa5684228e7d29882f98c1cff298414f48cb8df94929ee215560b081e355a3
+  metadata.gz: d47e53dced7bb9112a2b25cc87e72afc8b46d6f8e0094e3e45ebad30658025b3
+  data.tar.gz: 501f45243494b6eb9d0923d77f5556176b37b9b285c22222d734a46aba14b6c9
 SHA512:
-  metadata.gz: ccd21785cac03e000600d35917f51f5a263b01c356ad07cb74ed6c26a9fc8fdee2620856416769405560308c3b8a5f4d501827399ebde570b0444c71868fe642
-  data.tar.gz: 90f9e18cdf3b56ce4d102ad7603579799398cbd44496e673950a717c7af5d7fa5db0211df571bb09edf44da3dbfe4d4fa13db6ba0a3b9ce203e1fe67aebf282a
+  metadata.gz: 8657e7b6dc81587b777a8308bf92df6167ba941b778b2549dc52b4e013ea28aeb414a97142597aaf88d7999f3868cf502e123dd7b9fe086020c249e831615883
+  data.tar.gz: 15c4be737e9477a05ae44bcb3873761ccea785159930f2c07ac9604d0d86c5670fd4f4b6ea78279de381776f10dea7d662d2690222faa59baa1b8e2546d8526f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.4 / 2020-01-26
+
+## Bug fixes
+
+* Add support for integrity attribute when using experimental splitChunks (#27) by @Jukejc
+
 # 0.3.3 / 2019-09-12
 
 ## Enhancements:

data/lib/minipack/helper.rb

@@ -41,7 +41,9 @@ module Minipack::Helper
   # <%= javascript_bundles_with_chunks_tag 'calendar' %>
   # <%= javascript_bundles_with_chunks_tag 'map' %>
   def javascript_bundles_with_chunks_tag(*names, manifest: nil, **options)
-    javascript_include_tag(*sources_from_manifest_entrypoints(names, 'js', key: manifest), **options)
+    sources_from_manifest_entrypoints(names, 'js', key: manifest).map { |entry|
+      javascript_include_tag(entry.path, **options_for(entry, options))
+    }.join("\n").html_safe
   end
 
   # Examples:
@@ -76,7 +78,9 @@ module Minipack::Helper
   # <%= stylesheet_bundles_with_chunks_tag 'map' %>
   def stylesheet_bundles_with_chunks_tag(*names, manifest: nil, **options)
     if Minipack.configuration.extract_css?
-      stylesheet_link_tag(*sources_from_manifest_entrypoints(names, 'css', key: manifest), **options)
+      sources_from_manifest_entrypoints(names, 'css', key: manifest).map { |entry|
+        stylesheet_link_tag(entry.path, **options_for(entry, options))
+      }.join("\n").html_safe
     end
   end
 
@@ -101,7 +105,7 @@ module Minipack::Helper
 
   def sources_from_manifest_entrypoints(names, type, key: nil)
     manifest = get_manifest_by_key(key)
-    names.map { |name| manifest.lookup_pack_with_chunks!(name, type: type).entries.map(&:path) }.flatten.uniq
+    names.map { |name| manifest.lookup_pack_with_chunks!(name, type: type).entries }.flatten.uniq
   end
 
   def get_manifest_by_key(key = nil)

data/lib/minipack/manifest.rb

@@ -51,7 +51,12 @@ module Minipack
       manifest_pack_type = manifest_type(name, type)
       manifest_pack_name = manifest_name(name, manifest_pack_type)
       paths = data['entrypoints']&.dig(manifest_pack_name, manifest_pack_type) || handle_missing_entry(name)
-      ChunkGroup.new(paths)
+
+      entries = data['entrypoints']&.dig(manifest_pack_name, manifest_pack_type).map do |source|
+        entry_from_source(source) || handle_missing_entry(name)
+      end
+
+      ChunkGroup.new(entries)
     end
 
     def lookup!(name)
@@ -122,5 +127,16 @@ module Minipack
         #{JSON.pretty_generate(@data)}
       MSG
     end
+
+    # Find an entry by its source
+    #
+    # @param [String] source
+    # @return [Minipack::Entry,nil]
+    def entry_from_source(source)
+      entry = assets.find { |entry| entry.is_a?(String) ? entry == source : entry['src'] == source }
+      return unless entry
+      entry.is_a?(String) ? Entry.new(entry) : Entry.new(entry['src'], integrity: entry['integrity'])
+    end
   end
 end
+

data/lib/minipack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Minipack
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minipack
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Nobuhiro Nikushi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2020-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview