Flatten rules after oneOf was added to create-react-app webpack configs

see facebook/create-react-app#2747
tkvw · Oct 15, 2017 · 8c89cf5 · 8c89cf5
1 parent 2157950
commit 8c89cf5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -2,8 +2,13 @@
 function rewireGraphQLTag(config, env) {
     const gqlExtension = /\.(graphql|gql)$/
 
-    const fileLoader = config.module.rules.find(rule=> rule.loader && rule.loader.indexOf("file-loader")!==-1);
-    fileLoader.exclude.push(gqlExtension);
+    const flatten = (array) => array.reduce((a, b) =>
+        a.concat(Array.isArray(b) ? flatten(b) : b), []);
+
+    const fileLoader = flatten(config.module.rules.map((rule) => rule.oneOf || rule))
+        .find((rule) => rule.loader && rule.loader.indexOf("file-loader")!==-1);
+
+    fileLoader && fileLoader.exclude.push(gqlExtension);
 
     const gqlTagRule = {
         test: gqlExtension,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-app-rewire-graphql-tag",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "rewire your react-app and use graphql-tag",
   "main": "index.js",
   "scripts": {