Merge pull request #421 from api-platform/staging

MEP

Author: ginifizz

pwa/app/sitemap.ts

@@ -12,6 +12,9 @@ import { getRootUrl } from "utils";
 
 const basePath = getRootUrl();
 
+const addTrailingSlashIfNecessary = (str: string) =>
+  str.charAt(str.length - 1) === "/" ? str : `${str}/`;
+
 function createLocalePath(locale: Locale, path: string, edition?: string) {
   const baseLocalePath =
     i18n.defaultLocale === locale ? basePath : `${basePath}/${locale}`;
@@ -54,7 +57,7 @@ async function getAllConRoutes() {
         routes.push(createLocalePath(locale, `con/${edition}/${legal}`));
     }
   }
-  return routes;
+  return routes.map((route) => addTrailingSlashIfNecessary(route));
 }
 
 async function getAllStandardRoutes() {
@@ -92,13 +95,14 @@ async function getAllStandardRoutes() {
     }
   }
 
-  return routes;
+  return routes.map((route) => addTrailingSlashIfNecessary(route));
 }
 
 export default async function sitemap() {
   const allLinks = [
-    ...(await getAllConRoutes()),
+    basePath,
     ...(await getAllStandardRoutes()),
+    ...(await getAllConRoutes()),
   ];
   return allLinks.map((path) => ({ url: path }));
 }

pwa/components/layout/Nav.tsx

@@ -102,7 +102,7 @@ export default function Nav({ withPreheader = false }) {
               indexName={process.env.NEXT_PUBLIC_DOCSEARCH_INDEX_NAME}
               apiKey={process.env.NEXT_PUBLIC_DOCSEARCH_API_KEY}
               searchParameters={{
-                facetFilters: [`version:v${version}`],
+                facetFilters: [`version:${version}`],
               }}
               transformItems={(items: any[]) => {
                 return items.map((item) => ({

pwa/package.json

@@ -28,7 +28,7 @@
     "marked": "^5.0.4",
     "marked-highlight": "^2.0.1",
     "negotiator": "^0.6.3",
-    "next": "13.4.8-canary.8",
+    "next": "13.4.9-canary.1",
     "next-themes": "npm:@wits/next-themes@^0.2.16",
     "octokit": "^2.0.19",
     "prettier": "^2.8.8",

pwa/pnpm-lock.yaml

@@ -43,7 +43,7 @@
         @apply 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 !bg-transparent;
+        @apply p-0 m-0 rounded-none !bg-transparent;
     }
     .doc code {
         @apply whitespace-pre-wrap break-words;