From 2cef2fd6c20876704062c40dd612c219166deed7 Mon Sep 17 00:00:00 2001
From: sandip mondal <sandip_mondal85@yahoo.co.in>
Date: Wed, 18 Sep 2019 20:27:11 +0530
Subject: [PATCH] Upgrate style loader (#2242)

---
 package.json                              |  2 +-
 package/utils/__tests__/get_style_rule.js |  9 +++++++++
 package/utils/get_style_rule.js           | 10 +---------
 yarn.lock                                 | 20 ++++++++++++++------
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 12263dbd2..1702eea13 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "postcss-safe-parser": "^4.0.1",
     "regenerator-runtime": "^0.13.2",
     "sass-loader": "^7.1.0",
-    "style-loader": "^0.23.1",
+    "style-loader": "^1.0.0",
     "terser-webpack-plugin": "^1.3.0",
     "webpack": "^4.34.0",
     "webpack-assets-manifest": "^3.1.1",
diff --git a/package/utils/__tests__/get_style_rule.js b/package/utils/__tests__/get_style_rule.js
index 5fcbbbf2e..d74f584ca 100644
--- a/package/utils/__tests__/get_style_rule.js
+++ b/package/utils/__tests__/get_style_rule.js
@@ -44,6 +44,15 @@ describe('getStyleRule', () => {
     expect(cssRule.use).toMatchObject(expect.arrayContaining(expectation))
   })
 
+  test('adds style-loader when extract_css is true', () => {
+    const expectation = [{loader: 'style-loader'}]
+
+    require('../../config').extract_css = false
+    const cssRule = getStyleRule(/\.(css)$/i)
+
+    expect(cssRule.use).toMatchObject(expect.objectContaining(expectation))
+  })
+
   test(`doesn't add mini-css-extract-plugin when extract_css is false`, () => {
     const MiniCssExtractPlugin = require('mini-css-extract-plugin')
     const expectation = [MiniCssExtractPlugin.loader]
diff --git a/package/utils/get_style_rule.js b/package/utils/get_style_rule.js
index d6b447bb7..342aedc7e 100644
--- a/package/utils/get_style_rule.js
+++ b/package/utils/get_style_rule.js
@@ -1,17 +1,9 @@
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const { resolve } = require('path')
-const devServer = require('../dev_server')
 const config = require('../config')
 
-const inDevServer = process.argv.find(v => v.includes('webpack-dev-server'))
-const isHMR = inDevServer && (devServer && devServer.hmr)
-
 const styleLoader = {
-  loader: 'style-loader',
-  options: {
-    hmr: isHMR,
-    sourceMap: true
-  }
+  loader: 'style-loader'
 }
 
 const getStyleRule = (test, modules = false, preprocessors = []) => {
diff --git a/yarn.lock b/yarn.lock
index 521e66312..83ac11dbb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6867,6 +6867,14 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
+schema-utils@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.1.0.tgz#940363b6b1ec407800a22951bdcc23363c039393"
+  integrity sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
@@ -7298,13 +7306,13 @@ strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-style-loader@^0.23.1:
-  version "0.23.1"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
-  integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==
+style-loader@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz#1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82"
+  integrity sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw==
   dependencies:
-    loader-utils "^1.1.0"
-    schema-utils "^1.0.0"
+    loader-utils "^1.2.3"
+    schema-utils "^2.0.1"
 
 stylehacks@^4.0.0:
   version "4.0.3"