move safe-sharp to gatsby/sharp when available

Author: wardpeet

package.json

@@ -62,7 +62,7 @@
     "npm-packlist": "^2.1.5",
     "npm-run-all": "4.1.5",
     "plop": "^1.9.1",
-    "prettier": "2.5.1",
+    "prettier": "^2.5.1",
     "remark": "^13.0.0",
     "remark-cli": "^9.0.0",
     "remark-frontmatter": "^3.0.0",

packages/gatsby-plugin-manifest/src/gatsby-node.js

@@ -1,5 +1,6 @@
 import * as fs from "fs"
 import * as path from "path"
+// TODO V5 use gatsby/sharp
 import sharp from "./safe-sharp"
 import { createContentDigest, slash } from "gatsby-core-utils"
 import { defaultIcons, addDigestToPath, favicons } from "./common"

packages/gatsby-plugin-manifest/src/safe-sharp.js

@@ -157,7 +157,11 @@ try {
     originalConsoleError(msg, ...args)
     handleMessage(msg)
   }
-  sharp = require(`sharp`)
+  try {
+    sharp = require(`gatsby/sharp`)
+  } catch (e) {
+    sharp = require(`sharp`)
+  }
 } catch (e) {
   handleMessage(e.toString())
   throw e

packages/gatsby-plugin-sharp/src/duotone.js

@@ -1,3 +1,4 @@
+// TODO V5 use gatsby/sharp
 const sharp = require(`./safe-sharp`)
 const { reportError } = require(`./report-error`)
 

packages/gatsby-plugin-sharp/src/image-data.ts

@@ -5,6 +5,7 @@ import { Reporter } from "gatsby/reporter"
 import fs from "fs-extra"
 import { rgbToHex, calculateImageSizes, getSrcSet, getSizes } from "./utils"
 import { traceSVG, getImageSizeAsync, base64, batchQueueImageResizing } from "."
+// TODO V5 use gatsby/sharp
 import sharp from "./safe-sharp"
 import {
   createTransformObject,

packages/gatsby-plugin-sharp/src/index.js

@@ -1,3 +1,4 @@
+// TODO V5 use gatsby/sharp
 const sharp = require(`./safe-sharp`)
 const { generateImageData } = require(`./image-data`)
 const imageSize = require(`probe-image-size`)

packages/gatsby-plugin-sharp/src/process-file.js

@@ -1,3 +1,4 @@
+// TODO V5 use gatsby/sharp
 const sharp = require(`./safe-sharp`)
 const fs = require(`fs-extra`)
 const path = require(`path`)

packages/gatsby-plugin-sharp/src/safe-sharp.js

@@ -157,7 +157,11 @@ try {
     originalConsoleError(msg, ...args)
     handleMessage(msg)
   }
-  sharp = require(`sharp`)
+  try {
+    sharp = require(`gatsby/sharp`)
+  } catch (e) {
+    sharp = require(`sharp`)
+  }
 } catch (e) {
   handleMessage(e.toString())
   throw e

packages/gatsby-plugin-sharp/src/trace-svg.js

@@ -3,6 +3,7 @@ const fs = require(`fs-extra`)
 const _ = require(`lodash`)
 const tmpDir = require(`os`).tmpdir()
 const path = require(`path`)
+// TODO V5 use gatsby/sharp
 const sharp = require(`./safe-sharp`)
 const filenamify = require(`filenamify`)
 const duotone = require(`./duotone`)

packages/gatsby-plugin-sharp/src/utils.js

@@ -1,3 +1,4 @@
+// TODO V5 use gatsby/sharp
 import sharp from "./safe-sharp"
 import fs from "fs-extra"