diff --git a/package.json b/package.json index 4167654fe..a11d09d81 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "test:watch": "jest --watch", "watch": "webpack --watch --mode production", "watch:dev": "webpack --watch --mode development", - "electron": "sh ./package.sh", + "electron": "sh ./tools/package-electron.sh", "electron:packager": "electron-packager .package bitburner --all --out .build --overwrite --icon .package/icon.png --no-prune", "electron:packager-all": "electron-packager .package bitburner --all --out .build --overwrite --icon .package/icon.png", "electron:packager-win": "electron-packager .package bitburner --platform win32 --arch x64 --out .build --overwrite --icon .package/icon.png", diff --git a/package.sh b/package.sh deleted file mode 100755 index 6d3fc82eb..000000000 --- a/package.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -# Clear out any files remaining from old builds -rm -rf .package - -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/ext .package/dist -cp -r dist/icons .package/dist -cp -r dist/images .package/dist - -# 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 -npm install -cd .. - -BUILD_PLATFORM="${1:-"all"}" -# And finally build the app. -npm run electron:packager-$BUILD_PLATFORM \ No newline at end of file diff --git a/tools/package-electron.sh b/tools/package-electron.sh new file mode 100644 index 000000000..c0520993f --- /dev/null +++ b/tools/package-electron.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +set -euxo pipefail + +# Clear out any files remaining from old builds +rm -rf .package + +mkdir -p .package/dist/ || true + +cp index.html .package +cp favicon.ico .package +cp -r electron/* .package +cp -r dist .package + +# Install electron sub-dependencies +cd electron +npm install +cd .. + +BUILD_PLATFORM="${1:-"all"}" +# And finally build the app. +npm run electron:packager-$BUILD_PLATFORM diff --git a/webpack.config.js b/webpack.config.js index 2bd397aac..487e5a9a1 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -63,6 +63,7 @@ module.exports = (env, argv) => { new HtmlWebpackPlugin({ title: "Bitburner", template: "src/index.html", + filename: "../index.html", favicon: "favicon.ico", googleAnalytics: { trackingId: "UA-100157497-1", @@ -136,7 +137,7 @@ module.exports = (env, argv) => { // }, entry: entry, output: { - path: path.resolve(__dirname, "./"), + path: path.resolve(__dirname, outputDirectory), filename: "[name].bundle.js", }, module: { @@ -161,7 +162,7 @@ module.exports = (env, argv) => { loader: "file-loader", options: { name: "[contenthash].[ext]", - outputPath: "dist/images", + outputPath: "images", }, }, ], @@ -184,7 +185,7 @@ module.exports = (env, argv) => { cacheGroups: { vendor: { test: /[\\/]node_modules[\\/]/, - name: `${outputDirectory}/vendor`, + name: `vendor`, chunks: "all", }, },