From 74c074d7917b2895fc60af6c19ec603781fe11d6 Mon Sep 17 00:00:00 2001
From: Jude Agboola <marvinjudehk@gmail.com>
Date: Thu, 25 Aug 2022 09:53:51 +0100
Subject: [PATCH] upgrade svgo in gatsby-plugin-sharp

---
 packages/gatsby-plugin-sharp/package.json     |  2 +-
 packages/gatsby-plugin-sharp/src/trace-svg.js | 11 ++++----
 yarn.lock                                     | 26 +++++++++----------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/packages/gatsby-plugin-sharp/package.json b/packages/gatsby-plugin-sharp/package.json
index 1093ca9088f76..28923a70a5331 100644
--- a/packages/gatsby-plugin-sharp/package.json
+++ b/packages/gatsby-plugin-sharp/package.json
@@ -21,7 +21,7 @@
     "probe-image-size": "^7.2.3",
     "semver": "^7.3.7",
     "sharp": "^0.30.7",
-    "svgo": "1.3.2"
+    "svgo": "2.8.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.4",
diff --git a/packages/gatsby-plugin-sharp/src/trace-svg.js b/packages/gatsby-plugin-sharp/src/trace-svg.js
index 0a039a50734bd..3cbadfaa8cd46 100644
--- a/packages/gatsby-plugin-sharp/src/trace-svg.js
+++ b/packages/gatsby-plugin-sharp/src/trace-svg.js
@@ -72,16 +72,17 @@ exports.notMemoizedPrepareTraceSVGInputFile = async ({
 }
 
 const optimize = svg => {
-  const SVGO = require(`svgo`)
-  const svgo = new SVGO({
+  const { optimize } = require(`svgo`)
+  const svgo = optimize(svg, {
     multipass: true,
     floatPrecision: 0,
     plugins: [
       {
-        removeViewBox: false,
+        name: `removeViewBox`,
       },
       {
-        addAttributesToSVGElement: {
+        name: `addAttributesToSVGElement`,
+        params: {
           attributes: [
             {
               preserveAspectRatio: `none`,
@@ -91,7 +92,7 @@ const optimize = svg => {
       },
     ],
   })
-  return svgo.optimize(svg).then(({ data }) => data)
+  return svgo.data
 }
 
 exports.notMemoizedtraceSVG = async ({ file, args, fileArgs, reporter }) => {
diff --git a/yarn.lock b/yarn.lock
index 0a71c69d7bd54..a4e4b5f0b8dd8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23629,19 +23629,7 @@ svgo@1.3.2, svgo@^1.0.0:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
-svgo@^0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
-  dependencies:
-    coa "~1.0.1"
-    colors "~1.1.2"
-    csso "~2.3.1"
-    js-yaml "~3.7.0"
-    mkdirp "~0.5.1"
-    sax "~1.2.1"
-    whet.extend "~0.9.9"
-
-svgo@^2.3.0, svgo@^2.8.0:
+svgo@2.8.0, svgo@^2.3.0, svgo@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"
   integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==
@@ -23654,6 +23642,18 @@ svgo@^2.3.0, svgo@^2.8.0:
     picocolors "^1.0.0"
     stable "^0.1.8"
 
+svgo@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  dependencies:
+    coa "~1.0.1"
+    colors "~1.1.2"
+    csso "~2.3.1"
+    js-yaml "~3.7.0"
+    mkdirp "~0.5.1"
+    sax "~1.2.1"
+    whet.extend "~0.9.9"
+
 sw-precache@^5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/sw-precache/-/sw-precache-5.2.1.tgz#06134f319eec68f3b9583ce9a7036b1c119f7179"