Fix sharp driver path for windows

cyrilwanner · Dec 20, 2018 · 9bb898c · 9bb898c
1 parent e3c70bb
commit 9bb898c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 {