From 1c13ac20c371345dafdfa68a84fb8a4c61925383 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 10 Aug 2022 04:12:35 -0400 Subject: [PATCH] [v9.0.x] Grafana/toolkit: Fix incorrect image and font generation for plugin builds (#52939) Co-authored-by: Esteban Beltran Co-authored-by: Esteban Beltran --- 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/', }, },