From c10b7b0026c311df56df365fdd89cf57d2eb8059 Mon Sep 17 00:00:00 2001
From: Daniel Tomlinson <dtomlinson@panaetius.co.uk>
Date: Sun, 31 May 2020 05:22:10 +0100
Subject: [PATCH] Updating webpack for font

---
 .DS_Store                        | Bin 8196 -> 8196 bytes
 data/panaetius-theme/assets.json |  18 ++++++++++++++++--
 package.json                     |   1 +
 webpack.common.js                |   4 ++--
 webpack.prod.js                  |   8 ++++++--
 yarn.lock                        |   8 ++++++++
 6 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 10adc554ec44617a83936ed6db676cb4cbfdf4ed..b0065d44d5988526db776ee452f330217091203c 100644
GIT binary patch
delta 39
vcmZp1XmOa}&nUGqU^hRb)MOq3?akK(4A>_&EZEF0@ttM!Jkd<1i4AiB3QrCZ

delta 191
zcmZp1XmOa}&nUk!U^hRb{A3;h?Rpl56oyQOVuljWoc!dZoctsP1_l8jwgzI2|6l-Q
zF)+Z@<)j-1C+FuDfJGUYHzLdB=DWB+&EQbo_4rtl-62O*`4lvHSyTlD8OVkUY&I4!
QVc*Oy@ttLJoCq5;017TKp#T5?

diff --git a/data/panaetius-theme/assets.json b/data/panaetius-theme/assets.json
index bc1679b..4f28350 100644
--- a/data/panaetius-theme/assets.json
+++ b/data/panaetius-theme/assets.json
@@ -9,13 +9,27 @@
     "js": "2.lazyload.1168fc21175de558d316.min.js"
   },
   "main": {
-    "css": "main.8d8f975136c9cc17a7c6.min.css",
-    "js": "main.5f5dabd521a484e6869a.min.js"
+    "css": "main.d1dadd1111775dfca1b1.min.css",
+    "js": "main.0de3305519cc1270072a.min.js"
   },
   "vendors~app": {
     "js": "4.vendors~app.5fe693a38fabc29c6181.min.js"
   },
   "vendors~bootstrap": {
     "js": "5.vendors~bootstrap.ebc6358ec2d8424a6fb0.min.js"
+  },
+  "": {
+    "ttf": [
+      "1ca584c47210c1b86d10754c325ad62b.ttf",
+      "2dcef7a784f8318ced92b5b4047fa1f5.ttf",
+      "3a17dce21bdbd88122a2112e60b23a2f.ttf",
+      "b46321476d5515714322049f81d5fb3f.ttf",
+      "bcb8e5ce3b17c1e244d2725cf8e55234.ttf",
+      "df62a7a90f92924e3a685b68d5a49361.ttf"
+    ],
+    "otf": [
+      "21c63a34ea5e74584751e3b6618d29de.otf",
+      "cf6ea537acbd7e39208334261f95783e.otf"
+    ]
   }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 5e1a897..3fb496d 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "bootstrap": "^4.5.0",
     "clean-webpack-plugin": "^3.0.0",
     "css-loader": "^3.5.3",
+    "file-loader": "^6.0.0",
     "jquery": "^3.5.1",
     "mini-css-extract-plugin": "^0.9.0",
     "node-sass": "^4.14.1",
diff --git a/webpack.common.js b/webpack.common.js
index 9e8e83b..63db179 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -8,7 +8,7 @@ module.exports = {
   devtool: "source-map",
   entry: path.resolve(__dirname, "src/main.js"),
   output: {
-    path: path.resolve(__dirname, "dist"),
+    path: path.resolve(__dirname, "static/dist"),
   },
   module: {
     rules: [
@@ -21,7 +21,7 @@ module.exports = {
   },
   plugins: [
     new CleanWebpackPlugin({
-      cleanAfterEveryBuildPatterns: ["dist/*"],
+      cleanAfterEveryBuildPatterns: ["static/dist/*"],
     }),
     new AssetsPlugin({
       filename: "assets.json",
diff --git a/webpack.prod.js b/webpack.prod.js
index 89a1173..c3996a8 100644
--- a/webpack.prod.js
+++ b/webpack.prod.js
@@ -6,7 +6,7 @@ const TerserPlugin = require("terser-webpack-plugin");
 const CssMinimizer = require("optimize-css-assets-webpack-plugin");
 const PurgeCssPlugin = require("purgecss-webpack-plugin");
 const glob = require("glob");
-const path = require("path")
+const path = require("path");
 
 module.exports = merge(common, {
   mode: "production",
@@ -14,7 +14,7 @@ module.exports = merge(common, {
   output: {
     filename: "[name].[contenthash].min.js",
     chunkFilename: "[id].[name].[contenthash].min.js",
-    publicPath: "dist/",
+    publicPath: "/dist/",
   },
   module: {
     rules: [
@@ -28,6 +28,10 @@ module.exports = merge(common, {
           "sass-loader",
         ],
       },
+      {
+        test: /\.(ttf|otf)$/,
+        use: ["file-loader"],
+      },
     ],
   },
   plugins: [
diff --git a/yarn.lock b/yarn.lock
index ad4c96c..5901acd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2537,6 +2537,14 @@ figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
+file-loader@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.0.0.tgz#97bbfaab7a2460c07bcbd72d3a6922407f67649f"
+  integrity sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==
+  dependencies:
+    loader-utils "^2.0.0"
+    schema-utils "^2.6.5"
+
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"