From f785a71aaeae9e53257ffe698a2e5d9ea90058f4 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Mon, 13 May 2024 09:55:26 +0200
Subject: [PATCH] Fix: Angular detection in plugin loader (#87323)

fix(plugins): make sure angular detection is passed to loader
---
 packages/grafana-data/src/types/plugin.ts    | 1 +
 public/app/features/plugins/plugin_loader.ts | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-data/src/types/plugin.ts b/packages/grafana-data/src/types/plugin.ts
index c006b72fe45..c5632e5d69b 100644
--- a/packages/grafana-data/src/types/plugin.ts
+++ b/packages/grafana-data/src/types/plugin.ts
@@ -90,6 +90,7 @@ export interface PluginMeta<T extends KeyValue = {}> {
   signatureOrg?: string;
   live?: boolean;
   angular?: AngularMeta;
+  angularDetected?: boolean;
 }
 
 interface PluginDependencyInfo {
diff --git a/public/app/features/plugins/plugin_loader.ts b/public/app/features/plugins/plugin_loader.ts
index 7cafe296a60..62499ed0e7b 100644
--- a/public/app/features/plugins/plugin_loader.ts
+++ b/public/app/features/plugins/plugin_loader.ts
@@ -98,10 +98,11 @@ export async function importPluginModule({
 }
 
 export function importDataSourcePlugin(meta: DataSourcePluginMeta): Promise<GenericDataSourcePlugin> {
+  const isAngular = meta.angular?.detected ?? meta.angularDetected;
   return importPluginModule({
     path: meta.module,
     version: meta.info?.version,
-    isAngular: meta.angular?.detected,
+    isAngular,
     pluginId: meta.id,
   }).then((pluginExports) => {
     if (pluginExports.plugin) {
@@ -126,10 +127,11 @@ export function importDataSourcePlugin(meta: DataSourcePluginMeta): Promise<Gene
 }
 
 export function importAppPlugin(meta: PluginMeta): Promise<AppPlugin> {
+  const isAngular = meta.angular?.detected ?? meta.angularDetected;
   return importPluginModule({
     path: meta.module,
     version: meta.info?.version,
-    isAngular: meta.angular?.detected,
+    isAngular,
     pluginId: meta.id,
   }).then((pluginExports) => {
     const plugin: AppPlugin = pluginExports.plugin ? pluginExports.plugin : new AppPlugin();