Merge pull request #5473 from HSLdevcom/env-cleanup

optionsome · web-flow · commit 66c78382ffe0 · 2025-09-01T10:56:10.000+03:00
Remove unused APP_PATH config field
diff --git a/Dockerfile b/Dockerfile
@@ -85,7 +85,6 @@ ENV \
   MAP_URL='' \
   OTP_URL='' \
   GEOCODING_BASE_URL='' \
-  APP_PATH='' \
   CONFIG=$CONFIG \
   NODE_ENV='' \
   RUN_ENV='' \
diff --git a/app/configurations/config.default.js b/app/configurations/config.default.js
@@ -13,7 +13,6 @@ const POI_MAP_PREFIX = `${MAP_URL}/map/v3/finland`;
 const OTP_URL = process.env.OTP_URL || `${API_URL}/routing/v2/finland/`;
 const HSL_TIMETABLES_URL =
   process.env.HSL_TIMETABLES_URL || 'https://dev.kartat.hsl.fi';
-const APP_PATH = process.env.APP_CONTEXT || '';
 const API_SUBSCRIPTION_QUERY_PARAMETER_NAME =
   process.env.API_SUBSCRIPTION_QUERY_PARAMETER_NAME ||
   'digitransit-subscription-key';
@@ -121,7 +120,6 @@ export default {
   hasAPISubscriptionHeader:
     API_SUBSCRIPTION_HEADER_NAME && API_SUBSCRIPTION_TOKEN,
 
-  APP_PATH: `${APP_PATH}`,
   indexPath: '',
   title: 'Reittihaku',
 
diff --git a/app/meta.js b/app/meta.js
@@ -1,5 +1,5 @@
 export default function getMetadata(lang, host, url, config) {
-  const root = config.URL.ASSET_URL || config.APP_PATH;
+  const root = config.URL.ASSET_URL || '';
   const path = config.iconPath || 'icons';
   const iconPath = `${root}/${path}`;
   const imageHost = config.URL.ASSET_URL || `https://${host}`;
diff --git a/app/server.js b/app/server.js
@@ -123,7 +123,7 @@ export default async function serve(req, res, next) {
 
     const spriteName = config.sprites;
 
-    const ASSET_URL = process.env.ASSET_URL || config.APP_PATH;
+    const ASSET_URL = process.env.ASSET_URL || '';
 
     res.setHeader('content-type', 'text/html; charset=utf-8');
     res.write('<!doctype html>\n');
diff --git a/server/server.js b/server/server.js
@@ -85,7 +85,7 @@ function setUpStaticFolders() {
       .replace(/ASSET_URL/g, process.env.ASSET_URL);
     const swTextInjected = swPreText + swInjectionText + swPostText;
 
-    app.get(`${config.APP_PATH}/sw.js`, (req, res) => {
+    app.get('/sw.js', (req, res) => {
       res.setHeader('Cache-Control', 'public, max-age=0');
       res.setHeader('Content-type', 'application/javascript; charset=UTF-8');
       res.send(swTextInjected);
@@ -96,7 +96,7 @@ function setUpStaticFolders() {
   // Sert cache for 1 week
   const oneDay = 86400000;
   app.use(
-    config.APP_PATH,
+    '',
     expressStaticGzip(staticFolder, {
       enableBrotli: true,
       index: false,
diff --git a/webpack.config.babel.js b/webpack.config.babel.js
@@ -167,7 +167,7 @@ module.exports = {
     path: path.join(__dirname, '_static'),
     filename: isDevelopment ? 'js/[name].js' : 'js/[name].[chunkhash].js',
     chunkFilename: 'js/[chunkhash].js',
-    publicPath: isDevelopment ? '/proxy/' : `${process.env.APP_PATH || ''}/`,
+    publicPath: isDevelopment ? '/proxy/' : '/',
     crossOriginLoading: 'anonymous',
   },
   module: {
