diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 000000000..531647d81 Binary files /dev/null and b/favicon.ico differ 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", }, },