sewing_kit 0.91.0 → 0.92.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f6d423df01ea72b33c61ce184e02adec82b1e10b5e490b0be2b125270357982
-  data.tar.gz: 54493dde6260a14b4a4bd364541c166a4521c588b8a3ae2191cfe60b12e89b63
+  metadata.gz: 2b5d379f248e1cb49dbdc63d5c6a1ae02a8b2368f3101f00d55f38e6d3dbfecc
+  data.tar.gz: b118d063e8d4075d9f545a9bd62d5448298880a482f2093ff8601df12791a108
 SHA512:
-  metadata.gz: a426f2fdf3447168389f235512c268832e0c841f216cbcb8f5b8e65c8815deb8d696bab5b702d5c35b6cbbcf686fb4a1182694b99660fb0525a81a84dd92611b
-  data.tar.gz: ddaf36cd7851bce4d400e78af172c5f66ecb7404fea9e47c424f405e9feda62f1792b2bc4acba372257dd3300c3b81a7d566a04e6b4101a7003c1c0be5d8c9f2
+  metadata.gz: 386f8b2cdecd5b9dc7c5cdfb40bedc9577492a5d96dcd6038ea936f4d47ddf0ade31c8e9422d7f153f96731a1a551f175f292dcc339980d5f401f7bb9b60e1a5
+  data.tar.gz: 413a472e7349f6a21d1a3532c2a511b5c36474ee7b442f0aa6f030ee298ec0d005643ca804cd8872062e91e2558ffc752d65ac9d440b4aa5d2742b22f026e0b2

data/lib/sewing_kit/configuration.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 module SewingKit
   class Configuration
-    attr_accessor :build_options, :dev_server_sewing_kit_bin
+    attr_accessor :build_options, :dev_server_sewing_kit_bin, :manifest_name
 
     def initialize
       @build_options = nil
+      @manifest_name = 'sewing-kit-manifest.json'
       @dev_server_sewing_kit_bin = 'node_modules/.bin/sewing-kit'
     end
   end

data/lib/sewing_kit/railtie.rb

@@ -16,14 +16,10 @@ require 'sewing_kit/webpack/dev'
 
 module SewingKit
   class Railtie < ::Rails::Railtie
-    initializer "sewing_kit.cache_production_manifest" do
-      unless SewingKit::Railtie.development_server? || Rails.env.test?
-        SewingKit::CachedProductionManifest = SewingKit::Webpack::Manifest::Base.load_metadata_from_node
-      end
-    end
     # rubocop:disable Metrics/BlockLength
     config.after_initialize do
-      if SewingKit::Railtie.development_server?
+      is_development = Rails.env.development? && ENV['SK_SIMULATE_PRODUCTION'] != '1'
+      if is_development && (Rails.const_defined?(:Server) || ENV['SK_FORCE_DEV_SERVER'])
         webpack_dev = SewingKit::Webpack::Dev.new
         webpack_dev.start
       end
@@ -32,14 +28,10 @@ module SewingKit
         include SewingKit::Webpack::Helper
       end
     end
+    # rubocop:enable Metrics/BlockLength
+
     rake_tasks do
       load "tasks/sewing_kit.rake"
     end
-
-    def self.development_server?
-      Rails.env.development? &&
-        ENV['SK_SIMULATE_PRODUCTION'] != '1' &&
-        (Rails.const_defined?(:Server) || ENV['SK_FORCE_DEV_SERVER'])
-    end
   end
 end

data/lib/sewing_kit/version.rb

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

data/lib/sewing_kit/webpack/manifest.rb

@@ -7,23 +7,15 @@ module SewingKit
     # Webpack manifest loading, caching & entry point retrieval
     class Manifest
       class NodeSewingKitManifestMissing < StandardError
-        def initialize(mode, node_error_message)
-          env_message = if 'production' == mode
-            "\nIf this is a container build:\n" \
-            "  - Verify that sewing_kit compilation succeeded before deployment\n" \
-            "  - Verify that public/bundles/sewing-kit.manifest.json was uploaded\n" \
-            "  - Verify that public/bundles/sewing-kit.manifest.json exists in the container\n" \
-          else
-            "\nPossible next steps:\n" \
-            " - If the server is still starting up, wait for a 'Compiled with latest changes' message" \
-            " then refresh your browser\n" \
-            " - Check the development console for compilation errors\n" \
-            " - Restart your development server\n"
-          end
-
+        def initialize(node_error_message)
           super(
-            "Could not fetch the sewing-kit manifest 🙀  " \
-            "#{env_message}\n" \
+            "Could not fetch the sewing-kit manifest 🙀  \n" \
+            "Possible next steps:\n" \
+            " - If the server is still starting up, wait for a "  \
+            "'Compiled with latest changes' message then refresh your browser\n" \
+            " - Check the development console for compilation errors\n" \
+            " - Restart your development server\n" \
+            "\n" \
             "Original error #{node_error_message}"
           )
         end
@@ -59,7 +51,6 @@ module SewingKit
 
         def instance
           mode = ENV['NODE_ENV'] || Rails.env.to_s
-
           @instance ||= if (mode == 'development' && ENV['SK_SIMULATE_PRODUCTION'] != '1') || Rails.env.test?
             Development.new
           else

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

@@ -35,24 +35,24 @@ module SewingKit
           end
         end
 
-        def self.load_metadata_from_node
-          begin
-            stdout, stderr, status = Open3.capture3('node_modules/.bin/sewing-kit', 'manifest', "--mode=#{mode}")
-          rescue => e
-            raise NodeSewingKitNotRunnable.new(mode, e)
-          end
-
-          raise NodeSewingKitManifestMissing.new(mode, stderr) unless status.success?
+        protected
 
+        def load_metadata_from_fs(path)
           begin
-            JSON.parse(stdout)
+            content = File.read(path)
           rescue => e
-            raise ManifestParseError, e
+            raise ManifestLoadError.new(path, e)
           end
+
+          parse_metadata(content)
         end
 
-        def self.mode
-          ENV['NODE_ENV'] || Rails.env.to_s || 'production'
+        private
+
+        def parse_metadata(json)
+          JSON.parse(json)
+        rescue => e
+          raise ManifestParseError, e
         end
       end
     end

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

@@ -43,28 +43,14 @@ module SewingKit
             @metadata_path = nil
           end
 
-          result = SewingKit::Webpack::Manifest::Base.load_metadata_from_node
+          result = load_metadata_from_node
 
           metadata = normalize_metadata(result)
           @metadata_path = metadata && metadata['path']
           metadata
         end
 
-        def load_metadata_from_fs(path)
-          begin
-            json_str = File.read(path)
-          rescue => e
-            raise ManifestLoadError.new(path, e)
-          end
-
-          begin
-            JSON.parse(json_str)
-          rescue => e
-            raise ManifestParseError, e
-          end
-        end
-
-        protected
+        private
 
         def normalize_metadata(maybe_array_metadata)
           if maybe_array_metadata.is_a?(Array)
@@ -74,8 +60,18 @@ module SewingKit
           end
         end
 
-        def mode
-          'development'
+        def load_metadata_from_node
+          begin
+            stdout, stderr, status = Open3.capture3(
+              'node_modules/.bin/sewing-kit', 'manifest', "--mode=development"
+            )
+          rescue => e
+            raise NodeSewingKitNotRunnable.new('development', e)
+          end
+
+          raise NodeSewingKitManifestMissing, stderr unless status.success?
+
+          parse_metadata(stdout)
         end
       end
 

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

@@ -15,7 +15,7 @@ module SewingKit
         end
 
         def metadata
-          SewingKit::CachedProductionManifest
+          @metadata ||= load_metadata
         end
 
         private
@@ -38,6 +38,14 @@ module SewingKit
 
           found || consolidated_metadata.last
         end
+
+        def load_metadata
+          load_metadata_from_fs(path)
+        end
+
+        def path
+          File.join(Rails.root, 'public', 'bundles', SewingKit.configuration.manifest_name)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sewing_kit
 version: !ruby/object:Gem::Version
-  version: 0.91.0
+  version: 0.92.0
 platform: ruby
 authors:
 - Chris Sauve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties