From 7747bfe0f233db016cbd40a921ab7f0bc377b02b Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 22 Jan 2021 15:17:17 +0000
Subject: [PATCH] Fixed prod build and Actions now creates a sitemap

---
 .github/workflows/main.yml | 3 +++
 Gruntfile.js               | 4 ----
 webpack.config.js          | 4 ++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 274d9f0f..acada9f1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,6 +30,9 @@ jobs:
       run: npx grunt prod
     - name: UI Tests
       run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
+    - name: Generate sitemap
+      run: npx grunt exec:sitemap
+    # - name: grunt copy:ghPages
     # - name: Deploy
     #   uses: peaceiris/actions-gh-pages@v3
     #   with:
diff --git a/Gruntfile.js b/Gruntfile.js
index 983b662d..cb76118e 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -242,10 +242,6 @@ module.exports = function (grunt) {
                     entry: Object.assign({
                         main: "./src/web/index.js"
                     }, moduleEntryPoints),
-                    output: {
-                        publicPath: "",
-                        globalObject: "this"
-                    },
                     resolve: {
                         alias: {
                             "./config/modules/OpModules.mjs": "./config/modules/Default.mjs"
diff --git a/webpack.config.js b/webpack.config.js
index 4fcc0438..73da0858 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -34,6 +34,10 @@ const banner = `/**
 
 
 module.exports = {
+    output: {
+        publicPath: "",
+        globalObject: "this"
+    },
     plugins: [
         new webpack.ProvidePlugin({
             $: "jquery",