sewing_kit 0.8.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c158fee225e3c96470ca32e8af145fc261e9de9d
-  data.tar.gz: 41b8baaa9f319ce1bc985383f7e2a1fe6168fb3e
+  metadata.gz: 767dcb5c1f9643937e519b07940c286ef42c1c6a
+  data.tar.gz: 3744a04508c81a91b90bdf72d5d0f43eb5ee17e8
 SHA512:
-  metadata.gz: c3b3adcaa26e1185fd5515387d0eb2c1c965a79f432b350601569a1a9f634175c3a703fa5ba89d151e7e185177eb8d4afc124f50cf43420391a55fcc1b4d047d
-  data.tar.gz: 35d946b5848e8353213ab8d81f7627524e435e5220d70f04f70065808f78a62dd6a948e9a28d672e683120812ffaa1b48d310cc41ce21f48c1b59a49b69d10bb
+  metadata.gz: deaefac1ed2b3d39f233bdfbaa6d23c7fa32f8a8d827878d1b416e26782f5f5d42fde18487a733653d570d4f293a3747230a90c28601f9c2602e0a43c0885534
+  data.tar.gz: c1b7e41ef24ba24aff7d0812b3da10b879c4618e991266d8c58674ec67cf039058339f9dc0a2149a89f7f9d2d74d011fb57eb5f76db19c642775f5ee0dc9c832

data/README.md

