From 101266d1bd6c8c88ad612bc48e57d9634ea817ce Mon Sep 17 00:00:00 2001
From: Arunoda Susiripala <arunoda.susiripala@gmail.com>
Date: Wed, 11 Jan 2017 05:36:24 +0530
Subject: [PATCH 1/2] Remove default next pages compilation from the main
 babel-loader. This will fix the issue when the user ignore node_modules via
 our .babelrc option.

---
 server/build/babel/preset.js |  3 ++-
 server/build/webpack.js      | 21 +++++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/server/build/babel/preset.js b/server/build/babel/preset.js
index 7b57a72286dde..37817b784d56c 100644
--- a/server/build/babel/preset.js
+++ b/server/build/babel/preset.js
@@ -27,7 +27,8 @@ module.exports = {
           'next/head': require.resolve('../../../lib/head'),
           'next/document': require.resolve('../../../server/document'),
           'next/router': require.resolve('../../../lib/router'),
-          'styled-jsx/style': require.resolve('styled-jsx/style')
+          'styled-jsx/style': require.resolve('styled-jsx/style'),
+          'ansi-html': require.resolve('ansi-html')
         }
       }
     ]
diff --git a/server/build/webpack.js b/server/build/webpack.js
index f3fc98053748f..3785eaff780e8 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -143,28 +143,21 @@ export default async function createCompiler (dir, { dev = false, quiet = false
   }, {
     loader: 'babel-loader',
     include: nextPagesDir,
-    options: {
+    exclude (str) {
+      return /node_modules/.test(str) && str.indexOf(nextPagesDir) !== 0
+    },
+    query: {
       babelrc: false,
       cacheDirectory: true,
       sourceMaps: dev ? 'both' : false,
-      plugins: [
-        [
-          require.resolve('babel-plugin-module-resolver'),
-          {
-            alias: {
-              'ansi-html': require.resolve('ansi-html'),
-              'styled-jsx/style': require.resolve('styled-jsx/style')
-            }
-          }
-        ]
-      ]
+      presets: [require.resolve('./babel/preset')]
     }
   }, {
     test: /\.js(\?[^?]*)?$/,
     loader: 'babel-loader',
-    include: [dir, nextPagesDir],
+    include: [dir],
     exclude (str) {
-      return /node_modules/.test(str) && str.indexOf(nextPagesDir) !== 0
+      return /node_modules/.test(str)
     },
     query: mainBabelOptions
   }])

From 6cbc6f7abaa1a8128539f0da9757a978755841cb Mon Sep 17 00:00:00 2001
From: Arunoda Susiripala <arunoda.susiripala@gmail.com>
Date: Wed, 11 Jan 2017 22:47:10 +0530
Subject: [PATCH 2/2] Change babel-loaders 'query' to 'options'. That's what's
 supported/recommended in webpack 2

---
 server/build/webpack.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/build/webpack.js b/server/build/webpack.js
index 3785eaff780e8..c69077127b22e 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -146,7 +146,7 @@ export default async function createCompiler (dir, { dev = false, quiet = false
     exclude (str) {
       return /node_modules/.test(str) && str.indexOf(nextPagesDir) !== 0
     },
-    query: {
+    options: {
       babelrc: false,
       cacheDirectory: true,
       sourceMaps: dev ? 'both' : false,
@@ -159,7 +159,7 @@ export default async function createCompiler (dir, { dev = false, quiet = false
     exclude (str) {
       return /node_modules/.test(str)
     },
-    query: mainBabelOptions
+    options: mainBabelOptions
   }])
 
   let webpackConfig = {