temp

clowder-framework · Aug 19, 2024 · 204a14f · 204a14f
1 parent fb4dba9
commit 204a14f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/frontend/src/index.ejs b/frontend/src/index.ejs
@@ -26,7 +26,7 @@
  rel="stylesheet"
  href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
  />
- <link href="<%= htmlWebpackPlugin.options.publicPath %>/styles/main.css" rel="stylesheet">
+ <link href="<%= htmlWebpackPlugin.options.publicPath %>styles/main.css" rel="stylesheet">
 
  <title>Clowder v2</title>
 </head>

diff --git a/frontend/webpack.config.dev.js b/frontend/webpack.config.dev.js
@@ -32,7 +32,9 @@ export default {
  target: "web",
  output: {
  path: path.resolve(__dirname, "dist"),
- publicPath: "",
+ publicPath: process.env.BASE_URL_ROUTE
+ ? `${process.env.BASE_URL_ROUTE}/`
+ : "/", // Ensure trailing slash
  filename: "[name].bundle.js",
  chunkFilename: "[name].chunk.bundle.js",
  },
@@ -58,13 +60,15 @@ export default {
  new webpack.HotModuleReplacementPlugin(),
  new HtmlWebpackPlugin({
  template: "src/index.ejs",
- favicon: "./src/public/favicon.ico",
+ favicon: "src/public/favicon.ico",
  minify: {
  removeComments: true,
  collapseWhitespace: true,
  },
  inject: true,
- publicPath: process.env.BASE_URL_ROUTE || "", // Ensure paths are prefixed correctly
+ publicPath: process.env.BASE_URL_ROUTE
+ ? `${process.env.BASE_URL_ROUTE}/`
+ : "/", // Ensure trailing slash
  }),
  new webpack.LoaderOptionsPlugin({
  debug: true,

diff --git a/frontend/webpack.config.prod.js b/frontend/webpack.config.prod.js
@@ -35,7 +35,9 @@ export default {
  filename: "[name].bundle.js",
  chunkFilename: "[name].chunk.bundle.js",
  path: path.resolve(__dirname, "dist"),
- publicPath: process.env.BASE_URL_ROUTE || "", // Set the public path for all assets
+ publicPath: process.env.BASE_URL_ROUTE
+ ? `${process.env.BASE_URL_ROUTE}/`
+ : "/", // Ensure trailing slash
  },
  plugins: [
  // NOTE: `npm run preinstall` currently runs eslint
@@ -83,7 +85,9 @@ export default {
  // Note that you can add custom options here if you need to handle other custom logic in index.html
  // To track JavaScript errors via TrackJS, sign up for a free trial at TrackJS.com and enter your token below.
  trackJSToken: "",
- publicPath: process.env.BASE_URL_ROUTE || "", // Ensure paths are prefixed correctly
+ publicPath: process.env.BASE_URL_ROUTE
+ ? `${process.env.BASE_URL_ROUTE}/`
+ : "/", // Ensure trailing slash
  }),
 
  new webpack.LoaderOptionsPlugin({