From: Daniele Basso <d.bass05@proton.me> Date: Fri, 14 Jul 2023 20:52:05 +0000 (+0000) Subject: Fix base.output (see #1911) (#1943) X-Git-Url: http://these/git/%22%7Burl%7D/%7B%60https:/%24%7Bi.domain%7D%60%7D?a=commitdiff_plain;h=9c489680de48247cf85b1a4b33f3d0d1a8f88673;p=lemmy-ui.git Fix base.output (see #1911) (#1943) --- diff --git a/webpack.config.js b/webpack.config.js index 267a144..b12af48 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,7 +3,6 @@ const { resolve } = require("path"); const MiniCssExtractPlugin = require("mini-css-extract-plugin"); const nodeExternals = require("webpack-node-externals"); const CopyPlugin = require("copy-webpack-plugin"); -const RunNodeWebpackPlugin = require("run-node-webpack-plugin"); const { ServiceWorkerPlugin } = require("service-worker-webpack"); const banner = ` @@ -18,8 +17,6 @@ module.exports = (env, argv) => { const base = { output: { - filename: "js/server.js", - publicPath: "/", hashFunction: "xxhash64", }, resolve: { @@ -73,7 +70,9 @@ module.exports = (env, argv) => { ...base, entry: "./src/server/index.tsx", output: { + ...base.output, filename: "js/server.js", + publicPath: "/", }, target: "node", externals: [nodeExternals(), "inferno-helmet"], @@ -83,6 +82,7 @@ module.exports = (env, argv) => { ...base, entry: "./src/client/index.tsx", output: { + ...base.output, filename: "js/client.js", publicPath: `/static/${env.COMMIT_HASH}/`, }, @@ -146,6 +146,7 @@ module.exports = (env, argv) => { // name: "server", // }; + const RunNodeWebpackPlugin = require("run-node-webpack-plugin"); serverConfig.plugins.push( new RunNodeWebpackPlugin({ runOnlyInWatchMode: true }) );