Merge branch 'master' into greenkeeper/style-loader-1.0.0

zeppo21 · Sep 26, 2019 · aef3755 · aef3755
2 parents ef802e8 + 92370c1
commit aef3755
Show file tree

Hide file tree

Showing 2 changed files with 114 additions and 72 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,13 +33,13 @@
     "copy-webpack-plugin": "^5.0.3",
     "css-loader": "^3.0.0",
     "eslint": "^5.16.0",
-    "eslint-loader": "^2.1.2",
+    "eslint-loader": "^3.0.0",
     "file-loader": "^4.0.0",
     "html-webpack-plugin": "^4.0.0-beta.5",
     "mini-css-extract-plugin": "^0.8.0",
     "node-sass": "^4.12.0",
-    "sass-loader": "^7.1.0",
     "style-loader": "^1.0.0",
+    "sass-loader": "^8.0.0",
     "webpack": "^4.29.6",
     "webpack-cli": "^3.3.0",
     "webpack-dev-server": "^3.2.1",