From bc759c87b2a15c118ad4c607b5cb8cd8204f6e35 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 3 Sep 2021 13:06:04 -0500
Subject: [PATCH] Webpack: copy files into `/static` instead of starting them
 there

---
 .gitignore                                    |  20 +++---------------
 .../instance/about.example/dmca.html          |   0
 .../instance/about.example/index.html         |   0
 .../instance/about.example/privacy.html       |   0
 .../instance/about.example/tos.html           |   0
 {static => app}/instance/soapbox.example.json |   0
 {static => app}/sounds/boop.mp3               | Bin
 {static => app}/sounds/boop.ogg               | Bin
 {static => app}/sounds/chat.mp3               | Bin
 {static => app}/sounds/chat.oga               | Bin
 static/instance/about.example/.gitkeep        |   0
 webpack/configuration.js                      | Bin 765 -> 789 bytes
 webpack/production.js                         | Bin 2825 -> 2883 bytes
 webpack/shared.js                             | Bin 3801 -> 4005 bytes
 14 files changed, 3 insertions(+), 17 deletions(-)
 rename {static => app}/instance/about.example/dmca.html (100%)
 rename {static => app}/instance/about.example/index.html (100%)
 rename {static => app}/instance/about.example/privacy.html (100%)
 rename {static => app}/instance/about.example/tos.html (100%)
 rename {static => app}/instance/soapbox.example.json (100%)
 rename {static => app}/sounds/boop.mp3 (100%)
 rename {static => app}/sounds/boop.ogg (100%)
 rename {static => app}/sounds/chat.mp3 (100%)
 rename {static => app}/sounds/chat.oga (100%)
 delete mode 100644 static/instance/about.example/.gitkeep

diff --git a/.gitignore b/.gitignore
index 02f2cfaf81..55d383c8af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,20 +8,6 @@
 /.vs/
 yarn-error.log*
 
-/static/packs
-/static/packs-test
-/static/emoji
-/static/index.html
-/static/index.html.gz
-/static/404.html
-/static/404.html.gz
-/static/manifest.json
-/static/manifest.json.gz
-/static/report.html
-/static/sw.js
-/static/instance/**
-!/static/instance/**.example
-!/static/instance/**.example.*
-!/static/instance/**.example/**
-/static-test
-/public
+/static/
+/static-test/
+/public/
diff --git a/static/instance/about.example/dmca.html b/app/instance/about.example/dmca.html
similarity index 100%
rename from static/instance/about.example/dmca.html
rename to app/instance/about.example/dmca.html
diff --git a/static/instance/about.example/index.html b/app/instance/about.example/index.html
similarity index 100%
rename from static/instance/about.example/index.html
rename to app/instance/about.example/index.html
diff --git a/static/instance/about.example/privacy.html b/app/instance/about.example/privacy.html
similarity index 100%
rename from static/instance/about.example/privacy.html
rename to app/instance/about.example/privacy.html
diff --git a/static/instance/about.example/tos.html b/app/instance/about.example/tos.html
similarity index 100%
rename from static/instance/about.example/tos.html
rename to app/instance/about.example/tos.html
diff --git a/static/instance/soapbox.example.json b/app/instance/soapbox.example.json
similarity index 100%
rename from static/instance/soapbox.example.json
rename to app/instance/soapbox.example.json
diff --git a/static/sounds/boop.mp3 b/app/sounds/boop.mp3
similarity index 100%
rename from static/sounds/boop.mp3
rename to app/sounds/boop.mp3
diff --git a/static/sounds/boop.ogg b/app/sounds/boop.ogg
similarity index 100%
rename from static/sounds/boop.ogg
rename to app/sounds/boop.ogg
diff --git a/static/sounds/chat.mp3 b/app/sounds/chat.mp3
similarity index 100%
rename from static/sounds/chat.mp3
rename to app/sounds/chat.mp3
diff --git a/static/sounds/chat.oga b/app/sounds/chat.oga
similarity index 100%
rename from static/sounds/chat.oga
rename to app/sounds/chat.oga
diff --git a/static/instance/about.example/.gitkeep b/static/instance/about.example/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/webpack/configuration.js b/webpack/configuration.js
index 1e80b65a6b49d39d0e84bd35319d30a821eaeb90..3cd09e2ae5f13f300905de02f195dc2cce90ffc8 100644
GIT binary patch
delta 36
kcmey%I+blhHlw(Xg1TOAfw4M>&QDK=(ute17$-9V0Km)&H~;_u

delta 12
TcmbQr_Lp@-Hsj`I#z~9-Ab$je

diff --git a/webpack/production.js b/webpack/production.js
index 1398d35c881fb418829d1c95cae71662866c3cfa..01ba2d76b9ff69e3347675b2778eaba78a26c7ae 100644
GIT binary patch
delta 73
zcmeAaJ1n;0FSBh;Zh>)4etJ3(Cu*wb>u@Q6L25;EPH9T2l|nRBKtVx0Gq1QLF)uk)
M9i}LD6ALFh08&5{H2?qr

delta 16
XcmX>s)+x5(FEg{IivDIR7EX2mF=zy-

diff --git a/webpack/shared.js b/webpack/shared.js
index df38615636a5a65efa877da4a0e0beb56d078b7e..f8aca47948a5cfeff9ab3b878dcb838b3f38dd08 100644
GIT binary patch
delta 68
zcmca9yHtLIC-3AnJZfBt1qJ%W`K5U&#gi*}l-Z!ng*=8lAeqd(;*!L?<W!Ix2aL1X
Ij(0XA09}q4nE(I)

delta 12
TcmZ1~e^YjYC+}uaz6p!~ABO}e