From 6395d6d6f350daa3137263677620924ef94d33c9 Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Thu, 28 Jul 2022 14:54:29 +0200
Subject: [PATCH] Grafana/toolkit: Fix incorrect image and font generation for
 plugin builds (#52927)

---
 packages/grafana-toolkit/src/config/webpack/loaders.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-toolkit/src/config/webpack/loaders.ts b/packages/grafana-toolkit/src/config/webpack/loaders.ts
index e558dba405e..da71d380443 100644
--- a/packages/grafana-toolkit/src/config/webpack/loaders.ts
+++ b/packages/grafana-toolkit/src/config/webpack/loaders.ts
@@ -1,6 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 
+import { getPluginId } from '../utils/getPluginId';
+
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 const supportedExtensions = ['css', 'scss', 'less', 'sass'];
@@ -109,7 +111,7 @@ export const getFileLoaders = () => {
       test: /\.(png|jpe?g|gif|svg)$/,
       type: 'asset/resource',
       generator: {
-        publicPath: `img/`,
+        publicPath: `public/plugins/${getPluginId()}/img/`,
         outputPath: 'img/',
       },
     },
@@ -117,7 +119,7 @@ export const getFileLoaders = () => {
       test: /\.(woff|woff2|eot|ttf|otf)(\?v=\d+\.\d+\.\d+)?$/,
       type: 'asset/resource',
       generator: {
-        publicPath: `fonts/`,
+        publicPath: `public/plugins/${getPluginId()}/fonts/`,
         outputPath: 'fonts/',
       },
     },