From 700dfbe67e05e400fbc492a3791cdb3757697e51 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 22 Dec 2021 10:29:11 +0100
Subject: [PATCH] cli: fix index templating deprecation warning

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/cli/src/lib/bundler/config.ts | 56 ++++++++++++++------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 398f2ace60..7ac230bb0e 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -131,36 +131,42 @@ export async function createConfig(
     }),
   );
 
-  const deprecatedAppConfig = {
-    title: frontendConfig.getString('app.title'),
-    baseUrl: validBaseUrl.href,
-    googleAnalyticsTrackingId: frontendConfig.getOptionalString(
-      'app.googleAnalyticsTrackingId',
-    ),
-    datadogRum: {
-      env: frontendConfig.getOptionalString('app.datadogRum.env'),
-      clientToken: frontendConfig.getOptionalString(
-        'app.datadogRum.clientToken',
-      ),
-      applicationId: frontendConfig.getOptionalString(
-        'app.datadogRum.applicationId',
-      ),
-      site: frontendConfig.getOptionalString('app.datadogRum.site'),
-    },
-  };
-
+  const appParamDeprecationMsg = chalk.red(
+    'DEPRECATION WARNING: using `app.<key>` in the index.html template is deprecated, use `config.getString("app.<key>")` instead.',
+  );
   plugins.push(
     new HtmlWebpackPlugin({
       template: paths.targetHtml,
       templateParameters: {
         publicPath: validBaseUrl.pathname.replace(/\/$/, ''),
-        get app() {
-          console.warn(
-            chalk.red(
-              'DEPRECATION WARNING: using `app.<key>` in the index.html template is deprecated, use `config.getString("app.<key>")` instead.',
-            ),
-          );
-          return deprecatedAppConfig;
+        app: {
+          get title() {
+            console.warn(appParamDeprecationMsg);
+            return frontendConfig.getString('app.title');
+          },
+          get baseUrl() {
+            console.warn(appParamDeprecationMsg);
+            return validBaseUrl.href;
+          },
+          get googleAnalyticsTrackingId() {
+            console.warn(appParamDeprecationMsg);
+            return frontendConfig.getOptionalString(
+              'app.googleAnalyticsTrackingId',
+            );
+          },
+          get datadogRum() {
+            console.warn(appParamDeprecationMsg);
+            return {
+              env: frontendConfig.getOptionalString('app.datadogRum.env'),
+              clientToken: frontendConfig.getOptionalString(
+                'app.datadogRum.clientToken',
+              ),
+              applicationId: frontendConfig.getOptionalString(
+                'app.datadogRum.applicationId',
+              ),
+              site: frontendConfig.getOptionalString('app.datadogRum.site'),
+            };
+          },
         },
         config: frontendConfig,
       },