From b75d66b7a27fcc7306578d049c25ecd533d1433c Mon Sep 17 00:00:00 2001
From: "Felix W. Dekker" <felix@fwdekker.com>
Date: Wed, 31 Mar 2021 17:32:55 +0200
Subject: [PATCH] Properly flatten copied files in deployment

---
 Gruntfile.js                   |   8 ++++----
 src/main/{ => img}/favicon.ico | Bin
 src/main/{ => img}/favicon.png | Bin
 src/main/{ => img}/favicon.svg |   0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/main/{ => img}/favicon.ico (100%)
 rename src/main/{ => img}/favicon.png (100%)
 rename src/main/{ => img}/favicon.svg (100%)

diff --git a/Gruntfile.js b/Gruntfile.js
index b6ea52e..cbdc341 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,16 +8,16 @@ 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}]
             },
             images: {
-                files: [{expand: true, cwd: "src/main/img/", src: ["**/*.ico", "**/*.png", "**/*.svg"], dest: "dist/"}]
+                files: [{expand: true, cwd: "src/main/", src: ["**/*.{ico,png,svg}"], dest: "dist/", flatten: true}]
             },
             pwa: {
-                files: [{expand: true, cwd: "src/main/", src: ["manifest.json", "sw.js"], dest: "dist/"}]
+                files: [{expand: true, cwd: "src/main/", src: ["manifest.json", "sw.js"], dest: "dist/", flatten: true}]
             },
         },
         focus: {
diff --git a/src/main/favicon.ico b/src/main/img/favicon.ico
similarity index 100%
rename from src/main/favicon.ico
rename to src/main/img/favicon.ico
diff --git a/src/main/favicon.png b/src/main/img/favicon.png
similarity index 100%
rename from src/main/favicon.png
rename to src/main/img/favicon.png
diff --git a/src/main/favicon.svg b/src/main/img/favicon.svg
similarity index 100%
rename from src/main/favicon.svg
rename to src/main/img/favicon.svg