fix(loader): #187 support rule.oneOf config

JetBrains · Sep 27, 2017 · 75df92e · 75df92e
1 parent a1ae646
commit 75df92e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/lib/utils/get-loader-options.js b/lib/utils/get-loader-options.js
@@ -8,7 +8,16 @@ const isWebpack1 = require('./is-webpack-1');
  * @return {Object|null}
  */
 function getLoaderOptions(loaderPath, rule) {
-  const multiRuleProp = isWebpack1 ? 'loaders' : 'use';
+  let multiRuleProp;
+
+  if (isWebpack1) {
+    multiRuleProp = 'loaders';
+  } else if (rule.oneOf) {
+    multiRuleProp = 'oneOf';
+  } else {
+    multiRuleProp = 'use';
+  }
+
   const multiRule = typeof rule === 'object' && Array.isArray(rule[multiRuleProp]) ? rule[multiRuleProp] : null;
   let options;
 

diff --git a/test/loader.test.js b/test/loader.test.js
@@ -389,5 +389,27 @@ describe('loader and plugin', () => {
     it('should emit only built chunks', () => {
       // TODO test with webpack-recompilation-emulator
     });
+
+    if (!webpackVersion.IS_1) {
+      it('should allow to generate specify svg sprite with rule.oneOf config', async () => {
+        const { assets } = await compile({
+          entry: './styles.css',
+          module: rules(
+            {
+              test: /\.svg$/,
+              oneOf: [
+                { loader: loaderPath, options: { extract: true, spriteFilename: '[sha1:hash:base36:10].svg' } },
+                { loader: 'svgo-loader' }
+              ]
+            },
+            cssRule()
+          ),
+          plugins: [new SpritePlugin()]
+        });
+
+        Object.keys(assets).should.be.lengthOf(2);
+        assets.should.have.property('lvn29bpor3.svg');
+      });
+    }
   });
 });