sewing_kit 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7f11b53cd7599867f27fe7bba0af1435d27713a
-  data.tar.gz: 9729034b26d91852ce43904dc8aa4b45198613a3
+  metadata.gz: 414255f60aa685249721e994b55a325c2651c46a
+  data.tar.gz: e30a4f36e0b77439df7f0195b8332716b464e712
 SHA512:
-  metadata.gz: 3fe8cb746cbd96023e855ba86ed583c2b86abd712e401999f1f960a75d94f24832f4d21aa1ba08890fc39d1d0471d6eff7fb65c428942dc4e10effe524cfe972
-  data.tar.gz: b30db6c8bf6f28aaf267ab79f4f1ecd797f6d7b1a618b8c7949efef6081e21a4dfbdfbe158e8bc428aaffe8030a15cd8c24c44cfb7b37e82b2dfba7fadb605dd
+  metadata.gz: 3eaed1acd08aeb49ca206c5e8f324bdff9b5e3f8d457771959122e51716cf3fda9e0ab1fdd4f6695f9eec51f2e17938baf17994ca20601bb5dde539789c9adaa
+  data.tar.gz: 0d312b594a84f4de70e9a73712ca8dd07e69ae7f16452849b16f24cfdee8b0b9b8ce5491af2caa7a065fb2cd9a1d99bda40680467338bbb76b79508baf8ad29f

data/lib/sewing_kit/version.rb

@@ -1,3 +1,3 @@
 module SewingKit
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/lib/sewing_kit/webpack/helper.rb

@@ -10,22 +10,24 @@ module SewingKit
       class UnknownJavaScriptAssetError < StandardError
       end
 
-      def sewing_kit_asset_paths(source, extension: 'js')
-        return '' unless source.present?
-        return '/webpack/assets/dll/vendor.js' if serve_development_asests? && 'vendor' == source && extension == 'js'
+      def sewing_kit_asset_paths(entrypointName, extension: 'js')
+        return '' unless entrypointName.present?
 
-        paths = SewingKit::Webpack::Manifest.asset_paths(source)
-        return '' unless paths[extension]
+        paths = SewingKit::Webpack::Manifest.asset_paths(entrypointName)
+        return '' unless paths && paths[extension]
 
-        [paths[extension]].flatten.reject { |path| path =~ /.*\.map$/ }
+        entryPaths = paths[extension]
+        if serve_development_assets? && extension == 'js'
+          entryPaths.unshift('/webpack/assets/dll/vendor.js')
+        end
+        entryPaths
       end
 
       def sewing_kit_link_tag(*paths)
-        return '' unless serve_compiled_assets?
-
         options = paths.extract_options!
 
         tags = paths.uniq.map { |path|
+          next '' if path == ''
           create_asset_tag(:link, path, options)
         }
 
@@ -36,9 +38,7 @@ module SewingKit
         options = paths.extract_options!
 
         tags = paths.uniq.map { |path|
-          if path == ''
-            next ''
-          end
+          next '' if path == ''
 
           create_asset_tag(:script, path, options)
         }
@@ -79,12 +79,8 @@ module SewingKit
         path.rpartition('-').last.split('.').first
       end
 
-      def serve_compiled_assets?
-        Rails.env.production? || ENV['SK_SIMULATE_PRODUCTION'] == '1'
-      end
-
-      def serve_development_asests?
-        return false if serve_compiled_assets?
+      def serve_development_assets?
+        return false if ENV['SK_SIMULATE_PRODUCTION'] == '1'
         Rails.env.development?
       end
     end

data/lib/sewing_kit/webpack/manifest.rb

@@ -11,43 +11,54 @@ module SewingKit
         end
       end
 
+      class LegacyManifestError < StandardError
+        def initialize(manifest)
+          super "manifest must contain 'entrypoints' key (found: #{manifest})"
+        end
+      end
+
       class << self
         # :nodoc:
-        def asset_paths(source)
-          paths = manifest[source]
-          paths || {}
+        def asset_paths(entrypointName)
+          metadata['entrypoints'][entrypointName]
         end
 
         def clear_cache!
-          @manifest = nil
-          @manifest_expiry_time = nil
+          @metadata = nil
+          @metadata_expiry_time = nil
         end
 
         def manifest
+          metadata['assets']
+        end
+
+        private
+
+        def metadata
           if ::Rails.env.production?
             # Cache at class level, as JSON loading/parsing can be expensive.
-            @manifest ||= load_manifest
+            @metadata ||= load_metadata
           else
             # In development, the manifest may change.
             # A short cache lifetime avoids time consuming node callouts.
-            if self.instance_variable_defined?('@manifest_expiry_time') && @manifest_expiry_time && @manifest_expiry_time >= Time.now
-              @manifest
+            if self.instance_variable_defined?('@metadata_expiry_time') && @metadata_expiry_time && @metadata_expiry_time >= Time.now
+              @metadata
             else
-              @manifest = load_manifest
-              @manifest_expiry_time = Time.now + 4
+              @metadata = load_metadata
+              @metadata_expiry_time = Time.now + 4
             end
           end
 
-          @manifest
-        end
+          raise LegacyManifestError.new(@metadata) if !@metadata['entrypoints']
 
-        private
+          @metadata
+        end
 
         def manifest_bundled?
           !manifest["errors"].any? { |error| error.include? "Module build failed" }
         end
 
-        def load_manifest
+        def load_metadata
           JSON.parse(`node_modules/.bin/sewing-kit manifest --mode #{mode}`)
         rescue => e
           raise ManifestLoadError.new("Could not load compiled manifest - have you run `rake sewing_kit:build`?", e)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sewing_kit
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Chris Sauve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-22 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties