From 9a8658e744c2b7518c4df54ca3ef4668e07705dc Mon Sep 17 00:00:00 2001
From: Edward Shen <code@eddie.sh>
Date: Tue, 18 Jan 2022 01:52:44 -0800
Subject: [PATCH] Fix infra scripts

---
 bin/build.sh       | 16 ++++++----------
 package.json       |  4 ++++
 web/src/render.tsx |  2 +-
 webpack.config.js  |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bin/build.sh b/bin/build.sh
index 96411ef..68cf450 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -20,20 +20,16 @@ set -euxo pipefail
 
 cd "$(git rev-parse --show-toplevel)" || exit 1
 
-# Build frontend assets
-yarn
-
+# Clean resources
 rm -rf dist
-yarn webpack
+
+# Build frontend code
+yarn
+yarn build
+mv dist/static/index.html dist
 
 # Build server
 cargo build --release --bin omegaupload-server
-
-# Prepare assets for upload to webserver
-mkdir -p dist/static
-# Move everything that's not index.html into a `static` subdir
-find dist -not -name index.html -type f -exec mv {} dist/static/ ";"
-
 strip target/release/omegaupload-server
 cp target/release/omegaupload-server dist/omegaupload-server
 
diff --git a/package.json b/package.json
index 814247e..03517d0 100644
--- a/package.json
+++ b/package.json
@@ -15,5 +15,9 @@
   "dependencies": {
     "highlight.js": "^11.4.0",
     "highlightjs-line-numbers.js": "^2.8.0"
+  },
+  "scripts": {
+    "build": "webpack --mode production",
+    "clean": "(git rev-parse --show-toplevel && rm -rf node_modules dist web/pkg)"
   }
 }
diff --git a/web/src/render.tsx b/web/src/render.tsx
index f398385..1688f64 100644
--- a/web/src/render.tsx
+++ b/web/src/render.tsx
@@ -17,7 +17,7 @@
 import './main.scss';
 
 const hljs = require('highlight.js');
-window.hljs = hljs;
+(window as any).hljs = hljs;
 require('highlightjs-line-numbers.js');
 
 function loadFromDb(mimeType: string, name?: string, language?: string) {
diff --git a/webpack.config.js b/webpack.config.js
index 200d157..99d1eec 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -29,7 +29,7 @@ module.exports = {
     extensions: ['.tsx', '.ts', '.js'],
   },
   output: {
-    path: path.resolve(__dirname, 'dist'),
+    path: path.resolve(__dirname, 'dist/static'),
     filename: 'index.js',
   },
   plugins: [