SONAR-21369 Fix fonts path for sonar.web.context not null

diff --git a/server/sonar-web/config/esbuild-config.js b/server/sonar-web/config/esbuild-config.js
index a7eb205fa1f163ad2d198fb1e97a928b2c5a0b92..998598ee4a047e89e967c9a9a3e52c2eaecd4e95 100644 (file)
--- a/server/sonar-web/config/esbuild-config.js
+++ b/server/sonar-web/config/esbuild-config.js
@@ -56,7 +56,7 @@ module.exports = (release) => {
   return {
     entryPoints: ['src/main/js/app/index.ts'],
     tsconfig: './tsconfig.json',
-    external: ['/images/*', '/fonts/*'],
+    external: ['/images/*', '../fonts/*'],
     loader: {
       '.png': 'dataurl',
       '.md': 'text',

diff --git a/server/sonar-web/public/fonts/Inter/inter.css b/server/sonar-web/public/fonts/Inter/inter.css
index 38782bc647ccc2f9b915ae2508115eb7688e23dd..64008b715eade4f5ae2c1c522adc9e5f64a8a1b9 100644 (file)
--- a/server/sonar-web/public/fonts/Inter/inter.css
+++ b/server/sonar-web/public/fonts/Inter/inter.css
@@ -3,14 +3,14 @@
   font-style: normal;
   font-weight: 100;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-Thin.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-Thin.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: italic;
   font-weight: 100;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-ThinItalic.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-ThinItalic.woff2') format('woff2');
 }
 
 @font-face {
@@ -18,14 +18,14 @@
   font-style: normal;
   font-weight: 200;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-ExtraLight.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-ExtraLight.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: italic;
   font-weight: 200;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-ExtraLightItalic.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-ExtraLightItalic.woff2') format('woff2');
 }
 
 @font-face {
@@ -33,14 +33,14 @@
   font-style: normal;
   font-weight: 300;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-Light.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-Light.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: italic;
   font-weight: 300;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-LightItalic.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-LightItalic.woff2') format('woff2');
 }
 
 @font-face {
@@ -48,14 +48,14 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-Regular.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-Regular.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: italic;
   font-weight: 400;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-Italic.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-Italic.woff2') format('woff2');
 }
 
 @font-face {
@@ -63,14 +63,14 @@
   font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-Medium.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-Medium.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: italic;
   font-weight: 500;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-MediumItalic.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-MediumItalic.woff2') format('woff2');
 }
 
 @font-face {
@@ -78,14 +78,14 @@
   font-style: normal;
   font-weight: 600;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-SemiBold.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-SemiBold.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: italic;
   font-weight: 600;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-SemiBoldItalic.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-SemiBoldItalic.woff2') format('woff2');
 }
 
 @font-face {
@@ -93,14 +93,14 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-Bold.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-Bold.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: italic;
   font-weight: 700;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-BoldItalic.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-BoldItalic.woff2') format('woff2');
 }
 
 @font-face {
@@ -108,14 +108,14 @@
   font-style: normal;
   font-weight: 800;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-ExtraBold.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-ExtraBold.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: italic;
   font-weight: 800;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-ExtraBoldItalic.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-ExtraBoldItalic.woff2') format('woff2');
 }
 
 @font-face {
@@ -123,12 +123,12 @@
   font-style: normal;
   font-weight: 900;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-Black.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-Black.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: italic;
   font-weight: 900;
   font-display: swap;
-  src: url('/fonts/Inter/Inter-BlackItalic.woff2') format('woff2');
+  src: url('../fonts/Inter/Inter-BlackItalic.woff2') format('woff2');
 }

diff --git a/server/sonar-web/public/fonts/Ubuntu/Ubuntu.css b/server/sonar-web/public/fonts/Ubuntu/Ubuntu.css
index 402e48173ac04c0b9f5ce5e17777dab32a652cb7..244fa66a495bb3b08c387d2855d69731b90c689a 100644 (file)
--- a/server/sonar-web/public/fonts/Ubuntu/Ubuntu.css
+++ b/server/sonar-web/public/fonts/Ubuntu/Ubuntu.css
@@ -3,14 +3,14 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url('/fonts/Ubuntu/UbuntuMono-Regular.woff2') format('woff2');
+  src: url('../fonts/Ubuntu/UbuntuMono-Regular.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Ubuntu Mono';
   font-style: italic;
   font-weight: 400;
   font-display: swap;
-  src: url('/fonts/Ubuntu/UbuntuMono-Italic.woff2') format('woff2');
+  src: url('../fonts/Ubuntu/UbuntuMono-Italic.woff2') format('woff2');
 }
 
 @font-face {
@@ -18,12 +18,12 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url('/fonts/Ubuntu/UbuntuMono-Bold.woff2') format('woff2');
+  src: url('../fonts/Ubuntu/UbuntuMono-Bold.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Ubuntu Mono';
   font-style: italic;
   font-weight: 700;
   font-display: swap;
-  src: url('/fonts/Ubuntu/UbuntuMono-BoldItalic.woff2') format('woff2');
+  src: url('../fonts/Ubuntu/UbuntuMono-BoldItalic.woff2') format('woff2');
 }