From f17d96475c349e3af7694015f3cc845c4fd7b297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= <rafael@franca.dev>
Date: Fri, 16 Aug 2019 16:13:24 -0400
Subject: [PATCH] Support Rails with sass-rails 6

---
 Gemfile.lock                              | 41 ++++++++++++-----------
 railties/lib/rails/generators/app_base.rb |  2 +-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0b5dba08ed..b0f162d36f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,7 +189,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     connection_pool (2.2.2)
     cookiejar (0.3.3)
     crack (0.4.3)
@@ -340,12 +340,13 @@ GEM
     mysql2 (0.5.2-x86-mingw32)
     net_http_ssl_fix (0.0.10)
     nio4r (2.4.0)
-    nokogiri (1.9.1)
+    nio4r (2.4.0-java)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
-    nokogiri (1.9.1-java)
-    nokogiri (1.9.1-x64-mingw32)
+    nokogiri (1.10.4-java)
+    nokogiri (1.10.4-x64-mingw32)
       mini_portile2 (~> 2.4.0)
-    nokogiri (1.9.1-x86-mingw32)
+    nokogiri (1.10.4-x86-mingw32)
       mini_portile2 (~> 2.4.0)
     os (1.0.0)
     parallel (1.13.0)
@@ -369,7 +370,7 @@ GEM
       thor
     raabro (1.1.6)
     racc (1.4.15)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-cache (1.8.0)
       rack (>= 0.4)
     rack-protection (2.0.4)
@@ -384,7 +385,7 @@ GEM
     rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (12.3.3)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
@@ -428,17 +429,17 @@ GEM
     rufus-scheduler (3.5.2)
       fugit (~> 1.1, >= 1.1.5)
     safe_yaml (1.0.4)
-    sass (3.7.2)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
+    sassc (2.0.1)
+      ffi (~> 1.9)
+      rake
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     sdoc (1.0.0)
       rdoc (>= 5.0)
     selenium-webdriver (3.142.3)
@@ -487,7 +488,7 @@ GEM
     thor (0.20.3)
     thread_safe (0.3.6)
     thread_safe (0.3.6-java)
-    tilt (2.0.8)
+    tilt (2.0.9)
     turbolinks (5.2.0)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -522,6 +523,8 @@ GEM
     websocket (1.2.8)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
+    websocket-driver (0.7.0-java)
+      websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 6945feb198..3e9c9d8089 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -307,7 +307,7 @@ def rails_version_specifier(gem_version = Rails.gem_version)
       def assets_gemfile_entry
         return [] if options[:skip_sprockets]
 
-        GemfileEntry.version("sass-rails", "~> 5", "Use SCSS for stylesheets")
+        GemfileEntry.version("sass-rails", ">= 6", "Use SCSS for stylesheets")
       end
 
       def webpacker_gemfile_entry
-- 
GitLab