Plugin Configs: Fix Env types (#107908)

This commit is contained in:
Matt Cowley
2025-07-09 17:54:00 +01:00
committed by GitHub
parent d9bf13e33f
commit 21f305c6a0
7 changed files with 13 additions and 13 deletions
@@ -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: [
@@ -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: [
@@ -31,7 +31,7 @@ function skipFiles(f: string): boolean {
return true;
}
type Env = {
export type Env = {
[key: string]: true | string | Env;
};
@@ -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, {
@@ -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 = {
@@ -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 = {
@@ -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, {