From 01680ca58448af4e39e7b8f0c40784639a6ccc54 Mon Sep 17 00:00:00 2001
From: Olivier Gagnon <oli.gagnon4418@gmail.com>
Date: Thu, 27 Jan 2022 20:44:50 -0500
Subject: [PATCH] fix build

---
 favicon.ico       | Bin 0 -> 15406 bytes
 package.sh        |  25 +++++++++++++++++++++----
 webpack.config.js |  13 ++++++-------
 3 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 favicon.ico

diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..531647d81a1cc81618973518df17f0dbc6bf72dc
GIT binary patch
literal 15406
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

literal 0
HcmV?d00001

diff --git a/package.sh b/package.sh
index 274b1469b..4dcd7fefd 100755
--- a/package.sh
+++ b/package.sh
@@ -3,10 +3,27 @@
 # Clear out any files remaining from old builds
 rm -rf .package
 
-mkdir -p .package/dist/
+mkdir -p .package/dist/src/ThirdParty || true
+mkdir -p .package/src/ThirdParty || true
+mkdir -p .package/node_modules || true
+
+cp index.html .package
 cp -r electron/* .package
-cp -r dist .package
-cp index.html .package/index.html
+cp -r dist/ext .package/dist
+cp -r dist/icons .package/dist
+cp -r dist/images .package/dist
+
+# The css files
+cp dist/vendor.css .package/dist
+cp main.css .package/main.css
+
+# The js files.
+cp dist/vendor.bundle.js .package/dist/vendor.bundle.js
+cp main.bundle.js .package/main.bundle.js
+
+# Source maps
+cp dist/vendor.bundle.js.map .package/dist/vendor.bundle.js.map
+cp main.bundle.js.map .package/main.bundle.js.map
 
 # Install electron sub-dependencies
 cd electron
@@ -15,4 +32,4 @@ cd ..
 
 BUILD_PLATFORM="${1:-"all"}"
 # And finally build the app.
-npm run electron:packager-$BUILD_PLATFORM
+npm run electron:packager-$BUILD_PLATFORM
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index c96e565be..2bd397aac 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -63,8 +63,7 @@ module.exports = (env, argv) => {
       new HtmlWebpackPlugin({
         title: "Bitburner",
         template: "src/index.html",
-        filename: "../index.html",
-        favicon: "assets/favicon.ico",
+        favicon: "favicon.ico",
         googleAnalytics: {
           trackingId: "UA-100157497-1",
         },
@@ -137,7 +136,7 @@ module.exports = (env, argv) => {
     // },
     entry: entry,
     output: {
-      path: path.resolve(__dirname, outputDirectory),
+      path: path.resolve(__dirname, "./"),
       filename: "[name].bundle.js",
     },
     module: {
@@ -159,10 +158,10 @@ module.exports = (env, argv) => {
         },
         {
           test: /\.(png|jpe?g|gif|jp2|webp)$/,
-          loader: 'file-loader',
+          loader: "file-loader",
           options: {
-            name: '[contenthash].[ext]',
-            outputPath: 'images',
+            name: "[contenthash].[ext]",
+            outputPath: "dist/images",
           },
         },
       ],
@@ -185,7 +184,7 @@ module.exports = (env, argv) => {
         cacheGroups: {
           vendor: {
             test: /[\\/]node_modules[\\/]/,
-            name: `vendor`,
+            name: `${outputDirectory}/vendor`,
             chunks: "all",
           },
         },