From 23c7b5b0a6a4bb6ba79eb8ee61346de623f7aced Mon Sep 17 00:00:00 2001
From: Enrico Guiraud
Date: Thu, 19 Dec 2019 18:00:51 +0100
Subject: Fix urlPath support, let CodiMD be served from a subpath correctly

Webpack now uses relative paths for resources linked from by static
snippets. A templated <base> tag has been introduced in headers
so app.js can set the base URL at runtime.

Signed-off-by: Enrico Guiraud <enrico.guiraud@cern.ch>
---
 public/views/codimd/head.ejs      | 1 +
 public/views/includes/header.ejs  | 2 +-
 public/views/includes/scripts.ejs | 4 ++--
 public/views/index/head.ejs       | 1 +
 public/views/pretty.ejs           | 1 +
 public/views/slide.ejs            | 1 +
 webpack.common.js                 | 2 +-
 webpack.htmlexport.js             | 2 +-
 webpack.prod.js                   | 2 +-
 9 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/public/views/codimd/head.ejs b/public/views/codimd/head.ejs
index 934767f6..71e261fb 100644
--- a/public/views/codimd/head.ejs
+++ b/public/views/codimd/head.ejs
@@ -12,6 +12,7 @@
 <meta property="og:image:alt" content="CodiMD logo">
 <meta property="og:image:type" content="image/png">
 <% } %>
+<base href="<%- serverURL %>/">
 <title><%= title %></title>
 <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
 <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">
diff --git a/public/views/includes/header.ejs b/public/views/includes/header.ejs
index 942a89f9..89f3a0d1 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="<%= webpackConfig.output.baseUrl %><%= htmlWebpackPlugin.files.css[css] %>" rel="stylesheet">
+<link href="<%= htmlWebpackPlugin.files.css[css] %>" rel="stylesheet">
 <% } %>
diff --git a/public/views/includes/scripts.ejs b/public/views/includes/scripts.ejs
index c4f5aa5a..259330af 100644
--- a/public/views/includes/scripts.ejs
+++ b/public/views/includes/scripts.ejs
@@ -1,4 +1,4 @@
-<script src="<%= webpackConfig.output.baseUrl %>/config"></script>
+<script src="config"></script>
 <% for (var js in htmlWebpackPlugin.files.js) { %>
-<script src="<%= webpackConfig.output.baseUrl %><%= htmlWebpackPlugin.files.js[js] %>" defer></script>
+<script src="<%= htmlWebpackPlugin.files.js[js] %>" defer></script>
 <% } %>
diff --git a/public/views/index/head.ejs b/public/views/index/head.ejs
index 0f1e584e..66396adb 100644
--- a/public/views/index/head.ejs
+++ b/public/views/index/head.ejs
@@ -13,6 +13,7 @@
 <meta property="og:image" content="<%- serverURL %>/codimd-icon-1024.png">
 <meta property="og:image:alt" content="CodiMD logo">
 <meta property="og:image:type" content="image/png">
+<base href="<%- serverURL %>/">
 <title>CodiMD - <%= __('Collaborative markdown notes') %></title>
 <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
 <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">
diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs
index 20bb44e3..0ae62bf9 100644
--- a/public/views/pretty.ejs
+++ b/public/views/pretty.ejs
@@ -22,6 +22,7 @@
     <meta property="og:image:alt" content="CodiMD logo">
     <meta property="og:image:type" content="image/png">
     <% } %>
+    <base href="<%- serverURL %>/">
     <title><%= title %></title>
     <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
     <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">
diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index 3331b85d..9fefe4b4 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -11,6 +11,7 @@
         <% if(typeof description !== 'undefined' && description) { %>
         <meta name="description" content="<%= description %>">
         <% } %>
+        <base href="<%- serverURL %>/">
         <title><%= title %></title>
         <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
         <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">
diff --git a/webpack.common.js b/webpack.common.js
index 0aae309d..7b4cefd6 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -352,7 +352,7 @@ module.exports = {
 
   output: {
     path: path.join(__dirname, 'public/build'),
-    publicPath: '/build/',
+    publicPath: 'build/',
     filename: '[name].js'
   },
 
diff --git a/webpack.htmlexport.js b/webpack.htmlexport.js
index dd6f4c01..2aa2bc4f 100644
--- a/webpack.htmlexport.js
+++ b/webpack.htmlexport.js
@@ -14,7 +14,7 @@ module.exports = {
   },
   output: {
     path: path.join(__dirname, 'public/build'),
-    publicPath: '/build/',
+    publicPath: 'build/',
     filename: '[name].js'
   },
   plugins: [
diff --git a/webpack.prod.js b/webpack.prod.js
index 188d9881..4dfac1a8 100644
--- a/webpack.prod.js
+++ b/webpack.prod.js
@@ -9,7 +9,7 @@ module.exports = [
     mode: 'production',
     output: {
       path: path.join(__dirname, 'public/build'),
-      publicPath: '/build/',
+      publicPath: 'build/',
       filename: '[name].[contenthash].js'
     }
   }),
-- 
cgit v1.2.3