From 12dd7748577c8fef4efea7856b1aac9ef8de7f11 Mon Sep 17 00:00:00 2001 From: CD Cabrera Date: Fri, 29 Sep 2023 10:11:25 -0400 Subject: [PATCH] build(proxy): sw-1689 locale file paths (#1203) --- .env.proxy | 4 +-- config/webpack.proxy.config.js | 45 +++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/.env.proxy b/.env.proxy index 0dfc83a5a..841290cc5 100644 --- a/.env.proxy +++ b/.env.proxy @@ -1,7 +1,5 @@ DEV_PORT=1337 DEV_BRANCH=stage-beta +UI_DEPLOY_PATH_PREFIX=/beta REACT_APP_ENV=review - -REACT_APP_CONFIG_SERVICE_LOCALES=/locales/locales.json -REACT_APP_CONFIG_SERVICE_LOCALES_PATH=/locales/{{lng}}.json diff --git a/config/webpack.proxy.config.js b/config/webpack.proxy.config.js index 80bc36c4f..96bbf2648 100644 --- a/config/webpack.proxy.config.js +++ b/config/webpack.proxy.config.js @@ -1,36 +1,47 @@ const config = require('@redhat-cloud-services/frontend-components-config'); const { setReplacePlugin, setCommonPlugins } = require('./build.plugins'); const { setupDotenvFilesForEnv } = require('./build.dotenv'); -const { setProxyRoutes } = require('./spandx.config'); -const { _BUILD_RELATIVE_DIRNAME, DEV_BRANCH, DEV_PORT } = setupDotenvFilesForEnv({ +const { + _BUILD_RELATIVE_DIRNAME, + REACT_APP_UI_DEPLOY_PATH_PREFIX: BETA_PREFIX, + DEV_BRANCH, + DEV_PORT +} = setupDotenvFilesForEnv({ env: 'proxy' }); -let BETA_PREFIX = ''; +const UPDATED_BETA_PREFIX = [BETA_PREFIX]; -if (/(prod|stage|qa|ci)-beta/.test(DEV_BRANCH)) { - BETA_PREFIX = '/beta'; +switch (BETA_PREFIX) { + case '/preview': + UPDATED_BETA_PREFIX.push('/beta'); + break; + case '/beta': + default: + UPDATED_BETA_PREFIX.push('/preview'); + break; } const { config: webpackConfig, plugins } = config({ - appUrl: [ - `${BETA_PREFIX}/insights/subscriptions`, - `${BETA_PREFIX}/openshift/subscriptions`, - `${BETA_PREFIX}/application-services/subscriptions`, - `${BETA_PREFIX}/subscriptions/usage`, - `/preview/insights/subscriptions`, - `/preview/openshift/subscriptions`, - `/preview/application-services/subscriptions`, - `/preview/subscriptions/usage` - ], + appUrl: (() => { + const urls = []; + UPDATED_BETA_PREFIX.forEach(path => { + urls.push( + `${path}/insights/subscriptions`, + `${path}/openshift/subscriptions`, + `${path}/application-services/subscriptions`, + `${path}/subscriptions/usage` + ); + }); + return urls; + })(), client: { overlay: false }, debug: true, - deployment: (/beta/.test(BETA_PREFIX) && 'beta/apps') || 'apps', + deployment: (/beta/.test(BETA_PREFIX) && 'beta/apps') || (/preview/.test(BETA_PREFIX) && 'preview/apps') || 'apps', env: (/(prod|stage|qa|ci)(-stable|-beta)$/.test(DEV_BRANCH) && DEV_BRANCH) || 'stage-stable', port: Number.parseInt(DEV_PORT, 10), rootFolder: _BUILD_RELATIVE_DIRNAME, - routes: setProxyRoutes({ DEV_PORT, BETA_PREFIX }), standalone: false, useProxy: true, replacePlugin: setReplacePlugin()