fix for svgloader adding duplicate config (#435)

dpc-sdp · Jul 16, 2019 · c7a3e2a · c7a3e2a
1 parent dfa4cf1
commit c7a3e2a
Show file tree

Hide file tree

Showing 3 changed files with 240 additions and 1,014 deletions.
diff --git a/packages/ripple-nuxt-ui/lib/module.js b/packages/ripple-nuxt-ui/lib/module.js
@@ -1,5 +1,5 @@
 const path = require('path')
-const appDir = path.dirname(require.main.filename)
+const appDir = require('app-root-path')
 
 const resolve = path.resolve
 
@@ -25,16 +25,19 @@ module.exports = function nuxtRipple (moduleOptions) {
       ]
     }
     // Add svg-sprite-loader to create svg sprite
-    config.module.rules.push({
-      test: /\.svg$/,
-      include: [
-        resolve(__dirname, rippleIconPath),
-        resolve(__dirname, `${appDir}/assets/ripple-icon/`)
-      ],
-      use: [
-        'svg-sprite-loader',
-        'svgo-loader'
-      ]
-    })
+    const svgLoader = config.module.rules.find((rule) => rule.use && rule.use.find(r => r === 'svgo-loader'))
+    if (!svgLoader) {
+      config.module.rules.push({
+        test: /\.svg$/,
+        include: [
+          resolve(__dirname, rippleIconPath),
+          resolve(__dirname, `${appDir}/assets/ripple-icon/`)
+        ],
+        use: [
+          'svg-sprite-loader',
+          'svgo-loader'
+        ]
+      })
+    }
   })
 }
diff --git a/packages/ripple-nuxt-ui/package.json b/packages/ripple-nuxt-ui/package.json
@@ -10,6 +10,7 @@
   ],
   "main": "lib/module.js",
   "dependencies": {
+    "app-root-path": "^2.2.1",
     "@dpc-sdp/ripple-global": "1.0.0-beta.7",
     "@dpc-sdp/ripple-icon": "1.0.0-beta.7",
     "svg-sprite-loader": "^3.7.3",