IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Angular detection in plugin loader (#87323)

Browse Source 
fix(plugins): make sure angular detection is passed to loader
This commit is contained in:
Jack Westbrook 2024-05-13 09:55:26 +02:00 committed by GitHub
parent a6076d8d05
commit f785a71aae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/grafana-data/src/types/plugin.ts
View File

@ -90,6 +90,7 @@ export interface PluginMeta<T extends KeyValue = {}> {
signatureOrg?: string; signatureOrg?: string;
live?: boolean; live?: boolean;
angular?: AngularMeta; angular?: AngularMeta;
angularDetected?: boolean;
} }
interface PluginDependencyInfo { interface PluginDependencyInfo {

6
public/app/features/plugins/plugin_loader.ts
View File

@ -98,10 +98,11 @@ export async function importPluginModule({
} }
export function importDataSourcePlugin(meta: DataSourcePluginMeta): Promise<GenericDataSourcePlugin> { export function importDataSourcePlugin(meta: DataSourcePluginMeta): Promise<GenericDataSourcePlugin> {
const isAngular = meta.angular?.detected ?? meta.angularDetected;
return importPluginModule({ return importPluginModule({
path: meta.module, path: meta.module,
version: meta.info?.version, version: meta.info?.version,
isAngular: meta.angular?.detected, isAngular,
pluginId: meta.id, pluginId: meta.id,
}).then((pluginExports) => { }).then((pluginExports) => {
if (pluginExports.plugin) { if (pluginExports.plugin) {
@ -126,10 +127,11 @@ export function importDataSourcePlugin(meta: DataSourcePluginMeta): Promise<Gene
} }
export function importAppPlugin(meta: PluginMeta): Promise<AppPlugin> { export function importAppPlugin(meta: PluginMeta): Promise<AppPlugin> {
const isAngular = meta.angular?.detected ?? meta.angularDetected;
return importPluginModule({ return importPluginModule({
path: meta.module, path: meta.module,
version: meta.info?.version, version: meta.info?.version,
isAngular: meta.angular?.detected, isAngular,
pluginId: meta.id, pluginId: meta.id,
}).then((pluginExports) => { }).then((pluginExports) => {
const plugin: AppPlugin = pluginExports.plugin ? pluginExports.plugin : new AppPlugin(); const plugin: AppPlugin = pluginExports.plugin ? pluginExports.plugin : new AppPlugin();