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 4def3f8..b7c2bbf 100644 Binary files a/package-lock.json and b/package-lock.json differ 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" + + + + + + {{ errorPage.name }} | FWDekker @@ -40,7 +46,5 @@ permalink: "{{ errorPage.code | slug }}.html" - -