From 82f23e2aca3b0cb36edaed3fd3b2ec1b5f577df8 Mon Sep 17 00:00:00 2001
From: nkzawa <naoyuki.kanezawa@gmail.com>
Date: Sun, 16 Oct 2016 13:01:17 +0900
Subject: [PATCH] fix generating _error.js

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

diff --git a/server/build/webpack.js b/server/build/webpack.js
index 7d3e70b2bd..3d68817707 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -15,9 +15,8 @@ export default async function createCompiler(dir, { hotReload = false } = {}) {
   }
 
   const errEntry = join('_bundles', 'pages', '_error.js')
-  if (!entry[errEntry]) {
-    entry[errEntry] = resolve(__dirname, '..', '..', 'pages', '_error.js')
-  }
+  const defaultErrorPath = resolve(__dirname, '..', '..', 'pages', '_error.js')
+  if (!entry[errEntry]) entry[errEntry] = defaultErrorPath
 
   const nodeModulesDir = resolve(__dirname, '..', '..', '..', 'node_modules')
 
@@ -37,7 +36,10 @@ export default async function createCompiler(dir, { hotReload = false } = {}) {
   const loaders = [{
     test: /\.js$/,
     loader: 'emit-file-loader',
-    include: dir,
+    include: [
+      dir,
+      resolve(__dirname, '..', '..', 'pages')
+    ],
     exclude: /node_modules/,
     query: {
       name: '[path][name].[ext]'
@@ -113,6 +115,12 @@ export default async function createCompiler(dir, { hotReload = false } = {}) {
         { test: /\.json$/, loader: 'json-loader' }
       ],
       loaders
+    },
+    customInterpolateName: function (url, name, opts) {
+      if (defaultErrorPath === this.resourcePath) {
+        return 'pages/_error.js'
+      }
+      return url
     }
   })
 }
-- 
GitLab