Made sharp an optional dependency (waiting for lovell/sharp#42).

papandreou · Oct 23, 2014 · 675619a · 675619a · lovell · Oct 24, 2014
1 parent 4c28203
commit 675619a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/lib/getFilterInfosAndTargetContentTypeFromQueryString.js b/lib/getFilterInfosAndTargetContentTypeFromQueryString.js
@@ -1,7 +1,7 @@
 var Stream = require('stream'),
     gm = require('gm'),
-    sharp = require('sharp'),
-    isOperationByEngineNameAndName = {gm: {}, sharp: {}},
+    sharp,
+    isOperationByEngineNameAndName = {gm: {}},
     filterConstructorByOperationName = {};
 
 ['PngQuant', 'PngCrush', 'OptiPng', 'JpegTran', 'Inkscape', 'SvgFilter'].forEach(function (constructorName) {
@@ -20,9 +20,16 @@ Object.keys(gm.prototype).forEach(function (propertyName) {
     }
 });
 
-['resize', 'extract', 'sequentialRead', 'crop', 'max', 'background', 'embed', 'flatten', 'rotate', 'flip', 'flop', 'withoutEnlargement', 'sharpen', 'interpolateWith', 'gamma', 'grayscale', 'greyscale', 'jpeg', 'webp', 'quality', 'progressive', 'withMetadata', 'compressionLevel'].forEach(function (sharpOperationName) {
-    isOperationByEngineNameAndName.sharp[sharpOperationName] = true;
-});
+try {
+    sharp = require('sharp');
+} catch (e) {}
+
+if (sharp) {
+    isOperationByEngineNameAndName.sharp = {};
+    ['resize', 'extract', 'sequentialRead', 'crop', 'max', 'background', 'embed', 'flatten', 'rotate', 'flip', 'flop', 'withoutEnlargement', 'sharpen', 'interpolateWith', 'gamma', 'grayscale', 'greyscale', 'jpeg', 'webp', 'quality', 'progressive', 'withMetadata', 'compressionLevel'].forEach(function (sharpOperationName) {
+        isOperationByEngineNameAndName.sharp[sharpOperationName] = true;
+    });
+}
 
 var engineNamesByOperationName = {};
 

diff --git a/package.json b/package.json
@@ -16,10 +16,10 @@
     "optipng": "0.1.1",
     "passerror": "0.0.1",
     "pngcrush": "0.1.0",
-    "pngquant": "0.3.0",
-    "sharp": "0.7.0"
+    "pngquant": "0.3.0"
   },
   "optionalDependencies": {
+    "sharp": "0.7.0",
     "svgfilter": "0.4.0"
   },
   "devDependencies": {