Skip to content
Permalink
Browse files

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>
  • Loading branch information
bluehood committed Dec 19, 2019
1 parent 313eb74 commit 23c7b5b0a6a4bb6ba79eb8ee61346de623f7aced
@@ -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">
@@ -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">
<% } %>
@@ -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>
<% } %>
@@ -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">
@@ -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">
@@ -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">
@@ -352,7 +352,7 @@ module.exports = {

output: {
path: path.join(__dirname, 'public/build'),
publicPath: '/build/',
publicPath: 'build/',
filename: '[name].js'
},

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

3 comments on commit 23c7b5b

@MartB

This comment has been minimized.

Copy link
Contributor

MartB replied Jan 12, 2020

This commit breaks multiple installations and should be fixed / reverted.
build/cover-styles-pack.css has font paths like build/35e77a38ca9d85c4e8974261be764879.eot
which results in a lookup path of build/build/35e77a38ca9d85c4e8974261be764879.eot

image

Edit:
<base href="..."> does not work for web-fonts apparently so thats the issue i guess.

@Techassi

This comment has been minimized.

Copy link

Techassi replied Jan 12, 2020

Can confirm this behaviour.

Recently installed CodiMD for the first time and the wrong paths resulted in missing fonts as well as missing icons.

"Fixed it" by editing the CSS files from build/35e7[...].eot to /build/35e7[...].eot.
This will break again if the installation gets updated and this error still exists in the source files. Going back and editing it again is no solution.

Edit:
Note: I use "useCDN": false in my config. Maybe loading from CDN still works without any problems and my have led to this behaviour to be unnoticed.

Cheers!

@bluehood

This comment has been minimized.

Copy link
Contributor Author

bluehood replied Jan 12, 2020

See #253

Please sign in to comment.
You can’t perform that action at this time.