fix(utils/normalizeFallback): correctly pass all options to the default fallback (file-loader) (#139)

Author: insin

src/utils/normalizeFallback.js

@@ -7,12 +7,12 @@ function normalizeFallbackString(fallbackString, originalOptions) {
     };
   }
 
-  // To remain consistent with version 1.0.1, pass the options which were provided to url-loader to the fallback loader.
-  // Perhaps it would make sense to strip out ‒ or "consume" ‒ the options we know were meant for url-loader: limit and
-  // mimetype.
+  // To remain consistent with version 1.0.1, pass any other options which were provided to url-loader to the fallback loader.
+  const { fallback, limit, mimetype, ...otherOptions } = originalOptions;
+
   return {
     loader: fallbackString,
-    query: originalOptions,
+    query: otherOptions,
   };
 }
 
@@ -35,9 +35,7 @@ function normalizeFallbackObject(fallbackObject) {
 export default function normalizeFallback(fallback, originalOptions) {
   // If no fallback was provided, use file-loader.
   if (!fallback) {
-    return {
-      loader: 'file-loader',
-    };
+    return normalizeFallbackString('file-loader', originalOptions);
   }
 
   if (typeof fallback === 'string') {

test/options/__snapshots__/fallback.test.js.snap

@@ -7,3 +7,5 @@ exports[`Options fallback {String} 2`] = `"module.exports = __webpack_public_pat
 exports[`Options fallback {String} 3`] = `"module.exports = __webpack_public_path__ + \\"name-for-file-loader.png\\";"`;
 
 exports[`Options fallback {String} 4`] = `"module.exports = __webpack_public_path__ + \\"name-for-file-loader.png\\";"`;
+
+exports[`Options fallback {undefined} 1`] = `"module.exports = __webpack_public_path__ + \\"name-for-url-loader.png\\";"`;

test/options/fallback.test.js

@@ -22,6 +22,23 @@ describe('Options', () => {
       expect(source).toMatchSnapshot();
     });
 
+    test('{undefined}', async () => {
+      const config = {
+        loader: {
+          test: /\.png$/,
+          options: {
+            limit: 100,
+            name: 'name-for-url-loader.[ext]',
+          },
+        },
+      };
+
+      const stats = await webpack('fixture.js', config);
+      const { source } = stats.toJson().modules[0];
+
+      expect(source).toMatchSnapshot();
+    });
+
     // Version 1.0.1 passes options provided to url-loader to the fallback as well, so make sure that still works.
     test('{String}', async () => {
       const config = {

test/utils/__snapshots__/normalizeFallback.test.js.snap

@@ -20,7 +20,6 @@ exports[`normalizeFallback string 1`] = `
 Object {
   "loader": "file-loader",
   "query": Object {
-    "limit": 8192,
     "name": "name-for-url-loader.[ext]",
   },
 }
@@ -36,5 +35,8 @@ Object {
 exports[`normalizeFallback undefined 1`] = `
 Object {
   "loader": "file-loader",
+  "query": Object {
+    "name": "name-for-url-loader.[ext]",
+  },
 }
 `;