diff --git a/Gruntfile.js b/Gruntfile.js index 54875e1..7659a43 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -16,12 +16,12 @@ module.exports = grunt => { }, focus: { dev: { - include: ["css", "js", "json", "md", "njk"], + include: ["css", "json", "md", "njk"], }, }, replace: { dev: { - src: ["./dist/**/*.html", "./dist/**/*.js"], + src: ["./dist/**/*.html"], replacements: [ { from: "%%VERSION_NUMBER%%", @@ -31,7 +31,7 @@ module.exports = grunt => { overwrite: true }, deploy: { - src: ["./dist/**/*.html", "./dist/**/*.js"], + src: ["./dist/**/*.html"], replacements: [ { from: "%%VERSION_NUMBER%%", @@ -46,10 +46,6 @@ module.exports = grunt => { files: ["src/main/**/*.css"], tasks: ["copy:css"], }, - js: { - files: ["src/main/**/*.js"], - tasks: ["webpack:dev", "replace:dev"], - }, json: { files: ["src/main/**/*.json"], tasks: ["exec:eleventy", "replace:dev"], @@ -63,33 +59,6 @@ module.exports = grunt => { 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"); @@ -98,7 +67,6 @@ module.exports = grunt => { grunt.loadNpmTasks("grunt-exec"); grunt.loadNpmTasks("grunt-focus"); grunt.loadNpmTasks("grunt-text-replace"); - grunt.loadNpmTasks("grunt-webpack"); grunt.registerTask("dev", [ // Pre @@ -106,8 +74,7 @@ module.exports = grunt => { // Generate site "copy:css", "exec:eleventy", - // Compile JS - "webpack:dev", + // Post "replace:dev", ]); grunt.registerTask("dev:server", ["dev", "focus:dev"]); @@ -117,8 +84,7 @@ module.exports = grunt => { // Generate site "copy:css", "exec:eleventy", - // Compile JS - "webpack:deploy", + // Post "replace:deploy", ]); diff --git a/package.json b/package.json index 6f427bb..e66c376 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blog", - "version": "1.2.1", + "version": "1.2.2", "description": "F.W. Dekker's personal blog.", "author": "F.W. Dekker", "browser": "dist/bundle.js", @@ -24,9 +24,6 @@ "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.45.1", - "webpack-cli": "^4.7.2" + "grunt-text-replace": "^0.4.0" } } diff --git a/src/main/_includes/default.njk b/src/main/_includes/default.njk index d8d8112..abfc241 100644 --- a/src/main/_includes/default.njk +++ b/src/main/_includes/default.njk @@ -8,6 +8,11 @@ + + + + + {% if page.title %}{{ page.title }}{% else %}Blog{% endif %} | FWDekker @@ -37,7 +42,5 @@ - - diff --git a/src/main/js/main.js b/src/main/js/main.js deleted file mode 100644 index e125a90..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("/Blog/")); - $("#footer").appendChild(footer({ - vcsURL: "https://git.fwdekker.com/FWDekker/blog/", - version: "v%%VERSION_NUMBER%%" - })); -});