LailaTheElf/hedgedoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix urlPath support, let CodiMD be served from a subpath correctly

Browse Source 
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>
This commit is contained in:
Enrico Guiraud 2019-12-19 18:00:51 +01:00
parent 313eb74ed6
commit 23c7b5b0a6
No known key found for this signature in database
GPG Key ID: 5B22DF4EFB748A2B
9 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/views/codimd/head.ejs
View File

@ -12,6 +12,7 @@
<meta property="og:image:alt" content="CodiMD logo"> <meta property="og:image:alt" content="CodiMD logo">
<meta property="og:image:type" content="image/png"> <meta property="og:image:type" content="image/png">
<% } %> <% } %>
<base href="<%- serverURL %>/">
<title><%= title %></title> <title><%= title %></title>
<link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png"> <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
<link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png"> <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">

2
public/views/includes/header.ejs
View File

@ -1,3 +1,3 @@
<% for (var css in htmlWebpackPlugin.files.css) { %> <% 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">
<% } %> <% } %>

4
public/views/includes/scripts.ejs
View File

@ -1,4 +1,4 @@
<script src="<%= webpackConfig.output.baseUrl %>/config"></script> <script src="config"></script>
<% for (var js in htmlWebpackPlugin.files.js) { %> <% 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>
<% } %> <% } %>

1
public/views/index/head.ejs
View File

@ -13,6 +13,7 @@
<meta property="og:image" content="<%- serverURL %>/codimd-icon-1024.png"> <meta property="og:image" content="<%- serverURL %>/codimd-icon-1024.png">
<meta property="og:image:alt" content="CodiMD logo"> <meta property="og:image:alt" content="CodiMD logo">
<meta property="og:image:type" content="image/png"> <meta property="og:image:type" content="image/png">
<base href="<%- serverURL %>/">
<title>CodiMD - <%= __('Collaborative markdown notes') %></title> <title>CodiMD - <%= __('Collaborative markdown notes') %></title>
<link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png"> <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
<link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png"> <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">

1
public/views/pretty.ejs
View File

@ -22,6 +22,7 @@
<meta property="og:image:alt" content="CodiMD logo"> <meta property="og:image:alt" content="CodiMD logo">
<meta property="og:image:type" content="image/png"> <meta property="og:image:type" content="image/png">
<% } %> <% } %>
<base href="<%- serverURL %>/">
<title><%= title %></title> <title><%= title %></title>
<link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png"> <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
<link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png"> <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">

1
public/views/slide.ejs
View File

@ -11,6 +11,7 @@
<% if(typeof description !== 'undefined' && description) { %> <% if(typeof description !== 'undefined' && description) { %>
<meta name="description" content="<%= description %>"> <meta name="description" content="<%= description %>">
<% } %> <% } %>
<base href="<%- serverURL %>/">
<title><%= title %></title> <title><%= title %></title>
<link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png"> <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
<link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png"> <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">

2
webpack.common.js
View File

@ -352,7 +352,7 @@ module.exports = {
output: { output: {
path: path.join(__dirname, 'public/build'), path: path.join(__dirname, 'public/build'),
publicPath: '/build/', publicPath: 'build/',
filename: '[name].js' filename: '[name].js'
}, },

2
webpack.htmlexport.js
View File

@ -14,7 +14,7 @@ module.exports = {
}, },
output: { output: {
path: path.join(__dirname, 'public/build'), path: path.join(__dirname, 'public/build'),
publicPath: '/build/', publicPath: 'build/',
filename: '[name].js' filename: '[name].js'
}, },
plugins: [ plugins: [

2
webpack.prod.js
View File

@ -9,7 +9,7 @@ module.exports = [
mode: 'production', mode: 'production',
output: { output: {
path: path.join(__dirname, 'public/build'), path: path.join(__dirname, 'public/build'),
publicPath: '/build/', publicPath: 'build/',
filename: '[name].[contenthash].js' filename: '[name].[contenthash].js'
} }
}), }),