From 75e08a20f6d1dc026e3d10a26b4ebdd8529524d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= Date: Wed, 10 Dec 2025 14:33:54 +0100 Subject: [PATCH] chore: move exports to unstable --- packages/grafana-runtime/src/index.ts | 1 - packages/grafana-runtime/src/unstable.ts | 2 ++ public/app/features/alerting/unified/mocks/server/configure.ts | 2 +- .../features/alerting/unified/mocks/server/handlers/plugins.ts | 2 +- public/app/features/alerting/unified/utils/config.ts | 3 ++- public/app/features/alerting/unified/utils/rules.ts | 2 +- .../components/AdvisorRedirectNotice/AdvisorRedirectNotice.tsx | 3 ++- public/app/features/dashboard/components/GenAI/utils.ts | 2 +- .../extensions/registry/AddedComponentsRegistry.test.ts | 2 +- .../plugins/extensions/registry/AddedFunctionsRegistry.test.ts | 2 +- .../plugins/extensions/registry/AddedLinksRegistry.test.ts | 2 +- .../extensions/registry/ExposedComponentsRegistry.test.ts | 2 +- .../features/plugins/extensions/usePluginComponent.test.tsx | 3 ++- .../features/plugins/extensions/usePluginComponents.test.tsx | 3 ++- .../features/plugins/extensions/usePluginFunctions.test.tsx | 2 +- public/app/features/plugins/extensions/usePluginLinks.test.tsx | 2 +- public/app/features/plugins/extensions/utils.test.tsx | 3 ++- public/app/features/plugins/extensions/utils.tsx | 3 ++- public/app/features/plugins/extensions/validators.test.tsx | 2 +- public/app/features/plugins/extensions/validators.ts | 3 ++- public/app/features/plugins/sandbox/codeLoader.ts | 3 ++- 21 files changed, 29 insertions(+), 20 deletions(-) diff --git a/packages/grafana-runtime/src/index.ts b/packages/grafana-runtime/src/index.ts index 770e5b087ec..489f9157700 100644 --- a/packages/grafana-runtime/src/index.ts +++ b/packages/grafana-runtime/src/index.ts @@ -69,4 +69,3 @@ export { getCorrelationsService, setCorrelationsService, } from './services/CorrelationsService'; -export { getAppPluginMetas, getAppPluginMeta, type AppPluginMetas } from './services/plugins'; diff --git a/packages/grafana-runtime/src/unstable.ts b/packages/grafana-runtime/src/unstable.ts index 8a42447206f..d9bd77cdb3a 100644 --- a/packages/grafana-runtime/src/unstable.ts +++ b/packages/grafana-runtime/src/unstable.ts @@ -11,3 +11,5 @@ // This is a dummy export so typescript doesn't error importing an "empty module" export const unstable = {}; + +export { getAppPluginMetas, getAppPluginMeta, type AppPluginMetas } from './services/plugins'; diff --git a/public/app/features/alerting/unified/mocks/server/configure.ts b/public/app/features/alerting/unified/mocks/server/configure.ts index 7a03cc28ea1..a98330212c4 100644 --- a/public/app/features/alerting/unified/mocks/server/configure.ts +++ b/public/app/features/alerting/unified/mocks/server/configure.ts @@ -1,7 +1,7 @@ import { type DefaultBodyType, HttpResponse, HttpResponseResolver, PathParams, http } from 'msw'; -import { getAppPluginMetas } from '@grafana/runtime'; import { setAppPluginMetas } from '@grafana/runtime/internal'; +import { getAppPluginMetas } from '@grafana/runtime/unstable'; import server from '@grafana/test-utils/server'; import { mockDataSource, mockFolder } from 'app/features/alerting/unified/mocks'; import { diff --git a/public/app/features/alerting/unified/mocks/server/handlers/plugins.ts b/public/app/features/alerting/unified/mocks/server/handlers/plugins.ts index 5bb2abbe45f..ffad134e674 100644 --- a/public/app/features/alerting/unified/mocks/server/handlers/plugins.ts +++ b/public/app/features/alerting/unified/mocks/server/handlers/plugins.ts @@ -1,8 +1,8 @@ import { HttpResponse, http } from 'msw'; import { PluginLoadingStrategy, PluginMeta } from '@grafana/data'; -import { getAppPluginMetas } from '@grafana/runtime'; import { setAppPluginMetas } from '@grafana/runtime/internal'; +import { getAppPluginMetas } from '@grafana/runtime/unstable'; import { plugins } from 'app/features/alerting/unified/testSetup/plugins'; const PLUGIN_NOT_FOUND_RESPONSE = { message: 'Plugin not found, no installed plugin with that id' }; diff --git a/public/app/features/alerting/unified/utils/config.ts b/public/app/features/alerting/unified/utils/config.ts index 3b0716d12f0..5f00e0616c3 100644 --- a/public/app/features/alerting/unified/utils/config.ts +++ b/public/app/features/alerting/unified/utils/config.ts @@ -1,5 +1,6 @@ import { DataSourceInstanceSettings, DataSourceJsonData } from '@grafana/data'; -import { config, getAppPluginMetas } from '@grafana/runtime'; +import { config } from '@grafana/runtime'; +import { getAppPluginMetas } from '@grafana/runtime/unstable'; import { SupportedPlugin } from '../types/pluginBridges'; diff --git a/public/app/features/alerting/unified/utils/rules.ts b/public/app/features/alerting/unified/utils/rules.ts index efe78dfbaa1..f3a63be36d2 100644 --- a/public/app/features/alerting/unified/utils/rules.ts +++ b/public/app/features/alerting/unified/utils/rules.ts @@ -1,7 +1,7 @@ import { capitalize } from 'lodash'; import { AlertState } from '@grafana/data'; -import { getAppPluginMeta } from '@grafana/runtime'; +import { getAppPluginMeta } from '@grafana/runtime/unstable'; import { Alert, AlertingRule, diff --git a/public/app/features/connections/components/AdvisorRedirectNotice/AdvisorRedirectNotice.tsx b/public/app/features/connections/components/AdvisorRedirectNotice/AdvisorRedirectNotice.tsx index e8eb8065db9..3b93c405dec 100644 --- a/public/app/features/connections/components/AdvisorRedirectNotice/AdvisorRedirectNotice.tsx +++ b/public/app/features/connections/components/AdvisorRedirectNotice/AdvisorRedirectNotice.tsx @@ -3,8 +3,9 @@ import { useEffect, useState } from 'react'; import { GrafanaTheme2 } from '@grafana/data'; import { Trans, t } from '@grafana/i18n'; -import { config, getAppPluginMeta } from '@grafana/runtime'; +import { config } from '@grafana/runtime'; import { UserStorage } from '@grafana/runtime/internal'; +import { getAppPluginMeta } from '@grafana/runtime/unstable'; import { Alert, LinkButton, useStyles2 } from '@grafana/ui'; import { contextSrv } from 'app/core/services/context_srv'; diff --git a/public/app/features/dashboard/components/GenAI/utils.ts b/public/app/features/dashboard/components/GenAI/utils.ts index 0d5c33a4422..1f42e46ce30 100644 --- a/public/app/features/dashboard/components/GenAI/utils.ts +++ b/public/app/features/dashboard/components/GenAI/utils.ts @@ -1,7 +1,7 @@ import { pick } from 'lodash'; import { llm } from '@grafana/llm'; -import { getAppPluginMeta } from '@grafana/runtime'; +import { getAppPluginMeta } from '@grafana/runtime/unstable'; import { Panel } from '@grafana/schema'; import { DashboardModel } from '../../state/DashboardModel'; diff --git a/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.test.ts b/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.test.ts index 473aedc4821..916503fccdd 100644 --- a/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.test.ts +++ b/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.test.ts @@ -2,8 +2,8 @@ import React from 'react'; import { firstValueFrom, take } from 'rxjs'; import { PluginLoadingStrategy } from '@grafana/data'; -import { getAppPluginMeta, getAppPluginMetas } from '@grafana/runtime'; import { setAppPluginMetas } from '@grafana/runtime/internal'; +import { getAppPluginMeta, getAppPluginMetas } from '@grafana/runtime/unstable'; import { log } from '../logs/log'; import { resetLogMock } from '../logs/testUtils'; diff --git a/public/app/features/plugins/extensions/registry/AddedFunctionsRegistry.test.ts b/public/app/features/plugins/extensions/registry/AddedFunctionsRegistry.test.ts index 19a47c57781..dc099c3abf0 100644 --- a/public/app/features/plugins/extensions/registry/AddedFunctionsRegistry.test.ts +++ b/public/app/features/plugins/extensions/registry/AddedFunctionsRegistry.test.ts @@ -1,8 +1,8 @@ import { firstValueFrom, take } from 'rxjs'; import { PluginLoadingStrategy } from '@grafana/data'; -import { getAppPluginMeta, getAppPluginMetas } from '@grafana/runtime'; import { setAppPluginMetas } from '@grafana/runtime/internal'; +import { getAppPluginMeta, getAppPluginMetas } from '@grafana/runtime/unstable'; import { log } from '../logs/log'; import { resetLogMock } from '../logs/testUtils'; diff --git a/public/app/features/plugins/extensions/registry/AddedLinksRegistry.test.ts b/public/app/features/plugins/extensions/registry/AddedLinksRegistry.test.ts index ccbe9b56f6c..64406f7d976 100644 --- a/public/app/features/plugins/extensions/registry/AddedLinksRegistry.test.ts +++ b/public/app/features/plugins/extensions/registry/AddedLinksRegistry.test.ts @@ -1,8 +1,8 @@ import { firstValueFrom, take } from 'rxjs'; import { PluginLoadingStrategy } from '@grafana/data'; -import { getAppPluginMeta, getAppPluginMetas } from '@grafana/runtime'; import { setAppPluginMetas } from '@grafana/runtime/internal'; +import { getAppPluginMeta, getAppPluginMetas } from '@grafana/runtime/unstable'; import { log } from '../logs/log'; import { resetLogMock } from '../logs/testUtils'; diff --git a/public/app/features/plugins/extensions/registry/ExposedComponentsRegistry.test.ts b/public/app/features/plugins/extensions/registry/ExposedComponentsRegistry.test.ts index ae5d5814bd6..cb0fc24d88a 100644 --- a/public/app/features/plugins/extensions/registry/ExposedComponentsRegistry.test.ts +++ b/public/app/features/plugins/extensions/registry/ExposedComponentsRegistry.test.ts @@ -2,8 +2,8 @@ import React from 'react'; import { firstValueFrom, take } from 'rxjs'; import { PluginLoadingStrategy } from '@grafana/data'; -import { getAppPluginMeta, getAppPluginMetas } from '@grafana/runtime'; import { setAppPluginMetas } from '@grafana/runtime/internal'; +import { getAppPluginMeta, getAppPluginMetas } from '@grafana/runtime/unstable'; import { log } from '../logs/log'; import { resetLogMock } from '../logs/testUtils'; diff --git a/public/app/features/plugins/extensions/usePluginComponent.test.tsx b/public/app/features/plugins/extensions/usePluginComponent.test.tsx index b2bce141eb9..75e212161e8 100644 --- a/public/app/features/plugins/extensions/usePluginComponent.test.tsx +++ b/public/app/features/plugins/extensions/usePluginComponent.test.tsx @@ -2,8 +2,9 @@ import { act, render, renderHook, screen, waitFor } from '@testing-library/react import type { JSX } from 'react'; import { PluginContextProvider, PluginLoadingStrategy, PluginMeta, PluginType } from '@grafana/data'; -import { config, getAppPluginMetas } from '@grafana/runtime'; +import { config } from '@grafana/runtime'; import { setAppPluginMetas } from '@grafana/runtime/internal'; +import { getAppPluginMetas } from '@grafana/runtime/unstable'; import { ExtensionRegistriesProvider } from './ExtensionRegistriesContext'; import { log } from './logs/log'; diff --git a/public/app/features/plugins/extensions/usePluginComponents.test.tsx b/public/app/features/plugins/extensions/usePluginComponents.test.tsx index 44359a5f6a8..4ddfc3e2f01 100644 --- a/public/app/features/plugins/extensions/usePluginComponents.test.tsx +++ b/public/app/features/plugins/extensions/usePluginComponents.test.tsx @@ -8,8 +8,9 @@ import { PluginMeta, PluginType, } from '@grafana/data'; -import { config, getAppPluginMeta } from '@grafana/runtime'; +import { config } from '@grafana/runtime'; import { setAppPluginMetas } from '@grafana/runtime/internal'; +import { getAppPluginMeta } from '@grafana/runtime/unstable'; import { ExtensionRegistriesProvider } from './ExtensionRegistriesContext'; import * as errors from './errors'; diff --git a/public/app/features/plugins/extensions/usePluginFunctions.test.tsx b/public/app/features/plugins/extensions/usePluginFunctions.test.tsx index adc6002cd07..6ad38eadb45 100644 --- a/public/app/features/plugins/extensions/usePluginFunctions.test.tsx +++ b/public/app/features/plugins/extensions/usePluginFunctions.test.tsx @@ -8,8 +8,8 @@ import { PluginMeta, PluginType, } from '@grafana/data'; -import { getAppPluginMeta } from '@grafana/runtime'; import { setAppPluginMetas } from '@grafana/runtime/internal'; +import { getAppPluginMeta } from '@grafana/runtime/unstable'; import { ExtensionRegistriesProvider } from './ExtensionRegistriesContext'; import * as errors from './errors'; diff --git a/public/app/features/plugins/extensions/usePluginLinks.test.tsx b/public/app/features/plugins/extensions/usePluginLinks.test.tsx index fc725eb73eb..f45d46db7b2 100644 --- a/public/app/features/plugins/extensions/usePluginLinks.test.tsx +++ b/public/app/features/plugins/extensions/usePluginLinks.test.tsx @@ -8,8 +8,8 @@ import { PluginMeta, PluginType, } from '@grafana/data'; -import { getAppPluginMeta } from '@grafana/runtime'; import { setAppPluginMetas } from '@grafana/runtime/internal'; +import { getAppPluginMeta } from '@grafana/runtime/unstable'; import { ExtensionRegistriesProvider } from './ExtensionRegistriesContext'; import * as errors from './errors'; diff --git a/public/app/features/plugins/extensions/utils.test.tsx b/public/app/features/plugins/extensions/utils.test.tsx index 69be8110623..6d192561086 100644 --- a/public/app/features/plugins/extensions/utils.test.tsx +++ b/public/app/features/plugins/extensions/utils.test.tsx @@ -2,8 +2,9 @@ import { render, screen, waitFor } from '@testing-library/react'; import { type Unsubscribable } from 'rxjs'; import { dateTime, usePluginContext, PluginLoadingStrategy } from '@grafana/data'; -import { config, AppPluginConfig, getAppPluginMetas, getAppPluginMeta } from '@grafana/runtime'; +import { config, AppPluginConfig } from '@grafana/runtime'; import { setAppPluginMetas } from '@grafana/runtime/internal'; +import { getAppPluginMeta, getAppPluginMetas } from '@grafana/runtime/unstable'; import { appEvents } from 'app/core/app_events'; import { ShowModalReactEvent } from 'app/types/events'; diff --git a/public/app/features/plugins/extensions/utils.tsx b/public/app/features/plugins/extensions/utils.tsx index 55a072ff9db..5a9796d2f18 100644 --- a/public/app/features/plugins/extensions/utils.tsx +++ b/public/app/features/plugins/extensions/utils.tsx @@ -16,7 +16,8 @@ import { PluginExtensionPoints, ExtensionInfo, } from '@grafana/data'; -import { reportInteraction, config, AppPluginConfig, getAppPluginMetas, getAppPluginMeta } from '@grafana/runtime'; +import { reportInteraction, config, AppPluginConfig } from '@grafana/runtime'; +import { getAppPluginMeta, getAppPluginMetas } from '@grafana/runtime/unstable'; import { Modal } from '@grafana/ui'; import { appEvents } from 'app/core/app_events'; import { getPluginSettings } from 'app/features/plugins/pluginSettings'; diff --git a/public/app/features/plugins/extensions/validators.test.tsx b/public/app/features/plugins/extensions/validators.test.tsx index 2116567b244..b0807aecc6e 100644 --- a/public/app/features/plugins/extensions/validators.test.tsx +++ b/public/app/features/plugins/extensions/validators.test.tsx @@ -7,8 +7,8 @@ import { PluginLoadingStrategy, PluginType, } from '@grafana/data'; -import { getAppPluginMetas } from '@grafana/runtime'; import { setAppPluginMetas } from '@grafana/runtime/internal'; +import { getAppPluginMetas } from '@grafana/runtime/unstable'; import { createLogMock } from './logs/testUtils'; import { diff --git a/public/app/features/plugins/extensions/validators.ts b/public/app/features/plugins/extensions/validators.ts index a87a93d5914..3e61ea81488 100644 --- a/public/app/features/plugins/extensions/validators.ts +++ b/public/app/features/plugins/extensions/validators.ts @@ -10,7 +10,8 @@ import { PluginExtensionPointPatterns, } from '@grafana/data'; import { PluginAddedLinksConfigureFunc } from '@grafana/data/internal'; -import { getAppPluginMeta, isPluginExtensionLink } from '@grafana/runtime'; +import { isPluginExtensionLink } from '@grafana/runtime'; +import { getAppPluginMeta } from '@grafana/runtime/unstable'; import * as errors from './errors'; import { ExtensionsLog } from './logs/log'; diff --git a/public/app/features/plugins/sandbox/codeLoader.ts b/public/app/features/plugins/sandbox/codeLoader.ts index 47162f3b931..6502b9c6db5 100644 --- a/public/app/features/plugins/sandbox/codeLoader.ts +++ b/public/app/features/plugins/sandbox/codeLoader.ts @@ -1,5 +1,6 @@ import { PluginType, patchArrayVectorProrotypeMethods } from '@grafana/data'; -import { config, getAppPluginMetas } from '@grafana/runtime'; +import { config } from '@grafana/runtime'; +import { getAppPluginMetas } from '@grafana/runtime/unstable'; import { transformPluginSourceForCDN } from '../cdn/utils'; import { resolvePluginUrlWithCache } from '../loader/pluginInfoCache';