From 633bcace14a201a6daa92a70bd199702ad3226a9 Mon Sep 17 00:00:00 2001
From: squidfunk <martin.donath@squidfunk.com>
Date: Tue, 10 Dec 2019 16:03:11 +0100
Subject: [PATCH] Moved manifest.json up one layer

---
 .gitignore         | 2 +-
 material/base.html | 2 +-
 webpack.config.js  | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index dd48b9d0b..687bf2856 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,8 +31,8 @@ venv
 
 # Files generated by build
 /build
-/material/manifest.json
 /MANIFEST
+/manifest.json
 /site
 
 # Distribution files
diff --git a/material/base.html b/material/base.html
index edc18ea87..05e955a5e 100644
--- a/material/base.html
+++ b/material/base.html
@@ -75,7 +75,7 @@
       {% if font != false %}
         <link href="https://fonts.gstatic.com" rel="preconnect" crossorigin>
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family={{
-              font.text | replace(' ', '+') + ':300,400,400i,700|' +
+              font.text | replace(' ', '+') + ':300,400,400i,700%7C' +
               font.code | replace(' ', '+')
             }}&display=fallback">
         <style>body,input{font-family:"{{ font.text }}","Helvetica Neue",Helvetica,Arial,sans-serif}code,kbd,pre{font-family:"{{ font.code }}","Courier New",Courier,monospace}</style>
diff --git a/webpack.config.js b/webpack.config.js
index aa273d2f4..f0dd5511f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -306,6 +306,7 @@ module.exports = (_env, args) => { // eslint-disable-line complexity
 
       /* Write manifest */
       new ManifestPlugin({
+        fileName: "../manifest.json",
 
         /* This is an ugly workaround for the fact that the manifest plugin
            doesn't handle multiple chunks. See http://bit.ly/2BbfER9 */
@@ -318,7 +319,7 @@ module.exports = (_env, args) => { // eslint-disable-line complexity
       /* Apply manifest */
       new EventHooksPlugin({
         afterEmit: new CallbackTask((compilation, cb) => {
-          const manifest = require(path.resolve("material/manifest.json"))
+          const manifest = require(path.resolve("manifest.json"))
           Object.keys(compilation.assets).forEach(name => {
             if (name.match(/\.html/)) {
               const asset = compilation.assets[name]