fix: support module resolution in composes (#845)

webpack-contrib · Dec 4, 2018 · 453248f · 453248f
1 parent 8a6ea10
commit 453248f
Show file tree

Hide file tree

Showing 16 changed files with 1,329 additions and 319 deletions.
diff --git a/lib/loader.js b/lib/loader.js
@@ -145,15 +145,17 @@ module.exports = function loader(content, map, meta) {
         const message = messages.find(
           // eslint-disable-next-line no-shadow
           (message) =>
-            message.type === 'icss-import' && message.item.index === idx
+            message.type === 'icss-import' &&
+            message.item &&
+            message.item.index === idx
         );
 
         if (!message) {
           return placeholder;
         }
 
         const { item } = message;
-        const importUrl = importUrlPrefix + item.url;
+        const importUrl = importUrlPrefix + urlToRequest(item.url);
 
         if (exportOnlyLocals) {
           return `" + require(${stringifyRequest(