Merge branch 'develop'

incubateur-ademe · Dec 5, 2024 · cd3eca8 · cd3eca8
2 parents 003508e + 8859802
commit cd3eca8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/app/api/dynamics/comparateur/route.tsx b/app/api/dynamics/comparateur/route.tsx
@@ -20,9 +20,15 @@ export async function GET(req: NextRequest) {
   if (fonts.length === 0) {
     fonts = (
       await Promise.all([
-        getFont(new URL('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Regular.woff', import.meta.url)),
-        getFont(new URL('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Medium.woff', import.meta.url)),
-        getFont(new URL('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Bold.woff', import.meta.url)),
+        getFont(
+          new URL('https://cdn.jsdelivr.net/npm/@gouvfr/[email protected]/dist/fonts/Marianne-Regular.woff', import.meta.url)
+        ),
+        getFont(
+          new URL('https://cdn.jsdelivr.net/npm/@gouvfr/[email protected]/dist/fonts/Marianne-Medium.woff', import.meta.url)
+        ),
+        getFont(
+          new URL('https://cdn.jsdelivr.net/npm/@gouvfr/[email protected]/dist/fonts/Marianne-Bold.woff', import.meta.url)
+        ),
       ])
     ).map((font, index) => ({
       name: 'Marianne',

diff --git a/app/api/dynamics/equivalents/[slug]/route.tsx b/app/api/dynamics/equivalents/[slug]/route.tsx
@@ -35,9 +35,15 @@ export async function GET(req: NextRequest, context: { params: Promise<{ slug: s
   if (fonts.length === 0) {
     fonts = (
       await Promise.all([
-        getFont(new URL('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Regular.woff', import.meta.url)),
-        getFont(new URL('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Medium.woff', import.meta.url)),
-        getFont(new URL('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Bold.woff', import.meta.url)),
+        getFont(
+          new URL('https://cdn.jsdelivr.net/npm/@gouvfr/[email protected]/dist/fonts/Marianne-Regular.woff', import.meta.url)
+        ),
+        getFont(
+          new URL('https://cdn.jsdelivr.net/npm/@gouvfr/[email protected]/dist/fonts/Marianne-Medium.woff', import.meta.url)
+        ),
+        getFont(
+          new URL('https://cdn.jsdelivr.net/npm/@gouvfr/[email protected]/dist/fonts/Marianne-Bold.woff', import.meta.url)
+        ),
       ])
     ).map((font, index) => ({
       name: 'Marianne',

diff --git a/app/layout.tsx b/app/layout.tsx
@@ -19,9 +19,9 @@ export const metadata: Metadata = {
 }
 
 const fonts = [
-  'https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Regular.woff2',
-  'https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Medium.woff2',
-  'https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Bold.woff2',
+  'https://cdn.jsdelivr.net/npm/@gouvfr/dsfr@12.1.1/dist/fonts/Marianne-Regular.woff2',
+  'https://cdn.jsdelivr.net/npm/@gouvfr/dsfr@12.1.1/dist/fonts/Marianne-Medium.woff2',
+  'https://cdn.jsdelivr.net/npm/@gouvfr/dsfr@12.1.1/dist/fonts/Marianne-Bold.woff2',
 ]
 
 const RootLayout = ({ children }: { children: React.ReactNode }) => {

diff --git a/src/utils/fonts.css b/src/utils/fonts.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: 'Marianne';
   src:
-    url('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Regular.woff2') format('woff2'),
-    url('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Regular.woff') format('woff');
+    url('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr@12.1.1/dist/fonts/Marianne-Regular.woff2') format('woff2'),
+    url('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr@12.1.1/dist/fonts/Marianne-Regular.woff') format('woff');
   font-weight: 400;
   font-style: normal;
   font-display: swap;
@@ -11,8 +11,8 @@
 @font-face {
   font-family: 'Marianne';
   src:
-    url('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Medium.woff2') format('woff2'),
-    url('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Medium.woff') format('woff');
+    url('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr@12.1.1/dist/fonts/Marianne-Medium.woff2') format('woff2'),
+    url('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr@12.1.1/dist/fonts/Marianne-Medium.woff') format('woff');
   font-weight: 500;
   font-style: normal;
   font-display: swap;
@@ -21,8 +21,8 @@
 @font-face {
   font-family: 'Marianne';
   src:
-    url('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Bold.woff2') format('woff2'),
-    url('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr/dist/fonts/Marianne-Bold.woff') format('woff');
+    url('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr@12.1.1/dist/fonts/Marianne-Bold.woff2') format('woff2'),
+    url('https://cdn.jsdelivr.net/npm/@gouvfr/dsfr@12.1.1/dist/fonts/Marianne-Bold.woff') format('woff');
   font-weight: 700;
   font-style: normal;
   font-display: swap;