Merge pull request #438 from api-platform/staging

MEP
api-platform · Jul 20, 2023 · 6ab0ec2 · 6ab0ec2
2 parents d3ccbce + 74b2648
commit 6ab0ec2
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 13 deletions.
diff --git a/pwa/app/(common)/layout.tsx b/pwa/app/(common)/layout.tsx
@@ -1,6 +1,6 @@
 import "styles/common.css";
 import "@docsearch/css";
-import { Poppins } from "next/font/google";
+import { Poppins, Fira_Mono } from "next/font/google";
 import Layout from "components/layout/Layout";
 import { Metadata } from "next";
 import { getRootUrl } from "utils";
@@ -12,6 +12,13 @@ const poppins = Poppins({
   subsets: ["latin", "latin-ext"],
 });
 
+const fira = Fira_Mono({
+  variable: "--font-fira",
+  display: "swap",
+  weight: ["400", "500", "700"],
+  subsets: ["latin", "latin-ext"],
+});
+
 export async function generateMetadata(): Promise<Metadata> {
   const dictionary = await import(`data/meta.json`);
 
@@ -56,7 +63,10 @@ function RootLayout({
   children: React.ReactNode;
 }) {
   return (
-    <html lang="en" className={`${poppins.variable} w-full light`}>
+    <html
+      lang="en"
+      className={`${poppins.variable} ${fira.variable} w-full light`}
+    >
       <body className="bg-white dark:bg-blue-black">
         <Layout>{children}</Layout>
       </body>

diff --git a/pwa/common.tailwind.config.js b/pwa/common.tailwind.config.js
@@ -66,6 +66,7 @@ module.exports = {
       },
       fontFamily: {
         title: ["var(--font-poppins)"],
+        mono: ["var(--font-fira)"],
       },
       maxWidth: {
         "8xl": "90rem",

diff --git a/pwa/middleware.tsx b/pwa/middleware.tsx
@@ -4,17 +4,24 @@ import { match as matchLocale } from "@formatjs/intl-localematcher";
 import Negotiator from "negotiator";
 
 function getLocale(request: NextRequest): string | undefined {
-  // Negotiator expects plain object so we need to transform headers
-  const negotiatorHeaders: Record<string, string> = {};
-  request.headers.forEach((value, key) => (negotiatorHeaders[key] = value));
+  try {
+    // Negotiator expects plain object so we need to transform headers
+    const negotiatorHeaders: Record<string, string> = {};
+    request.headers.forEach((value, key) => (negotiatorHeaders[key] = value));
 
-  // Use negotiator and intl-localematcher to get best locale
-  const languages = new Negotiator({ headers: negotiatorHeaders }).languages();
-  const locales = [...i18n.locales];
-  const locale = matchLocale(languages, locales, i18n.defaultLocale);
-  return ([...i18n.locales] as string[]).includes(locale)
-    ? locale
-    : i18n.defaultLocale;
+    // Use negotiator and intl-localematcher to get best locale
+    const languages = new Negotiator({
+      headers: negotiatorHeaders,
+    }).languages();
+    const locales = [...i18n.locales];
+    const locale = matchLocale(languages, locales, i18n.defaultLocale);
+    return ([...i18n.locales] as string[]).includes(locale)
+      ? locale
+      : i18n.defaultLocale;
+  } catch (e) {
+    console.error(e);
+    return i18n.defaultLocale;
+  }
 }
 
 export async function middleware(request: NextRequest) {

diff --git a/pwa/styles/common.css b/pwa/styles/common.css
@@ -40,7 +40,7 @@
         @apply hidden;
     }
     .doc pre {
-        @apply text-sm whitespace-pre-wrap leading-relaxed !bg-gray-100 dark:!bg-blue-darkest rounded-2xl mt-2 mb-4 overflow-x-auto;
+        @apply font-mono text-sm whitespace-pre-wrap leading-relaxed !bg-gray-100 dark:!bg-blue-darkest rounded-2xl mt-2 mb-4 overflow-x-auto;
     }
     .doc pre > code > pre {
         @apply p-0 m-0 rounded-none !bg-transparent;
@@ -54,6 +54,9 @@
     .doc a {
         @apply text-blue;
     }
+    .doc code span.line:not(:last-of-type):after {
+        content: "\200B"; /* useful to set correct height on empty lines */
+    }
 }
 
 @layer utilities {