Update build process

`npm run build` now generates a .app folder with the minimal run files
`npm run electron` now uses the .app contents as a base
deploy-dev.yml should upload just the .app folder after building (not tested yet)

.github/workflows/deploy-dev.yml

@@ -29,7 +29,7 @@ jobs:
       - run: npm run build
       - uses: actions/upload-pages-artifact@v1
         with:
-          path: "."
+          path: ".app"
       - name: Deploy to gh pages
         id: deployment
         uses: actions/deploy-pages@v1

.gitignore

@@ -12,7 +12,8 @@ Netburner.txt
 /input/bitburner.api.json
 .cypress
 
-# tmp folder for electron
+# tmp folder for build and electron
+.app
 .package
 .build
 

package.json

@@ -105,7 +105,7 @@
     "format:report-diff": "bash -c 'if [[ $(git diff --name-only --diff-filter=ACMRTUXB origin/dev | grep -E \"(.js$|.jsx$|.ts$|.tsx$)\" | wc -c) -ne 0 ]]; then prettier -c $(git diff --name-only --diff-filter=ACMRTUXB origin/dev | grep -E \"(.js$|.jsx$|.ts$|.tsx$)\" | xargs); fi'",
     "start": "http-server -p 8000",
     "start:dev": "webpack serve --progress --env devServer --mode development",
-    "build": "webpack --mode production",
+    "build": "bash ./tools/build.sh",
     "build:dev": "webpack --mode development",
     "lint": "eslint --fix --ext js,jsx,ts,tsx --max-warnings 0 src",
     "lint:report": "eslint --ext js,jsx,ts,tsx --max-warnings 0 src",

tools/build.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# builds the game in the root folder
+webpack --mode production
+
+# Clear out any files remaining from old builds and recreate folder
+rm -rf .app
+mkdir .app
+
+# Should be all the files needed.
+cp index.html .app
+cp favicon.ico .app
+cp -r dist .app

tools/package-electron.sh

@@ -1,18 +1,15 @@
 #!/bin/bash
 
-set -euxo pipefail
+# Clear out any files remaining from old builds and recreate folder
-
-# Clear out any files remaining from old builds
 rm -rf .package
+mkdir .package
 
-mkdir -p .package/dist/ || true
+# .app should have the fully built game already after npm run build
-
+cp -r .app/* .package
-cp index.html .package
-cp favicon.ico .package
 cp -r electron/* .package
+
 # steam_appid.txt would end up in the resource dir
 rm .package/steam_appid.txt
-cp -r dist .package
 
 # Install electron sub-dependencies
 cd electron