Replace image-size with probe-image-size

packages/less/lib/less-node/image-size.js

@@ -1,4 +1,5 @@
 import { createRequire } from 'module';
+import fs from 'fs';
 import Dimension from '../less/tree/dimension.js';
 import Expression from '../less/tree/expression.js';
 import functionRegistry from './../less/functions/function-registry.js';
@@ -33,27 +34,50 @@ export default environment => {
             throw fileSync.error;
         }
 
-        const sizeOf = require('image-size');
-        return sizeOf ? sizeOf(fileSync.filename) : {width: 0, height: 0};
+        let probe;
+        try {
+            probe = require('probe-image-size/sync');
+        } catch (_) {
+            return { width: 0, height: 0 };
+        }
+
+        // Read the file as raw bytes via its resolved filename to ensure binary
+        // integrity — the file manager may return string contents for text-mode
+        // reads which corrupts binary image data and causes probe to return null.
+        const contents = fs.readFileSync(fileSync.filename);
+
+        const size = probe(contents);
+
+        if (!size) {
+            throw {
+                type: 'File',
+                message: `Unrecognised image format for '${filePath}'`
+            };
+        }
+
+        return {
+            width: size.width,
+            height: size.height
+        };
     }
 
     const imageFunctions = {
-        'image-size': function(filePathNode) {
+        'image-size': function (filePathNode) {
             const size = imageSize(this, filePathNode);
             return new Expression([
                 new Dimension(size.width, 'px'),
                 new Dimension(size.height, 'px')
             ]);
         },
-        'image-width': function(filePathNode) {
+        'image-width': function (filePathNode) {
             const size = imageSize(this, filePathNode);
             return new Dimension(size.width, 'px');
         },
-        'image-height': function(filePathNode) {
+        'image-height': function (filePathNode) {
             const size = imageSize(this, filePathNode);
             return new Dimension(size.height, 'px');
         }
     };
 
     functionRegistry.addMultiple(imageFunctions);
-};
+};

packages/less/package.json

@@ -70,7 +70,7 @@
 	"optionalDependencies": {
 		"errno": "^0.1.1",
 		"graceful-fs": "^4.1.2",
-		"image-size": "~0.5.0",
+		"probe-image-size": "^7.2.3",
 		"make-dir": "^5.1.0",
 		"mime": "^1.4.1",
 		"needle": "^3.1.0",