From 24367ef90619dab7dce357867cf72e3491be1330 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2019 11:07:47 +0200
Subject: Bump css-loader from 2.1.1 to 3.1.0 (#11382)

* Bump css-loader from 2.1.1 to 3.1.0

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.1.1 to 3.1.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v2.1.1...v3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* localIdentName -> modules.localIdentName
---
 config/webpack/rules/css.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'config/webpack/rules/css.js')

diff --git a/config/webpack/rules/css.js b/config/webpack/rules/css.js
index 3b5b51232..52af1497e 100644
--- a/config/webpack/rules/css.js
+++ b/config/webpack/rules/css.js
@@ -9,7 +9,9 @@ module.exports = {
       options: {
         sourceMap: true,
         importLoaders: 2,
-        localIdentName: '[name]__[local]___[hash:base64:5]',
+        modules: {
+          localIdentName: '[name]__[local]___[hash:base64:5]',
+        },
       },
     },
     {
-- 
cgit 


From fada60cbe72764756d8538017d8a0100429ccb23 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 23 Jul 2019 22:47:48 +0900
Subject: Remove modules.localIdentName (#11398)

---
 config/webpack/rules/css.js | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'config/webpack/rules/css.js')

diff --git a/config/webpack/rules/css.js b/config/webpack/rules/css.js
index 52af1497e..bc1f42c13 100644
--- a/config/webpack/rules/css.js
+++ b/config/webpack/rules/css.js
@@ -9,9 +9,6 @@ module.exports = {
       options: {
         sourceMap: true,
         importLoaders: 2,
-        modules: {
-          localIdentName: '[name]__[local]___[hash:base64:5]',
-        },
       },
     },
     {
-- 
cgit 


From 04125c9c0d418a51b21ab6706f49434b4c8cdc8e Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 7 Nov 2019 14:56:09 +0100
Subject: Fix build with new sass-loader

---
 config/webpack/rules/css.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'config/webpack/rules/css.js')

diff --git a/config/webpack/rules/css.js b/config/webpack/rules/css.js
index 2b7b7017c..6ecfb3164 100644
--- a/config/webpack/rules/css.js
+++ b/config/webpack/rules/css.js
@@ -20,7 +20,9 @@ module.exports = {
     {
       loader: 'sass-loader',
       options: {
-        includePaths: ['app/javascript'],
+        sassOptions: {
+          includePaths: ['app/javascript'],
+        },
         implementation: require('sass'),
         sourceMap: true,
       },
-- 
cgit