From 79dae7f0e51874852463b1ba2d6c564d6bf014b4 Mon Sep 17 00:00:00 2001
From: Daniel Gatis <danielgatis@gmail.com>
Date: Fri, 2 Dec 2022 10:38:40 -0300
Subject: [PATCH] Add m1 support

---
 Gemfile.lock                     | 14 +++++++-------
 README.md                        |  2 ++
 lcms-engine.gemspec              |  4 ++--
 lib/tasks/lcms/engine_tasks.rake |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1402d158..9c9cef2f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,7 +48,7 @@ PATH
       mini_magick (~> 4.10, >= 4.10.1)
       nested_form (~> 0.3.2)
       nikkou (~> 0.0.5)
-      nokogiri (~> 1.11, >= 1.11.4)
+      nokogiri (>= 1.12.0)
       oj (~> 3.10, >= 3.10.2)
       oj_mimic_json (~> 1.0, >= 1.0.1)
       pandoc-ruby (~> 2.0, >= 2.0.2)
@@ -66,7 +66,7 @@ PATH
       retriable (~> 3.1)
       ruby-progressbar (~> 1.10, >= 1.10.1)
       rubyzip (~> 2)
-      sanitize (>= 5.1, < 5.3)
+      sanitize (~> 6.0.0)
       sass-rails (~> 6)
       simple_form (~> 5.0, >= 5.0.2)
       staccato (~> 0.5.3)
@@ -458,10 +458,10 @@ GEM
       nokogiri
       tzinfo
     nio4r (2.5.8)
+    nokogiri (1.13.9-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
-    nokogumbo (2.0.5)
-      nokogiri (~> 1.8, >= 1.8.4)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
@@ -621,10 +621,9 @@ GEM
       fugit (~> 1.1, >= 1.1.6)
     safe_attributes (1.0.10)
       activerecord (>= 3.0.0)
-    sanitize (5.2.3)
+    sanitize (6.0.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.8.0)
-      nokogumbo (~> 2.0)
+      nokogiri (>= 1.12.0)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -736,6 +735,7 @@ GEM
     zeitwerk (2.6.0)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
diff --git a/README.md b/README.md
index bbde3514..97ba4740 100644
--- a/README.md
+++ b/README.md
@@ -76,6 +76,8 @@ Other kinds of assets, like ERB views, images, stylesheets or javascript files,
 overridden as easily as Ruby classes and modules, but you can always provide your own versions of
 the same files, overwriting the ones provided by the engine.
 
+You can run the rake task `lcms_engine:webpacker:compile` and set the environment variable `YARN_PATH` to set the yarn binary.
+
 ## Installation
 Add this to the Gemfile:
 ```ruby
diff --git a/lcms-engine.gemspec b/lcms-engine.gemspec
index 7fc8b344..e3414a5a 100644
--- a/lcms-engine.gemspec
+++ b/lcms-engine.gemspec
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'mini_magick', '~> 4.10', '>= 4.10.1'
   s.add_dependency 'nested_form', '~> 0.3.2'
   s.add_dependency 'nikkou', '~> 0.0.5'
-  s.add_dependency 'nokogiri', '~> 1.11', '>= 1.11.4'
+  s.add_dependency 'nokogiri', '>= 1.12.0'
   s.add_dependency 'oj', '~> 3.10', '>= 3.10.2'
   s.add_dependency 'oj_mimic_json', '~> 1.0', '>= 1.0.1'
   s.add_dependency 'pandoc-ruby', '~> 2.0', '>= 2.0.2'
@@ -82,7 +82,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'retriable', '~> 3.1'
   s.add_dependency 'ruby-progressbar', '~> 1.10', '>= 1.10.1'
   s.add_dependency 'rubyzip', '~> 2'
-  s.add_dependency 'sanitize', '>= 5.1', '< 5.3'
+  s.add_dependency 'sanitize', '~> 6.0.0'
   s.add_dependency 'sass-rails', '~> 6'
   s.add_dependency 'simple_form', '~> 5.0', '>= 5.0.2'
   s.add_dependency 'staccato', '~> 0.5.3'
diff --git a/lib/tasks/lcms/engine_tasks.rake b/lib/tasks/lcms/engine_tasks.rake
index dd56e668..8dd5f85b 100644
--- a/lib/tasks/lcms/engine_tasks.rake
+++ b/lib/tasks/lcms/engine_tasks.rake
@@ -36,7 +36,7 @@ namespace :lcms_engine do # rubocop:disable Metrics/BlockLength
     desc 'Install deps with yarn'
     task :yarn_install do
       Dir.chdir(File.join(__dir__, '../..')) do
-        system 'yarn install --no-progress --production'
+        system "#{ENV['YARN_PATH'] || 'yarn'} install --no-progress --production"
       end
     end