redirects: always strip trailing slash

Author: eimrek

astro.config.mjs

@@ -5,9 +5,8 @@ import sitemap from "@astrojs/sitemap";
 import react from "@astrojs/react";
 
 export default defineConfig({
-  site: process.env.ASTRO_SITE || undefined,
+  site: process.env.ASTRO_SITE || "https://www.materialscloud.org",
   base: process.env.ASTRO_BASE || "/",
-
   vite: {
     resolve: {
       alias: {
@@ -18,7 +17,14 @@ export default defineConfig({
     },
     plugins: [tailwindcss()],
   },
-
-  site: "https://www.materialscloud.org",
   integrations: [react(), sitemap()],
+
+  // ----
+  // Canonicalize URLs without trailing slash
+  trailingSlash: "never",
+  build: {
+    // needed for Cloudflare - otherwise "directory" redirects to trailing slash
+    format: "file",
+  },
+  // ----
 });

public/_redirects

@@ -2,14 +2,17 @@
 # Redirect configuration file for Cloudflare pages
 # --------------------------------------------------------
 
+# Strip trailing slashes globally
+/*/ /:splat 301
+
 # Navitation to external pages
 /aiidalab https://www.aiidalab.net/ 301
 /work/aiidalab https://www.aiidalab.net/ 301
 /archive https://archive.materialscloud.org/ 301
 /moderation https://archive.materialscloud.org/information#moderation_policies 301
 /work/quantum-mobile https://quantum-mobile.readthedocs.io/en/latest/ 301
 
-# Old file paths match new S3 307 means keep the headers and path
+# Old file paths match new S3
 /learn/data/learn/files/* https://rgw.cscs.ch/matcloud:mc-public/learn-data/files/:splat 302
 
 # dropping old url syntax
@@ -41,23 +44,14 @@
 /discover/3dcd /discover/mc3d 301
 /discover/2dstructures /discover/mc2d 301
 
-# trailing slash names
-/discover/mc3d/ /discover/mc3d 301
-/discover/mc2d/ /discover/mc2d 301
-/discover/sssp/ /discover/sssp 301
-/discover/acwf-verification/ /discover/acwf-verification 301
-
-
 # Contributed sections
-# /discover/2dtopo https://legacy.materialscloud.org/discover/2dtopo 302 // migrated into mc2d with standalone page
+/discover/2dtopo https://legacy.materialscloud.org/discover/2dtopo 302
 /discover/autowannier https://legacy.materialscloud.org/discover/autowannier 302
 
 /discover/kpcovr https://kpcovr.materialscloud.io/ 302
 /discover/kpcovr/:dataset https://kpcovr.materialscloud.io/?dataset=:dataset 302
 
 
-
-
 # -------------- Tools --------------
 
 # Core tools
@@ -86,9 +80,6 @@
 /tbeta /work/tools/tbeta 301
 /layer-raman-ir /work/tools/layer-raman-ir 301
 
-/work/tools/shiftml* https://shiftml.materialscloud.io/ 301
-
-
 # -------------- OPTIMADE APIs --------------
 /optimade https://optimade.materialscloud.org 301
 /optimade/main https://optimade.materialscloud.org/main/index/links 301

src/layouts/Layout.astro

@@ -9,7 +9,9 @@ const {
   padding = "py-5 px-7 mb-4",
 } = Astro.props;
 
-const baseHref = (import.meta.env.BASE_URL || "/").replace(/\/?$/, "/"); // also add trailing slash if not present
+// const baseHref = (import.meta.env.BASE_URL || "/").replace(/\/?$/, "/"); // also add trailing slash if not present
+
+const baseHref = (import.meta.env.BASE_URL || "/")
 
 const activeSection =
   breadcrumbs.length > 0 ? breadcrumbs[0].name.toLowerCase() : "";