Merge pull request #190 from CXHtml/fix-resourceQuery-bug

fix(loader): support resourceQuery in extract mode with webpack above v1
JetBrains · Sep 27, 2017 · a07c1f7 · a07c1f7
2 parents 75df92e + 9f1d12b
commit a07c1f7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/lib/utils/mapped-list.js b/lib/utils/mapped-list.js
@@ -84,7 +84,7 @@ class MappedList {
     const { symbols, spriteModules, allModules, rules } = this;
     const data = symbols.reduce((acc, symbol) => {
       const resource = symbol.request.file;
-      const module = spriteModules.find(m => m.resource === resource);
+      const module = spriteModules.find(m => m.resource.split('?')[0] === resource);
       const rule = getMatchedRule(resource, rules);
       const options = rule ? getLoaderOptions(spriteLoaderPath, rule) : null;
       let spriteFilename = (options && options.spriteFilename)

diff --git a/test/fixtures/styles4.css b/test/fixtures/styles4.css
@@ -0,0 +1,3 @@
+.img {
+  background-image: url('img/image.svg?sprite');
+}
diff --git a/test/loader.test.js b/test/loader.test.js
@@ -410,6 +410,21 @@ describe('loader and plugin', () => {
         Object.keys(assets).should.be.lengthOf(2);
         assets.should.have.property('lvn29bpor3.svg');
       });
+
+      it('should emit sprite svg when using resourceQuery', async () => {
+        const { assets } = await compile({
+          entry: './styles4.css',
+          module: rules(
+            Object.assign(svgRule({ extract: true }), {
+              resourceQuery: /sprite/
+            }),
+            cssRule()
+          ),
+          plugins: [new SpritePlugin()]
+        });
+
+        Object.keys(assets).should.be.lengthOf(2);
+      });
     }
   });
 });