Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[www-apps/grafana] add

Browse Source
This commit is contained in:
Robert Förster
2025-09-25 10:44:07 +02:00
parent 1dd3f5cfe6
commit 25fda6cdfc
8 changed files with 352 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
www-apps/grafana/files/grafana-12.1.1-node-22.18.0.patch Normal file
View File

@@ -0,0 +1,131 @@
From 481caac25da9fcf329833a8730d0b43db486fe82 Mon Sep 17 00:00:00 2001
From: Matt Cowley <me@mattcowley.co.uk>
Date: Wed, 9 Jul 2025 17:54:00 +0100
Subject: [PATCH] Plugin Configs: Fix Env types (#107908)
(cherry picked from commit 21f305c6a0e242463f5219cc6944fb880ea809f0)
---
e2e/test-plugins/grafana-extensionstest-app/webpack.config.ts | 4 ++--
e2e/test-plugins/grafana-test-datasource/webpack.config.ts | 4 ++--
packages/grafana-plugin-configs/webpack.config.ts | 2 +-
public/app/plugins/datasource/azuremonitor/webpack.config.ts | 4 ++--
.../datasource/grafana-pyroscope-datasource/webpack.config.ts | 4 ++--
public/app/plugins/datasource/jaeger/webpack.config.ts | 4 ++--
public/app/plugins/datasource/mssql/webpack.config.ts | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/e2e/test-plugins/grafana-extensionstest-app/webpack.config.ts b/e2e/test-plugins/grafana-extensionstest-app/webpack.config.ts
index 6268c183d3553..564555396a5e4 100644
--- a/e2e/test-plugins/grafana-extensionstest-app/webpack.config.ts
+++ b/e2e/test-plugins/grafana-extensionstest-app/webpack.config.ts
@@ -1,5 +1,5 @@
import CopyWebpackPlugin from 'copy-webpack-plugin';
-import grafanaConfig from '@grafana/plugin-configs/webpack.config.ts';
+import grafanaConfig, { type Env } from '@grafana/plugin-configs/webpack.config.ts';
import { mergeWithCustomize, unique } from 'webpack-merge';
import { type Configuration } from 'webpack';
@@ -19,7 +19,7 @@ function skipFiles(f: string): boolean {
return true;
}
-const config = async (env: Record<string, unknown>): Promise<Configuration> => {
+const config = async (env: Env): Promise<Configuration> => {
const baseConfig = await grafanaConfig(env);
const customConfig = {
plugins: [
diff --git a/e2e/test-plugins/grafana-test-datasource/webpack.config.ts b/e2e/test-plugins/grafana-test-datasource/webpack.config.ts
index 6268c183d3553..564555396a5e4 100644
--- a/e2e/test-plugins/grafana-test-datasource/webpack.config.ts
+++ b/e2e/test-plugins/grafana-test-datasource/webpack.config.ts
@@ -1,5 +1,5 @@
import CopyWebpackPlugin from 'copy-webpack-plugin';
-import grafanaConfig from '@grafana/plugin-configs/webpack.config.ts';
+import grafanaConfig, { type Env } from '@grafana/plugin-configs/webpack.config.ts';
import { mergeWithCustomize, unique } from 'webpack-merge';
import { type Configuration } from 'webpack';
@@ -19,7 +19,7 @@ function skipFiles(f: string): boolean {
return true;
}
-const config = async (env: Record<string, unknown>): Promise<Configuration> => {
+const config = async (env: Env): Promise<Configuration> => {
const baseConfig = await grafanaConfig(env);
const customConfig = {
plugins: [
diff --git a/packages/grafana-plugin-configs/webpack.config.ts b/packages/grafana-plugin-configs/webpack.config.ts
index 86c1d1eafc992..c1bfc469d7b5b 100644
--- a/packages/grafana-plugin-configs/webpack.config.ts
+++ b/packages/grafana-plugin-configs/webpack.config.ts
@@ -31,7 +31,7 @@ function skipFiles(f: string): boolean {
return true;
}
-type Env = {
+export type Env = {
[key: string]: true | string | Env;
};
diff --git a/public/app/plugins/datasource/azuremonitor/webpack.config.ts b/public/app/plugins/datasource/azuremonitor/webpack.config.ts
index 301bafbd1f90f..875ef0a489376 100644
--- a/public/app/plugins/datasource/azuremonitor/webpack.config.ts
+++ b/public/app/plugins/datasource/azuremonitor/webpack.config.ts
@@ -1,9 +1,9 @@
import type { Configuration } from 'webpack';
import { merge } from 'webpack-merge';
-import grafanaConfig from '@grafana/plugin-configs/webpack.config.ts';
+import grafanaConfig, { type Env } from '@grafana/plugin-configs/webpack.config.ts';
-const config = async (env: Record<string, unknown>): Promise<Configuration> => {
+const config = async (env: Env): Promise<Configuration> => {
const baseConfig = await grafanaConfig(env);
return merge(baseConfig, {
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts
index 7a579fa172b60..f48f8b1a69353 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts
@@ -1,6 +1,6 @@
-import config from '@grafana/plugin-configs/webpack.config.ts';
+import config, { type Env } from '@grafana/plugin-configs/webpack.config.ts';
-const configWithFallback = async (env: Record<string, unknown>) => {
+const configWithFallback = async (env: Env) => {
const response = await config(env);
if (response !== undefined && response.resolve !== undefined) {
response.resolve.fallback = {
diff --git a/public/app/plugins/datasource/jaeger/webpack.config.ts b/public/app/plugins/datasource/jaeger/webpack.config.ts
index 9ff90fccf0c3d..0346a64c5f22e 100644
--- a/public/app/plugins/datasource/jaeger/webpack.config.ts
+++ b/public/app/plugins/datasource/jaeger/webpack.config.ts
@@ -1,10 +1,10 @@
import { createRequire } from 'node:module';
-import config from '@grafana/plugin-configs/webpack.config.ts';
+import config, { type Env } from '@grafana/plugin-configs/webpack.config.ts';
const require = createRequire(import.meta.url);
-const configWithFallback = async (env: Record<string, unknown>) => {
+const configWithFallback = async (env: Env) => {
const response = await config(env);
if (response !== undefined && response.resolve !== undefined) {
response.resolve.fallback = {
diff --git a/public/app/plugins/datasource/mssql/webpack.config.ts b/public/app/plugins/datasource/mssql/webpack.config.ts
index af2e94ddecf42..8a119f88315bd 100644
--- a/public/app/plugins/datasource/mssql/webpack.config.ts
+++ b/public/app/plugins/datasource/mssql/webpack.config.ts
@@ -1,9 +1,9 @@
import type { Configuration } from 'webpack';
import { merge } from 'webpack-merge';
-import grafanaConfig from '@grafana/plugin-configs/webpack.config.ts';
+import grafanaConfig, { type Env } from '@grafana/plugin-configs/webpack.config.ts';
-const config = async (env: Record<string, unknown>): Promise<Configuration> => {
+const config = async (env: Env): Promise<Configuration> => {
const baseConfig = await grafanaConfig(env);
return merge(baseConfig, {