From 9bb898c94ef9de62274216131d5ab396ab495c95 Mon Sep 17 00:00:00 2001 From: Cyril Wanner Date: Thu, 20 Dec 2018 20:22:52 +0100 Subject: [PATCH] Fix sharp driver path for windows --- lib/loaders/index.js | 2 +- lib/loaders/responsive-loader.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/loaders/index.js b/lib/loaders/index.js index 7d4eb15..af30b90 100644 --- a/lib/loaders/index.js +++ b/lib/loaders/index.js @@ -44,7 +44,7 @@ const detectLoaders = (resolvePath) => { } if (isModuleInstalled('responsive-loader', resolvePath)) { - responsive = require.resolve('responsive-loader', resolvePath ? { paths: [resolvePath] } : {}).replace(/\/lib\/index.js$/g, ''); + responsive = require.resolve('responsive-loader', resolvePath ? { paths: [resolvePath] } : {}).replace(/(\/|\\)lib(\/|\\)index.js$/g, ''); if (isModuleInstalled('sharp', resolvePath)) { responsiveAdapter = 'sharp'; diff --git a/lib/loaders/responsive-loader.js b/lib/loaders/responsive-loader.js index 3b0b86f..27fec19 100644 --- a/lib/loaders/responsive-loader.js +++ b/lib/loaders/responsive-loader.js @@ -1,3 +1,4 @@ +const path = require('path'); const { getFileLoaderOptions } = require('./file-loader'); /** @@ -14,7 +15,7 @@ const getResponsiveLoaderOptions = ({ let adapter = responsive ? responsive.adapter : undefined; if (!adapter && detectedLoaders.responsiveAdapter === 'sharp') { - adapter = require(`${detectedLoaders.responsive}/sharp`); // eslint-disable-line + adapter = require(`${detectedLoaders.responsive}${path.sep}sharp`); // eslint-disable-line } return {