chore(gatsby-plugin-sharp, gatsby-transformer-sharp): update dependen…

…cies (gatsbyjs#26259)
wardpeet · Aug 28, 2020 · dedd37f · dedd37f
1 parent 7975b91
commit dedd37f
Show file tree

Hide file tree

Showing 10 changed files with 297 additions and 138 deletions.
diff --git a/packages/gatsby-plugin-manifest/package.json b/packages/gatsby-plugin-manifest/package.json
@@ -10,7 +10,7 @@
     "@babel/runtime": "^7.10.3",
     "gatsby-core-utils": "^1.3.18",
     "semver": "^7.3.2",
-    "sharp": "^0.25.1"
+    "sharp": "^0.25.4"
   },
   "devDependencies": {
     "@babel/cli": "^7.10.3",

diff --git a/packages/gatsby-plugin-sharp/package.json b/packages/gatsby-plugin-sharp/package.json
@@ -8,21 +8,21 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.10.3",
-    "async": "^2.6.3",
+    "async": "^3.2.0",
     "bluebird": "^3.7.2",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "^9.0.1",
     "gatsby-core-utils": "^1.3.18",
-    "got": "^8.3.2",
-    "imagemin": "^6.1.0",
-    "imagemin-mozjpeg": "^8.0.0",
-    "imagemin-pngquant": "^6.0.1",
-    "lodash": "^4.17.15",
+    "got": "^10.7.0",
+    "imagemin": "^7.0.1",
+    "imagemin-mozjpeg": "^9.0.0",
+    "imagemin-pngquant": "^9.0.0",
+    "lodash": "^4.17.19",
     "mini-svg-data-uri": "^1.2.3",
     "potrace": "^2.1.8",
-    "probe-image-size": "^4.1.1",
+    "probe-image-size": "^5.0.0",
     "progress": "^2.0.3",
     "semver": "^7.3.2",
-    "sharp": "^0.25.1",
+    "sharp": "^0.25.4",
     "svgo": "1.3.2",
     "uuid": "^8.3.0"
   },

diff --git a/packages/gatsby-plugin-sharp/src/__tests__/scheduler.js b/packages/gatsby-plugin-sharp/src/__tests__/scheduler.js
@@ -170,13 +170,13 @@ describe(`scheduler`, () => {
       expect(got.post).toHaveBeenCalledWith(
         process.env.GATSBY_CLOUD_IMAGE_SERVICE_URL,
         {
-          body: {
+          json: {
             file: job.inputPaths[0],
             hash: expect.any(String),
             transforms: job.args.operations,
             options: job.args.pluginOptions,
           },
-          json: true,
+          responseType: `json`,
         }
       )
     })

diff --git a/packages/gatsby-plugin-sharp/src/process-file.js b/packages/gatsby-plugin-sharp/src/process-file.js
@@ -194,10 +194,10 @@ const compressPng = (pipeline, outputPath, options) =>
       .buffer(sharpBuffer, {
         plugins: [
           imageminPngquant({
-            quality: `${options.pngQuality || options.quality}-${Math.min(
-              (options.pngQuality || options.quality) + 25,
-              100
-            )}`, // e.g. 40-65
+            quality: [
+              (options.pngQuality || options.quality) / 100,
+              Math.min(((options.pngQuality || options.quality) + 25) / 100, 1),
+            ], // e.g. [0.4, 0.65]
             speed: options.pngCompressionSpeed
               ? options.pngCompressionSpeed
               : undefined,

diff --git a/packages/gatsby-plugin-sharp/src/scheduler.js b/packages/gatsby-plugin-sharp/src/scheduler.js
@@ -47,13 +47,13 @@ const scheduleJob = async (job, boundActionCreators, reporter) => {
   if (process.env.GATSBY_CLOUD_IMAGE_SERVICE_URL) {
     const cloudJob = got
       .post(process.env.GATSBY_CLOUD_IMAGE_SERVICE_URL, {
-        body: {
+        json: {
           file: job.inputPaths[0],
           hash: createContentDigest(job),
           transforms: job.args.operations,
           options: job.args.pluginOptions,
         },
-        json: true,
+        responseType: `json`,
       })
       .then(() => {})
 

diff --git a/packages/gatsby-remark-copy-linked-files/package.json b/packages/gatsby-remark-copy-linked-files/package.json
@@ -13,7 +13,7 @@
     "is-relative-url": "^3.0.0",
     "lodash": "^4.17.15",
     "path-is-inside": "^1.0.2",
-    "probe-image-size": "^4.1.1",
+    "probe-image-size": "^5.0.0",
     "unist-util-visit": "^1.4.1"
   },
   "devDependencies": {

diff --git a/packages/gatsby-remark-images-contentful/package.json b/packages/gatsby-remark-images-contentful/package.json
@@ -22,7 +22,7 @@
     "is-relative-url": "^3.0.0",
     "lodash": "^4.17.15",
     "semver": "^7.3.2",
-    "sharp": "^0.25.1",
+    "sharp": "^0.25.4",
     "unist-util-select": "^1.5.0"
   },
   "devDependencies": {

diff --git a/packages/gatsby-transformer-sharp/package.json b/packages/gatsby-transformer-sharp/package.json
@@ -9,11 +9,11 @@
   "dependencies": {
     "@babel/runtime": "^7.10.3",
     "bluebird": "^3.7.2",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "^9.0.1",
     "potrace": "^2.1.8",
-    "probe-image-size": "^4.1.1",
+    "probe-image-size": "^5.0.0",
     "semver": "^7.3.2",
-    "sharp": "^0.25.1"
+    "sharp": "^0.25.4"
   },
   "devDependencies": {
     "@babel/cli": "^7.10.3",

diff --git a/packages/gatsby-transformer-sharp/src/customize-schema.js b/packages/gatsby-transformer-sharp/src/customize-schema.js
@@ -17,8 +17,7 @@ const {
 } = require(`gatsby-plugin-sharp`)
 
 const sharp = require(`./safe-sharp`)
-const fs = require(`fs`)
-const fsExtra = require(`fs-extra`)
+const fs = require(`fs-extra`)
 const imageSize = require(`probe-image-size`)
 const path = require(`path`)
 
@@ -434,14 +433,11 @@ const createFields = ({
           imageName
         )
 
-        if (
-          !fsExtra.existsSync(publicPath) &&
-          !inProgressCopy.has(publicPath)
-        ) {
+        if (!fs.existsSync(publicPath) && !inProgressCopy.has(publicPath)) {
           // keep track of in progress copy, we should rely on `existsSync` but
           // a race condition exists between the exists check and the copy
           inProgressCopy.add(publicPath)
-          fsExtra.copy(details.absolutePath, publicPath, err => {
+          fs.copy(details.absolutePath, publicPath, err => {
             // this is no longer in progress
             inProgressCopy.delete(publicPath)
             if (err) {