Fix the SVG rules

homer0 · Apr 12, 2018 · 0589929 · 0589929
1 parent f878155
commit 0589929
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -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)),