From 0bdc677dfeec8e321159b215d542e8577febcaf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benedikt=20R=C3=B6tsch?= <opensource@axe312.dev>
Date: Tue, 30 Jun 2020 15:38:22 +0200
Subject: [PATCH] refactor(imports): fix dependency structure and make sharp
 optional

fixes #23904
---
 packages/gatsby-source-contentful/package.json     | 7 ++++---
 packages/gatsby-source-contentful/src/rich-text.js | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/gatsby-source-contentful/package.json b/packages/gatsby-source-contentful/package.json
index e97aa714cac70..bcaae2b0afb30 100644
--- a/packages/gatsby-source-contentful/package.json
+++ b/packages/gatsby-source-contentful/package.json
@@ -9,14 +9,13 @@
   "dependencies": {
     "@babel/runtime": "^7.10.3",
     "@contentful/rich-text-react-renderer": "^14.1.1",
-    "@contentful/rich-text-types": "^13.4.0",
     "@hapi/joi": "^15.1.1",
     "axios": "^0.19.2",
     "base64-img": "^1.0.4",
     "bluebird": "^3.7.2",
     "chalk": "^2.4.2",
     "contentful": "^7.14.5",
-    "deep-map": "^1.5.0",
+    "contentful-resolve-response": "^1.1.4",
     "fs-extra": "^8.1.0",
     "gatsby-core-utils": "^1.3.12",
     "gatsby-plugin-sharp": "^2.6.19",
@@ -24,6 +23,7 @@
     "is-online": "^8.4.0",
     "json-stringify-safe": "^5.0.1",
     "lodash": "^4.17.15",
+    "progress": "^2.0.3",
     "qs": "^6.9.4"
   },
   "devDependencies": {
@@ -40,7 +40,8 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "gatsby": "^2.12.1"
+    "gatsby": "^2.12.1",
+    "gatsby-plugin-sharp": "^2.6.14"
   },
   "repository": {
     "type": "git",
diff --git a/packages/gatsby-source-contentful/src/rich-text.js b/packages/gatsby-source-contentful/src/rich-text.js
index 0d1eac3db4f58..69dfcc537160f 100644
--- a/packages/gatsby-source-contentful/src/rich-text.js
+++ b/packages/gatsby-source-contentful/src/rich-text.js
@@ -1,4 +1,3 @@
-// import { fixId } from "./normalize"
 import { documentToReactComponents } from "@contentful/rich-text-react-renderer"
 import resolveResponse from "contentful-resolve-response"