diff --git a/Gruntfile.js b/Gruntfile.js index 531a5f3..df3d43d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -8,10 +8,10 @@ module.exports = grunt => { }, copy: { css: { - files: [{expand: true, cwd: "src/main/css/", src: "**/*.css", dest: "dist/"}] + files: [{expand: true, cwd: "src/main/", src: "**/*.css", dest: "dist/", flatten: true}] }, html: { - files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/"}] + files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/", flatten: true}] }, }, focus: { @@ -21,7 +21,7 @@ module.exports = grunt => { }, replace: { dev: { - src: ["./dist/*.html", "./dist/*.js"], + src: ["./dist/**/*.html", "./dist/**/*.js"], replacements: [ { from: "%%VERSION_NUMBER%%", @@ -31,7 +31,7 @@ module.exports = grunt => { overwrite: true }, deploy: { - src: ["./dist/*.html", "./dist/*.js"], + src: ["./dist/**/*.html", "./dist/**/*.js"], replacements: [ { from: "%%VERSION_NUMBER%%", @@ -61,7 +61,7 @@ module.exports = grunt => { }, webpack: { options: { - entry: "./src/main/js/index.js", + entry: "./src/main/js/main.js", module: { rules: [ { diff --git a/package-lock.json b/package-lock.json index fd45daf..e587867 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index 462697b..ff66a91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "doomsday", - "version": "1.3.11", + "version": "1.3.12", "description": "Test your mastery of Conway's Doomsday rule.", "author": "Felix W. Dekker", "browser": "dist/bundle.js", @@ -15,19 +15,16 @@ "dev:server": "grunt dev:server", "deploy": "grunt deploy" }, - "dependencies": { - "@fwdekker/template": "^0.0.24" - }, "devDependencies": { "grunt": "^1.3.0", - "grunt-cli": "^1.4.1", + "grunt-cli": "^1.4.2", "grunt-contrib-clean": "^2.0.0", "grunt-contrib-copy": "^1.0.0", "grunt-contrib-watch": "^1.1.0", "grunt-focus": "^1.0.0", "grunt-text-replace": "^0.4.0", - "grunt-webpack": "^4.0.2", - "webpack": "^5.28.0", - "webpack-cli": "^4.5.0" + "grunt-webpack": "^4.0.3", + "webpack": "^5.33.2", + "webpack-cli": "^4.6.0" } } diff --git a/src/main/index.html b/src/main/index.html index da11e02..96c37b2 100644 --- a/src/main/index.html +++ b/src/main/index.html @@ -11,22 +11,22 @@