fix(gatsby-plugin-sharp): Image rotation (#14302)

gatsbyjs · May 28, 2019 · 5e4bf34 · 5e4bf34
1 parent ade2098
commit 5e4bf34
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/packages/gatsby-plugin-sharp/src/index.js b/packages/gatsby-plugin-sharp/src/index.js
@@ -144,7 +144,11 @@ async function generateBase64({ file, args, reporter }) {
   })
   let pipeline
   try {
-    pipeline = sharp(file.absolutePath).rotate()
+    pipeline = sharp(file.absolutePath)
+
+    if (!options.rotate) {
+      pipeline.rotate()
+    }
   } catch (err) {
     reportError(`Failed to process image ${file.absolutePath}`, err, reporter)
     return null

diff --git a/packages/gatsby-plugin-sharp/src/process-file.js b/packages/gatsby-plugin-sharp/src/process-file.js
@@ -79,8 +79,6 @@ exports.processFile = (file, transforms, options = {}) => {
     if (!options.stripMetadata) {
       pipeline = pipeline.withMetadata()
     }
-
-    pipeline = pipeline.rotate()
   } catch (err) {
     throw new Error(`Failed to process image ${file}`)
   }
@@ -91,6 +89,10 @@ exports.processFile = (file, transforms, options = {}) => {
 
     let clonedPipeline = transforms.length > 1 ? pipeline.clone() : pipeline
 
+    if (!args.rotate) {
+      clonedPipeline = clonedPipeline.rotate()
+    }
+
     // Sharp only allows ints as height/width. Since both aren't always
     // set, check first before trying to round them.
     let roundedHeight = args.height

diff --git a/packages/gatsby-plugin-sharp/src/trace-svg.js b/packages/gatsby-plugin-sharp/src/trace-svg.js
@@ -16,7 +16,11 @@ exports.notMemoizedPrepareTraceSVGInputFile = async ({
 }) => {
   let pipeline
   try {
-    pipeline = sharp(file.absolutePath).rotate()
+    pipeline = sharp(file.absolutePath)
+
+    if (!options.rotate) {
+      pipeline.rotate()
+    }
   } catch (err) {
     reportError(`Failed to process image ${file.absolutePath}`, err, reporter)
     return