From 2150693d6f0f196f8e3ad81174fa874215cc5191 Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Fri, 21 Sep 2018 16:00:28 -0400
Subject: [PATCH] Upgrade svgr to v2 and disable Prettier/SVGO (#5062)

---
 packages/react-scripts/config/webpack.config.dev.js  | 3 ++-
 packages/react-scripts/config/webpack.config.prod.js | 3 ++-
 packages/react-scripts/package.json                  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
index be1843b29..4d4291aa1 100644
--- a/packages/react-scripts/config/webpack.config.dev.js
+++ b/packages/react-scripts/config/webpack.config.dev.js
@@ -251,7 +251,8 @@ module.exports = {
                       {
                         loaderMap: {
                           svg: {
-                            ReactComponent: 'svgr/webpack![path]',
+                            ReactComponent:
+                              '@svgr/webpack?-prettier,-svgo![path]',
                           },
                         },
                       },
diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
index 4da336ed9..50936389b 100644
--- a/packages/react-scripts/config/webpack.config.prod.js
+++ b/packages/react-scripts/config/webpack.config.prod.js
@@ -289,7 +289,8 @@ module.exports = {
                       {
                         loaderMap: {
                           svg: {
-                            ReactComponent: 'svgr/webpack![path]',
+                            ReactComponent:
+                              '@svgr/webpack?-prettier,-svgo![path]',
                           },
                         },
                       },
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 73dab1ad8..35c7d5e7a 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -23,6 +23,7 @@
   "dependencies": {
     "@babel/core": "7.1.0",
     "@babel/runtime": "7.0.0",
+    "@svgr/webpack": "2.4.1",
     "autoprefixer": "9.1.5",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "9.0.0",
@@ -63,7 +64,6 @@
     "resolve": "1.8.1",
     "sass-loader": "7.1.0",
     "style-loader": "0.23.0",
-    "svgr": "1.9.2",
     "sw-precache-webpack-plugin": "0.11.5",
     "terser-webpack-plugin": "1.1.0",
     "thread-loader": "1.2.0",
-- 
GitLab