From 62c703baa18d5455261bf1dc18e218914c383f12 Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han <jacky_cute0808@hotmail.com>
Date: Mon, 12 Dec 2016 12:19:12 +0800
Subject: [PATCH] Fix the generate template not including base url variable

---
 public/views/includes/header.ejs  | 2 +-
 public/views/includes/scripts.ejs | 2 +-
 webpackBaseConfig.js              | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/views/includes/header.ejs b/public/views/includes/header.ejs
index 89f3a0d..942a89f 100644
--- a/public/views/includes/header.ejs
+++ b/public/views/includes/header.ejs
@@ -1,3 +1,3 @@
 <% for (var css in htmlWebpackPlugin.files.css) { %>
-<link href="<%= htmlWebpackPlugin.files.css[css] %>" rel="stylesheet">
+<link href="<%= webpackConfig.output.baseUrl %><%= htmlWebpackPlugin.files.css[css] %>" rel="stylesheet">
 <% } %>
diff --git a/public/views/includes/scripts.ejs b/public/views/includes/scripts.ejs
index 4eec75e..20d4003 100644
--- a/public/views/includes/scripts.ejs
+++ b/public/views/includes/scripts.ejs
@@ -1,3 +1,3 @@
 <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
-<script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>" defer></script>
+<script src="<%= webpackConfig.output.baseUrl %><%= htmlWebpackPlugin.files.chunks[chunk].entry %>" defer></script>
 <% } %>
diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js
index 7d5c3e1..20a21b6 100644
--- a/webpackBaseConfig.js
+++ b/webpackBaseConfig.js
@@ -329,7 +329,8 @@ module.exports = {
     output: {
         path: path.join(__dirname, 'public/build'),
         publicPath: '/build/',
-        filename: '[name].js'
+        filename: '[name].js',
+        baseUrl: '<%- url %>'
     },
 
     resolve: {