fix: replace unmaintained base64-img with native solutions

fixes #24679
gatsbyjs · Jan 14, 2021 · 29746c1 · 29746c1
1 parent 8e8b319
commit 29746c1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 25 deletions.
diff --git a/packages/gatsby-source-contentful/package.json b/packages/gatsby-source-contentful/package.json
@@ -12,8 +12,6 @@
     "@contentful/rich-text-types": "^14.1.2",
     "@hapi/joi": "^15.1.1",
     "axios": "^0.21.0",
-    "base64-img": "^1.0.4",
-    "bluebird": "^3.7.2",
     "chalk": "^4.1.0",
     "contentful": "^8.1.7",
     "fs-extra": "^9.0.1",

diff --git a/packages/gatsby-source-contentful/src/extend-node-type.js b/packages/gatsby-source-contentful/src/extend-node-type.js
@@ -2,7 +2,7 @@ const fs = require(`fs`)
 const path = require(`path`)
 const crypto = require(`crypto`)
 
-const Promise = require(`bluebird`)
+const axios = require(`axios`)
 const {
   GraphQLObjectType,
   GraphQLBoolean,
@@ -12,7 +12,6 @@ const {
   GraphQLNonNull,
 } = require(`gatsby/graphql`)
 const qs = require(`qs`)
-const base64Img = require(`base64-img`)
 
 const cacheImage = require(`./cache-image`)
 
@@ -103,19 +102,25 @@ const getBase64Image = imageProps => {
     })
   }
 
-  const promise = new Promise((resolve, reject) => {
-    base64Img.requestBase64(requestUrl, (a, b, body) => {
-      // TODO: against dogma, confirm whether writeFileSync is indeed slower
-      fs.promises
-        .writeFile(cacheFile, body)
-        .then(() => resolve(body))
-        .catch(e => {
-          console.error(
-            `Contentful:getBase64Image: failed to write ${body.length} bytes remotely fetched from \`${requestUrl}\` to: \`${cacheFile}\`\nError: ${e}`
-          )
-          reject(e)
-        })
+  const promise = new Promise(async (resolve, reject) => {
+    const imageResponse = await axios.get(requestUrl, {
+      responseType: `arraybuffer`,
     })
+
+    const base64 = Buffer.from(imageResponse.data, `binary`).toString(`base64`)
+
+    const body = `data:image/jpeg;base64,${base64}`
+
+    // TODO: against dogma, confirm whether writeFileSync is indeed slower
+    fs.promises
+      .writeFile(cacheFile, body)
+      .then(() => resolve(body))
+      .catch(e => {
+        console.error(
+          `Contentful:getBase64Image: failed to write ${body.length} bytes remotely fetched from \`${requestUrl}\` to: \`${cacheFile}\`\nError: ${e}`
+        )
+        reject(e)
+      })
   })
 
   inFlightBase64Cache.set(requestUrl, promise)
@@ -403,9 +408,7 @@ const fixedNodeType = ({ name, getTracedSVG }) => {
       fields: {
         base64: {
           type: GraphQLString,
-          resolve(imageProps) {
-            return getBase64Image(imageProps)
-          },
+          resolve: getBase64Image,
         },
         tracedSVG: {
           type: GraphQLString,
@@ -500,9 +503,7 @@ const fluidNodeType = ({ name, getTracedSVG }) => {
       fields: {
         base64: {
           type: GraphQLString,
-          resolve(imageProps) {
-            return getBase64Image(imageProps)
-          },
+          resolve: getBase64Image,
         },
         tracedSVG: {
           type: GraphQLString,
@@ -647,9 +648,7 @@ exports.extendNodeType = ({ type, store, cache, getNodesByType }) => {
         fields: {
           base64: {
             type: GraphQLString,
-            resolve(imageProps) {
-              return getBase64Image(imageProps)
-            },
+            resolve: getBase64Image,
           },
           tracedSVG: {
             type: GraphQLString,