Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* Added --benchmark, to compare performance of each tool [#217](https://github.com/toy/image_optim/issues/217) [#218](https://github.com/toy/image_optim/pull/218) [@gurgeous](https://github.com/gurgeous)
* Don't require presence of `git` in gemspec [@toy](https://github.com/toy)
* Add a basic check for names of enabled and disabled svgo plugins [@toy](https://github.com/toy)
* Add support for enabling/disabling plugins in svgo 2.x, 3.x, 4.x [#191](https://github.com/toy/image_optim/issues/191) [#224](https://github.com/toy/image_optim/pull/224) [@tomhughes](https://github.com/tomhughes)

## v0.31.4 (2024-11-19)

Expand Down
41 changes: 36 additions & 5 deletions lib/image_optim/worker/svgo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

require 'image_optim/option_helpers'
require 'image_optim/worker'
require 'fspath'

class ImageOptim
class Worker
Expand Down Expand Up @@ -42,11 +43,18 @@ def optimize(src, dst, options = {})
--input #{src}
--output #{dst}
]
disable_plugins.each do |plugin_name|
args.unshift "--disable=#{plugin_name}"
end
enable_plugins.each do |plugin_name|
args.unshift "--enable=#{plugin_name}"
if resolve_bin!(:svgo).version >= '2.0.0'
unless disable_plugins.empty? && enable_plugins.empty?
config_file = plugins_config_file
args.unshift "--config=#{config_file.path}"
end
else
disable_plugins.each do |plugin_name|
args.unshift "--disable=#{plugin_name}"
end
enable_plugins.each do |plugin_name|
args.unshift "--enable=#{plugin_name}"
end
end
args.unshift "--precision=#{precision}" if allow_lossy
execute(:svgo, args, options) && optimized?(src, dst)
Expand All @@ -63,6 +71,29 @@ def parse_plugin_names(value)
end
end
end

def plugins_config_file
@plugins_config_file ||= FSPath.temp_file(%w[image_optim .js]).tap do |config_file|
config_file.puts 'export default {'
config_file.puts ' plugins: ['
config_file.puts ' {'
config_file.puts ' name: \'preset-default\','
config_file.puts ' params: {'
config_file.puts ' overrides: {'
disable_plugins.each do |plugin_name|
config_file.puts " #{plugin_name}: false,"
end
config_file.puts ' }'
config_file.puts ' }'
config_file.puts ' },'
enable_plugins.each do |plugin_name|
config_file.puts " '#{plugin_name}',"
end
config_file.puts ' ]'
config_file.puts '};'
config_file.close
end
end
end
end
end
Loading