inline_svg 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a99965e52653f93e240ebb18b14f297cc4b5aecc57c6e197ada33ce84302093f
-  data.tar.gz: 1c5d9383f1306f5ca3bbd68f632b1f21bb9fb1ed91098adc4b117b128b585ace
+  metadata.gz: 555d915ade77dc1d2c18d693d5b0336ecaac627990362c115552904a41e262b3
+  data.tar.gz: 4f02d2b91b2dba08bc704c26abc7819c8c842f66e43a2d52e72d4a81992837da
 SHA512:
-  metadata.gz: 33248af239e80b6baa859cbca95d74e5cc9a677a7538714e502ae8c8e7bd4686e734a60c65c72e14fdd88bfbfc33ddf8a1700cf47c5bbc13741baa620cf6ef07
-  data.tar.gz: 72fac7ad8976f22a3842bbb1cf845539744e7d242ad243c19ae572b10206a43efacb483ffd5749a8a2b8167caccee482b4e0f21418aa87c142810091c78645cb
+  metadata.gz: '09cfe90081a06913b29349d270a5328971cced98bdc7b087571f0669b80d3ee70f44e3d471dc879a2a805d6c77138269687280d006133f898cfbaeee65873830'
+  data.tar.gz: 4a2a278a9166cc18934b0745c02f699ceea1db20cbbd132bbe4816d703f424ae058cb9e46d270ad8f3836834cc29b090c2821f0fe8b402e5c0b2135ac4e1c1a8

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased][unreleased]
 - Nothing
 
+## [1.5.2] - 2019-06-20
+### Fixed
+- Revert automatic Webpack asset finder behavior. Make Webpack "opt-in".
+  [#98](https://github.com/jamesmartin/inline_svg/issues/98)
+
 ## [1.5.1] - 2019-06-18
 ### Fixed
 - Prevent nil asset finder when neither Sprockets or Webpacker are available
@@ -209,7 +214,8 @@ transformations](https://github.com/jamesmartin/inline_svg/blob/master/README.md
 ### Added
 - Basic Railtie and view helper to inline SVG documents to Rails views.
 
-[unreleased]: https://github.com/jamesmartin/inline_svg/compare/v1.5.1...HEAD
+[unreleased]: https://github.com/jamesmartin/inline_svg/compare/v1.5.2...HEAD
+[1.5.2]: https://github.com/jamesmartin/inline_svg/compare/v1.5.1...v1.5.2
 [1.5.1]: https://github.com/jamesmartin/inline_svg/compare/v1.5.0...v1.5.1
 [1.5.0]: https://github.com/jamesmartin/inline_svg/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/jamesmartin/inline_svg/compare/v1.3.1...v1.4.0

data/README.md

@@ -14,7 +14,19 @@ Inline SVG supports:
 - [Rails 3](http://weblog.rubyonrails.org/2010/8/29/rails-3-0-it-s-done/) (from [v0.12.0](https://github.com/jamesmartin/inline_svg/releases/tag/v0.12.0))
 - [Rails 4](http://weblog.rubyonrails.org/2013/6/25/Rails-4-0-final/)
 - [Rails 5](http://weblog.rubyonrails.org/2016/6/30/Rails-5-0-final/) (from [v0.10.0](https://github.com/jamesmartin/inline_svg/releases/tag/v0.10.0))
-- [Rails 6](https://weblog.rubyonrails.org/2019/4/24/Rails-6-0-rc1-released/) with Sprockets or Webpacker (from [v1.5.0](https://github.com/jamesmartin/inline_svg/releases/tag/v1.5.0)).
+- [Rails 6](https://weblog.rubyonrails.org/2019/4/24/Rails-6-0-rc1-released/) with Sprockets or Webpacker (from [v1.5.2](https://github.com/jamesmartin/inline_svg/releases/tag/v1.5.2)).
+
+## Webpacker
+
+
+Webpacker support is currently "opt-in" and must be manually configured like
+so:
+
+```ruby
+InlineSvg.configure do |config|
+  config.asset_finder = InlineSvg::WebpackAssetFinder
+end
+```
 
 ## Changelog
 
@@ -308,29 +320,6 @@ InlineSvg.configure do |config|
 end
 ```
 
-## Sprockets and Webpacker
-
-Inline SVG supports SVGs bundled by either Sprockets or Webpacker, however, be
-aware that the gem will *always* attempt to find SVGs using Sprockts if it is
-enabled.
-
-By default, Inline SVG will use Sprockets to find SVG files if it is enabled in
-your Rails project.
-
-If you have upgraded an older Rails project from Sprockets to Webpacker and you
-no longer want to use Sprockets at all, you should disable the Asset Pipeline
-and Inline SVG will use Webpacker automatically.
-
-If you have both Sprockets *and* Webpacker enabled for some reason and you want
-Inline SVG to use Webpacker to find SVGs then you should configure the
-`asset_finder` appropriately:
-
-```ruby
-InlineSvg.configure do |config|
-  config.asset_finder = InlineSvg::WebpackAssetFinder
-end
-```
-
 ## Contributing
 
 1. Fork it ( [http://github.com/jamesmartin/inline_svg/fork](http://github.com/jamesmartin/inline_svg/fork) )

data/lib/inline_svg/railtie.rb

@@ -14,19 +14,9 @@ module InlineSvg
         # Only set this when a user-configured asset finder has not been
         # configured already.
         if config.asset_finder.nil?
-          if assets = app.instance_variable_get(:@assets)
-            # In default Rails apps, this will be a fully operational
-            # Sprockets::Environment instance
-            config.asset_finder = assets
-          elsif defined?(Webpacker)
-            # Use Webpacker when it's available
-            config.asset_finder = InlineSvg::WebpackAssetFinder
-          else
-            # Fallback to the StaticAssetFinder if all else fails.
-            # This will be used in cases where assets are precompiled and other
-            # production settings.
-            config.asset_finder = InlineSvg::StaticAssetFinder
-          end
+          # In default Rails apps, this will be a fully operational
+          # Sprockets::Environment instance
+          config.asset_finder = app.instance_variable_get(:@assets)
         end
       end
     end

data/lib/inline_svg/version.rb

@@ -1,3 +1,3 @@
 module InlineSvg
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_svg
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - James Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler