From 6fc58b6ea0ce3a7d834da8f4689b4f922de6e46a Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 8 Jun 2021 13:22:14 -0400 Subject: [PATCH] Toolkit: Resolve external fonts when Grafana is served from a sub path(#35352) (#35383) (cherry picked from commit 044acf727bd4dc09c954a1f40753a04544880292) Co-authored-by: Jack Westbrook --- 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]', },