From 05899291a884b4bb92e685a0fd269c73dd4fae77 Mon Sep 17 00:00:00 2001 From: homer0 Date: Thu, 12 Apr 2018 07:25:51 -0300 Subject: [PATCH] Fix the SVG rules --- src/services/configurations/rulesConfiguration.js | 2 ++ tests/services/configurations/rulesConfiguration.test.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/services/configurations/rulesConfiguration.js b/src/services/configurations/rulesConfiguration.js index 15785be..4fa06a8 100644 --- a/src/services/configurations/rulesConfiguration.js +++ b/src/services/configurations/rulesConfiguration.js @@ -274,6 +274,7 @@ class WebpackRulesConfiguration extends ConfigurationFile { // `.svg` files inside a `fonts` folder. test: /\.svg(\?(v=\d+\.\d+\.\d+|\w+))?$/, include: [ + /\/node_modules\/(?:.*?\/)?fonts\/.*?/i, new RegExp(`${target.paths.source}/(?:.*?/)?fonts/.*?`, 'i'), ...target.includeModules.map((modName) => ( new RegExp(`/node_modules/${modName}/(?:.*?/)?fonts/.*?`) @@ -366,6 +367,7 @@ class WebpackRulesConfiguration extends ConfigurationFile { */ /favicon\.\w+$/i, // Exclude svg files that were identified as fonts. + /\/node_modules\/(?:.*?\/)?fonts\/.*?/i, new RegExp(`${target.paths.source}/(?:.*?/)?fonts/.*?`, 'i'), // Exclude svg files that were identified as fonts on modules being processed. ...target.includeModules.map((modName) => ( diff --git a/tests/services/configurations/rulesConfiguration.test.js b/tests/services/configurations/rulesConfiguration.test.js index 0483daf..3ce54d8 100644 --- a/tests/services/configurations/rulesConfiguration.test.js +++ b/tests/services/configurations/rulesConfiguration.test.js @@ -153,6 +153,7 @@ describe('services/configurations:rulesConfiguration', () => { { test: expect.any(RegExp), include: [ + expect.any(RegExp), expect.any(RegExp), ...target.includeModules.map(() => expect.any(RegExp)), ], @@ -209,6 +210,7 @@ describe('services/configurations:rulesConfiguration', () => { { test: expect.any(RegExp), exclude: expect.arrayContaining([ + expect.any(RegExp), expect.any(RegExp), expect.any(RegExp), ...target.includeModules.map(() => expect.any(RegExp)),