fix: Make it possible to use nested pages

micromata · Apr 26, 2018 · 5e533ba · 5e533ba
1 parent a94d678
commit 5e533ba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/build/handlebars.js b/build/handlebars.js
@@ -45,7 +45,7 @@ metalsmith(__dirname)
 	.use(layouts({
 		directory: path.join(__dirname, '../', settings.sources.handlebars, 'layouts'),
 		default: 'default.hbs',
-		pattern: '*.hbs'
+		pattern: '**/*.hbs'
 	}))
 
 	// Render handlebars content pages
@@ -57,7 +57,7 @@ metalsmith(__dirname)
 	}))
 
 	// Only build HTML files
-	.use(filter('*.html'))
+	.use(filter(['**/*.html', 'handlebars']))
 
 	// Finally build files
 	.build(err => {

diff --git a/build/webpack/config.output.js b/build/webpack/config.output.js
@@ -7,5 +7,6 @@ const configFile = require('../../baumeister.json');
 export const output = {
 	path: isDevMode() ? path.join(__dirname, '../', mainDirectories.dev) : path.join(__dirname, '../', mainDirectories.prod),
 	filename: configFile.cacheBusting ? 'app/[name].[chunkhash].bundle.js' : 'app/[name].bundle.js',
-	chunkFilename: configFile.cacheBusting ? 'app/[name].[chunkhash].bundle.js' : 'app/[name].bundle.js'
+	chunkFilename: configFile.cacheBusting ? 'app/[name].[chunkhash].bundle.js' : 'app/[name].bundle.js',
+	publicPath: '/'
 };
diff --git a/build/webpack/config.plugins.js b/build/webpack/config.plugins.js
@@ -53,7 +53,7 @@ const generalPlugins = [
 					if (!($1 in manifest.assets)) {
 						return `<!-- No ${$1} to be bundled -->`;
 					}
-					return /\.css/g.test($1) ? `<link href="${manifest.assets[$1]}" rel="stylesheet">` : `<script src="${manifest.assets[$1]}"></script>`;
+					return /\.css/g.test($1) ? `<link href="/${manifest.assets[$1]}" rel="stylesheet">` : `<script src="/${manifest.assets[$1]}"></script>`;
 				});
 			}
 		},