From 044acf727bd4dc09c954a1f40753a04544880292 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Tue, 8 Jun 2021 16:44:57 +0200
Subject: [PATCH] Toolkit: Resolve external fonts when Grafana is served from a
 sub path(#35352)

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

diff --git a/packages/grafana-toolkit/src/config/webpack/loaders.ts b/packages/grafana-toolkit/src/config/webpack/loaders.ts
index 04096239277..b6efa3dbc48 100644
--- a/packages/grafana-toolkit/src/config/webpack/loaders.ts
+++ b/packages/grafana-toolkit/src/config/webpack/loaders.ts
@@ -160,7 +160,8 @@ export const getFileLoaders = () => {
       test: /\.(woff|woff2|eot|ttf|otf)(\?v=\d+\.\d+\.\d+)?$/,
       loader: 'file-loader',
       options: {
-        publicPath: `/public/plugins/${getPluginId()}/fonts`,
+        // Keep publicPath relative for host.com/grafana/ deployments
+        publicPath: `public/plugins/${getPluginId()}/fonts`,
         outputPath: 'fonts',
         name: '[name].[ext]',
       },