From 2913d90109d73901c22fefc7921ae2affac5bb43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 11 Jun 2017 21:04:59 +0200
Subject: [PATCH] Remove `build.loaders` option

---
 lib/build.js               | 21 +--------------------
 lib/webpack/base.config.js | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/lib/build.js b/lib/build.js
index 36b2cf5286..7665b4bc8d 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -35,31 +35,13 @@ const defaults = {
     app: 'nuxt.bundle.[chunkhash].js'
   },
   vendor: [],
-  loaders: [],
   plugins: [],
   babel: {},
   postcss: [],
   templates: [],
   watch: []
 }
-const defaultsLoaders = [
-  {
-    test: /\.(png|jpe?g|gif|svg)$/,
-    loader: 'url-loader',
-    query: {
-      limit: 1000, // 1KO
-      name: 'img/[name].[hash:7].[ext]'
-    }
-  },
-  {
-    test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-    loader: 'url-loader',
-    query: {
-      limit: 1000, // 1 KO
-      name: 'fonts/[name].[hash:7].[ext]'
-    }
-  }
-]
+
 const defaultsPostcss = [
   require('autoprefixer')({
     browsers: ['last 3 versions']
@@ -69,7 +51,6 @@ const defaultsPostcss = [
 export function options () {
   // Defaults build options
   let extraDefaults = {}
-  if (this.options.build && !Array.isArray(this.options.build.loaders)) extraDefaults.loaders = defaultsLoaders
   if (this.options.build && !Array.isArray(this.options.build.postcss)) extraDefaults.postcss = defaultsPostcss
   this.options.build = _.defaultsDeep(this.options.build, defaults, extraDefaults)
   /* istanbul ignore if */
diff --git a/lib/webpack/base.config.js b/lib/webpack/base.config.js
index 406f198fb7..46eb0a3221 100644
--- a/lib/webpack/base.config.js
+++ b/lib/webpack/base.config.js
@@ -77,7 +77,23 @@ export default function ({ isClient, isServer }) {
         { test: /\.less$/, use: styleLoader.call(this, 'less', 'less-loader') },
         { test: /\.sass$/, use: styleLoader.call(this, 'sass', 'sass-loader?indentedSyntax&sourceMap') },
         { test: /\.scss$/, use: styleLoader.call(this, 'sass', 'sass-loader?sourceMap') },
-        { test: /\.styl(us)?$/, use: styleLoader.call(this, 'stylus', 'stylus-loader') }
+        { test: /\.styl(us)?$/, use: styleLoader.call(this, 'stylus', 'stylus-loader') },
+        {
+          test: /\.(png|jpe?g|gif|svg)$/,
+          loader: 'url-loader',
+          query: {
+            limit: 1000, // 1KO
+            name: 'img/[name].[hash:7].[ext]'
+          }
+        },
+        {
+          test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
+          loader: 'url-loader',
+          query: {
+            limit: 1000, // 1 KO
+            name: 'fonts/[name].[hash:7].[ext]'
+          }
+        }
       ]
     },
     plugins: this.options.build.plugins
@@ -88,8 +104,6 @@ export default function ({ isClient, isServer }) {
       new ExtractTextPlugin({filename: this.options.build.filenames.css})
     )
   }
-  // Add nuxt build loaders (can be configured in nuxt.config.js)
-  config.module.rules = config.module.rules.concat(this.options.build.loaders)
   // Return config
   return config
 }