From 8f3933b21dfeaaaaeb6a0de68f40dafd2d27b08c Mon Sep 17 00:00:00 2001
From: "Felix W. Dekker" <felix@fwdekker.com>
Date: Tue, 8 Jun 2021 23:13:08 +0200
Subject: [PATCH] Replace extra JS script with template meta tags

---
 Gruntfile.js          |  44 +++---------------------------------------
 README.md             |   2 +-
 package-lock.json     | Bin 435954 -> 435917 bytes
 package.json          |  11 ++++-------
 src/main/js/main.js   |  11 -----------
 src/main/template.njk |   8 ++++++--
 6 files changed, 14 insertions(+), 62 deletions(-)
 delete mode 100644 src/main/js/main.js

diff --git a/Gruntfile.js b/Gruntfile.js
index 38c7be7..83656d7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,7 +11,7 @@ module.exports = grunt => {
         },
         focus: {
             dev: {
-                include: ["js", "json", "md", "njk"],
+                include: ["json", "njk"],
             },
         },
         replace: {
@@ -37,50 +37,15 @@ module.exports = grunt => {
             },
         },
         watch: {
-            js: {
-                files: ["src/main/**/*.js"],
-                tasks: ["webpack:dev", "replace:dev"],
-            },
             json: {
                 files: ["src/main/**/*.json"],
                 tasks: ["exec:eleventy", "replace:dev"],
             },
-            md: {
-                files: ["src/main/**/*.md"],
-                tasks: ["exec:eleventy", "replace:dev"],
-            },
             njk: {
                 files: ["src/main/**/*.njk"],
                 tasks: ["exec:eleventy", "replace:dev"],
             },
         },
-        webpack: {
-            options: {
-                entry: "./src/main/js/main.js",
-                module: {
-                    rules: [
-                        {
-                            test: /\.js$/,
-                            exclude: /node_modules/,
-                        },
-                    ],
-                },
-                resolve: {
-                    extensions: [".js"],
-                },
-                output: {
-                    filename: "bundle.js",
-                    path: path.resolve(__dirname, "dist/"),
-                },
-            },
-            dev: {
-                mode: "development",
-                devtool: "inline-source-map",
-            },
-            deploy: {
-                mode: "production",
-            },
-        },
     });
 
     grunt.loadNpmTasks("grunt-contrib-clean");
@@ -88,15 +53,13 @@ module.exports = grunt => {
     grunt.loadNpmTasks("grunt-exec");
     grunt.loadNpmTasks("grunt-focus");
     grunt.loadNpmTasks("grunt-text-replace");
-    grunt.loadNpmTasks("grunt-webpack");
 
     grunt.registerTask("dev", [
         // Pre
         "clean",
         // Generate site
         "exec:eleventy",
-        // Compile JS
-        "webpack:dev",
+        // Insert version number
         "replace:dev",
     ]);
     grunt.registerTask("dev:server", ["dev", "focus:dev"]);
@@ -105,8 +68,7 @@ module.exports = grunt => {
         "clean",
         // Generate site
         "exec:eleventy",
-        // Compile JS
-        "webpack:deploy",
+        // Insert version number
         "replace:deploy",
     ]);
 
diff --git a/README.md b/README.md
index eb7d108..1689735 100644
--- a/README.md
+++ b/README.md
@@ -20,4 +20,4 @@ $> npm run deploy
 ```
 
 You may need to change the `pathprefix` option of Eleventy when using WebStorm so that the root of the blog is changed
-to `/error-pages/dist/` instead of `/`.
+to `/error-pages/dist/` instead of `/error/`.
diff --git a/package-lock.json b/package-lock.json
index 4def3f859261790ae7525418e85433d71a95e7ad..b7c2bbf6a4fc923fdc9b955c08520a68ffd1bc16 100644
GIT binary patch
delta 3128
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

delta 3231
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
Z0vM<T@Y`LZ0sRB^>>vE}`}pjRe*xS+ZF~R#

diff --git a/package.json b/package.json
index b2ccd11..195dc9f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "error-pages",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "description": "Error pages for my website.",
     "author": "Felix W. Dekker",
     "browser": "dist/bundle.js",
@@ -17,15 +17,12 @@
     },
     "devDependencies": {
         "@11ty/eleventy": "^0.12.1",
-        "grunt": "^1.4.0",
-        "grunt-cli": "^1.4.2",
+        "grunt": "^1.4.1",
+        "grunt-cli": "^1.4.3",
         "grunt-contrib-clean": "^2.0.0",
         "grunt-contrib-watch": "^1.1.0",
         "grunt-exec": "^3.0.0",
         "grunt-focus": "^1.0.0",
-        "grunt-text-replace": "^0.4.0",
-        "grunt-webpack": "^4.0.3",
-        "webpack": "^5.36.2",
-        "webpack-cli": "^4.7.0"
+        "grunt-text-replace": "^0.4.0"
     }
 }
diff --git a/src/main/js/main.js b/src/main/js/main.js
deleted file mode 100644
index 16bf910..0000000
--- a/src/main/js/main.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// noinspection JSUnresolvedVariable
-const {$, doAfterLoad, footer, nav} = window.fwdekker;
-
-
-doAfterLoad(() => {
-    $("#nav").appendChild(nav("/"));
-    $("#footer").appendChild(footer({
-        vcsURL: "https://git.fwdekker.com/FWDekker/error-pages/",
-        version: "v%%VERSION_NUMBER%%"
-    }));
-});
diff --git a/src/main/template.njk b/src/main/template.njk
index 1992521..dd438bb 100644
--- a/src/main/template.njk
+++ b/src/main/template.njk
@@ -14,6 +14,12 @@ permalink: "{{ errorPage.code | slug }}.html"
     <meta name="application-name" content="{{ site.title }}" />
     <meta name="theme-color" content="#0033cc" />
 
+    <meta name="fwd:nav:target" content="#nav" />
+    <meta name="fwd:nav:highlight-path" content="/" />
+    <meta name="fwd:footer:target" content="#footer" />
+    <meta name="fwd:footer:vcs-url" content="https://git.fwdekker.com/FWDekker/error-pages/" />
+    <meta name="fwd:footer:version" content="v%%VERSION_NUMBER%%" />
+
     <title>{{ errorPage.name }} | FWDekker</title>
 
     <link rel="stylesheet" href="https://static.fwdekker.com/fonts/roboto/roboto.css" />
@@ -40,7 +46,5 @@ permalink: "{{ errorPage.code | slug }}.html"
 </main>
 
 <script src="https://static.fwdekker.com/lib/template/2.x.x/template.js"></script>
-<!--suppress HtmlUnknownTarget -->
-<script src="{{ '/bundle.js?v=%%VERSION_NUMBER%%' | url }}"></script>
 </body>
 </html>