@@ -28,8 +28,8 @@ sewing_kit looks for JavaScript in `app/ui/index.js`.  The code in `index.js` (a
 The `main` bundle is imported into `erb` files using Rails helpers:
 
 ```erb
-<%= sewing_kit_link_tag *sewing_kit_asset_paths('main') %>
-<%= sewing_kit_script_tag *sewing_kit_asset_paths('main') %>
+<%= sewing_kit_link_tag *sewing_kit_assets('main') %>
+<%= sewing_kit_script_tag *sewing_kit_assets('main') %>
 ```
 
 **Note:** CSS `<link>` tags appear only in production; in development, CSS is embedded within the `main.js` bundle.

data/lib/sewing_kit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module SewingKit
-  VERSION = "0.8.0"
+  VERSION = "0.27.0"
 end

data/lib/sewing_kit/webpack/helper.rb

@@ -11,35 +11,38 @@ module SewingKit
       class UnknownJavaScriptAssetError < StandardError
       end
 
-      def sewing_kit_asset_paths(entrypoint_name, extension: 'js')
+      Asset = Struct.new(:path, :integrity)
+
+      def sewing_kit_assets(entrypoint_name, extension: 'js')
         return '' unless entrypoint_name.present?
 
-        paths = SewingKit::Webpack::Manifest.asset_paths(entrypoint_name)
-        return '' unless paths && paths[extension]
+        assets = SewingKit::Webpack::Manifest.asset_dependencies(entrypoint_name)
+        return [] unless assets && assets[extension]
 
-        entry_paths = paths[extension]
-        entry_paths.unshift('/webpack/assets/dll/vendor.js') if serve_development_assets? && extension == 'js'
-        entry_paths
+        dependencies = assets[extension]
+        dependencies.unshift(dll_asset) if serve_development_assets? && extension == 'js'
+        dependencies.map do |raw_asset|
+          Asset.new(raw_asset['path'], raw_asset['integrity'])
+        end
       end
 
-      def sewing_kit_link_tag(*paths)
-        options = paths.extract_options!
+      def sewing_kit_link_tag(*assets)
+        options = assets.extract_options!
 
-        tags = paths.uniq.map do |path|
-          next '' if path == ''
-          create_asset_tag(:link, path, options)
+        tags = assets.uniq.map do |asset|
+          next '' if asset.path == ''
+          create_asset_tag(:link, asset, options)
         end
 
         safe_join(tags, "\n")
       end
 
-      def sewing_kit_script_tag(*paths)
-        options = paths.extract_options!
-
-        tags = paths.uniq.map do |path|
-          next '' if path == ''
+      def sewing_kit_script_tag(*assets)
+        options = assets.extract_options!
+        tags = assets.map do |asset|
+          next '' if asset.path == ''
 
-          create_asset_tag(:script, path, options)
+          create_asset_tag(:script, asset, options)
         end
 
         safe_join(tags, "\n")
@@ -47,46 +50,33 @@ module SewingKit
 
       private
 
-      def create_asset_tag(tag_type, path, tag_options)
+      def create_asset_tag(tag_type, asset, tag_options)
         raise ArgumentError, "Invalid tag type: #{tag_type}" unless [:script, :link].include? tag_type
 
         options = tag_options.clone
 
-        if tag_options[:integrity]
-          file_hash = extract_hash(path)
-          options[:integrity] = maybe_integrity(file_hash)
+        if tag_options[:integrity] && asset.integrity
+          options[:integrity] = asset.integrity
+        else
+          options.delete(:integrity)
         end
 
         case tag_type
         when :script
-          content_tag(:script, '', options.reverse_merge(src: path))
+          content_tag(:script, '', options.reverse_merge(src: asset.path))
         when :link
-          tag(:link, options.reverse_merge(href: path, rel: 'stylesheet'))
+          tag(:link, options.reverse_merge(href: asset.path, rel: 'stylesheet'))
         end
       end
 
-      def maybe_integrity(file_hash)
-        return nil unless file_hash
-        encode_hash(file_hash)
-      end
-
-      def encode_hash(hash)
-        # sewing-kit's default config places a sha256 hash in the filename. Browsers expect integrity
-        # to be the Base64 encoded version of the binary hash prefixed with the hashing algorithm
-        binary_hash = Array(hash).pack('H*')
-        "sha256-#{Base64.strict_encode64(binary_hash)}"
-      end
-
-      def extract_hash(path)
-        # Consumes sewing-kit's [name]-[chunkhash].[ext] format
-        return unless path =~ /.*-[A-Za-z0-9]{64}\.(js|css)/
-        path.rpartition('-').last.split('.').first
-      end
-
       def serve_development_assets?
         return false if ENV['SK_SIMULATE_PRODUCTION'] == '1'
         Rails.env.development?
       end
+
+      def dll_asset
+        Asset.new('/webpack/assets/dll/vendor.js')
+      end
     end
   end
 end

data/lib/sewing_kit/webpack/manifest.rb

@@ -47,8 +47,8 @@ module SewingKit
 
       class << self
         # :nodoc:
-        def asset_paths(entrypoint_name)
-          instance.asset_paths(entrypoint_name)
+        def asset_dependencies(entrypoint_name)
+          instance.asset_dependencies(entrypoint_name)
         end
 
         def clear_cache!
@@ -61,7 +61,9 @@ module SewingKit
 
         def instance
           return @instance if @instance
-          @instance = if Rails.env.development? && ENV['SK_SIMULATE_PRODUCTION'] != '1'
+
+          mode = ENV['NODE_ENV'] || Rails.env.to_s
+          @instance = if mode == 'development' && ENV['SK_SIMULATE_PRODUCTION'] != '1'
             Development.new
           else
             Production.new

data/lib/sewing_kit/webpack/manifest/base.rb

@@ -8,7 +8,7 @@ module SewingKit
         end
 
         # :nodoc:
-        def asset_paths(entrypoint_name)
+        def asset_dependencies(entrypoint_name)
           metadata['entrypoints'][entrypoint_name]
         end
 
@@ -22,7 +22,7 @@ module SewingKit
 
         def load_metadata_from_node
           begin
-            stdout, * = Open3.capture3('node_modules/.bin/sewing-kit', 'manifest', "-- mode #{mode}")
+            stdout, * = Open3.capture3('node_modules/.bin/sewing-kit', 'manifest', "--mode=#{mode}")
           rescue => e
             raise NodeSewingKitNotRunnable.new(mode, e)
           end
@@ -34,10 +34,10 @@ module SewingKit
           end
         end
 
-        private
+        protected
 
         def mode
-          Rails.env.to_s || 'production'
+          ENV['NODE_ENV'] || Rails.env.to_s || 'production'
         end
       end
     end

data/lib/sewing_kit/webpack/manifest/development.rb

@@ -47,6 +47,12 @@ module SewingKit
             raise ManifestParseError, e
           end
         end
+
+        protected
+
+        def mode
+          'development'
+        end
       end
     end
   end

data/lib/sewing_kit/webpack/manifest/production.rb

@@ -9,7 +9,7 @@ module SewingKit
         @metadata_path = nil
 
         # :nodoc:
-        def asset_paths(entrypoint_name)
+        def asset_dependencies(entrypoint_name)
           metadata['entrypoints'][entrypoint_name]
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sewing_kit
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Chris Sauve