diff --git a/package.sh b/package.sh index 6d3fc82eb..17cb3b5ac 100755 --- a/package.sh +++ b/package.sh @@ -3,23 +3,12 @@ # 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 +mkdir -p .package/dist/ || true cp index.html .package +cp favicon.ico .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 +cp -r dist .package # Install electron sub-dependencies cd electron @@ -28,4 +17,4 @@ cd .. BUILD_PLATFORM="${1:-"all"}" # And finally build the app. -npm run electron:packager-$BUILD_PLATFORM \ No newline at end of file +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", }, },