From 3700c613b1570697e6483c04aca4887bc33f862b Mon Sep 17 00:00:00 2001
From: Franklin Koch <franklinwkoch@gmail.com>
Date: Wed, 23 Oct 2024 00:45:25 -0600
Subject: [PATCH 1/8] =?UTF-8?q?=F0=9F=97=82=20Support=20url=20slugs=20with?=
 =?UTF-8?q?=20multiple=20path=20segments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changeset/early-plums-double.md               |  8 ++++++++
 packages/common/src/utils.ts                   |  3 ++-
 .../src/components/Navigation/Navigation.tsx   |  2 +-
 .../Navigation/TableOfContentsItems.tsx        | 10 ++++++++--
 themes/article/app/routes/$.tsx                | 11 ++++++-----
 ...sx => ($a).($b).($c).($d).$slug[.json].tsx} | 10 +++++++---
 themes/article/app/utils/loaders.server.ts     | 16 ++++++++++++----
 themes/book/app/routes/$.tsx                   |  9 +++++----
 ...ect)_.($a).($b).($c).($d).$slug[.json].tsx} | 17 ++++++++++-------
 themes/book/app/utils/loaders.server.ts        | 18 +++++++++++++-----
 10 files changed, 72 insertions(+), 32 deletions(-)
 create mode 100644 .changeset/early-plums-double.md
 rename themes/article/app/routes/{$slug[.json].tsx => ($a).($b).($c).($d).$slug[.json].tsx} (79%)
 rename themes/book/app/routes/{($project)_.$slug[.json].tsx => ($project)_.($a).($b).($c).($d).$slug[.json].tsx} (73%)

diff --git a/.changeset/early-plums-double.md b/.changeset/early-plums-double.md
new file mode 100644
index 000000000..c8e9bce90
--- /dev/null
+++ b/.changeset/early-plums-double.md
@@ -0,0 +1,8 @@
+---
+'@myst-theme/common': patch
+'@myst-theme/article': patch
+'@myst-theme/site': patch
+'@myst-theme/book': patch
+---
+
+Support url slugs with multiple path segments
diff --git a/packages/common/src/utils.ts b/packages/common/src/utils.ts
index c2bf336c4..60427a19c 100644
--- a/packages/common/src/utils.ts
+++ b/packages/common/src/utils.ts
@@ -40,9 +40,10 @@ export function getProjectHeadings(
     },
     ...project.pages.map((p) => {
       if (!('slug' in p)) return p;
+      const slug = p.slug?.replace('.', '/');
       return {
         ...p,
-        path: projectSlug && project.slug ? `/${project.slug}/${p.slug}` : `/${p.slug}`,
+        path: projectSlug && project.slug ? `/${project.slug}/${slug}` : `/${slug}`,
       };
     }),
   ];
diff --git a/packages/site/src/components/Navigation/Navigation.tsx b/packages/site/src/components/Navigation/Navigation.tsx
index ded97ff03..925f3c42f 100644
--- a/packages/site/src/components/Navigation/Navigation.tsx
+++ b/packages/site/src/components/Navigation/Navigation.tsx
@@ -77,7 +77,7 @@ export const ConfigurablePrimaryNavigation = ({
 
   if (children)
     console.warn(
-      `Including children in Navigation can break keyboard accessbility and is deprecated. Please move children to the page component.`,
+      `Including children in Navigation can break keyboard accessibility and is deprecated. Please move children to the page component.`,
     );
 
   // the logic on the following line looks wrong, this will return `null` or `<></>`
diff --git a/packages/site/src/components/Navigation/TableOfContentsItems.tsx b/packages/site/src/components/Navigation/TableOfContentsItems.tsx
index c193e4af6..7e317ee30 100644
--- a/packages/site/src/components/Navigation/TableOfContentsItems.tsx
+++ b/packages/site/src/components/Navigation/TableOfContentsItems.tsx
@@ -35,10 +35,16 @@ function nestToc(toc: Heading[]): NestedHeading[] {
   return items;
 }
 
+function pathnameMatchesHeading(pathname: string, heading: Heading, baseurl?: string) {
+  const headingPath = withBaseurl(heading.path, baseurl);
+  if (pathname && headingPath === `${pathname}/index`) return true;
+  return headingPath === pathname;
+}
+
 function childrenOpen(headings: NestedHeading[], pathname: string, baseurl?: string): string[] {
   return headings
     .map((heading) => {
-      if (withBaseurl(heading.path, baseurl) === pathname) return [heading.id];
+      if (pathnameMatchesHeading(pathname, heading, baseurl)) return [heading.id];
       const open = childrenOpen(heading.children, pathname, baseurl);
       if (open.length === 0) return [];
       return [heading.id, ...open];
@@ -110,7 +116,7 @@ const NestedToc = ({ heading }: { heading: NestedHeading }) => {
   useEffect(() => {
     if (nav.state === 'idle') setOpen(startOpen);
   }, [nav.state]);
-  const exact = pathname === withBaseurl(heading.path, baseurl);
+  const exact = pathnameMatchesHeading(pathname, heading, baseurl);
   if (!heading.children || heading.children.length === 0) {
     return (
       <LinkItem
diff --git a/themes/article/app/routes/$.tsx b/themes/article/app/routes/$.tsx
index 50b2bd20f..4d289abdb 100644
--- a/themes/article/app/routes/$.tsx
+++ b/themes/article/app/routes/$.tsx
@@ -47,14 +47,15 @@ export const meta: V2_MetaFunction<typeof loader> = ({ data, matches, location }
 export const links: LinksFunction = () => [KatexCSS];
 
 export const loader: LoaderFunction = async ({ params, request }) => {
-  const [first, second] = new URL(request.url).pathname.slice(1).split('/');
-  const projectName = second ? first : undefined;
-  const slug = second || first;
+  const [first, ...rest] = new URL(request.url).pathname.slice(1).split('/');
   const config = await getConfig();
-  const project = getProject(config, projectName ?? slug);
+  const project = getProject(config, first);
+  const projectName = project?.slug === first ? first : undefined;
+  const slugParts = projectName ? rest : [first, ...rest];
+  const slug = slugParts.length ? slugParts.join('.') : undefined;
   const flat = isFlatSite(config);
   const page = await getPage(request, {
-    project: flat ? projectName : projectName ?? slug,
+    project: flat ? projectName : (projectName ?? slug),
     slug: flat ? slug : projectName ? slug : undefined,
     redirect: process.env.MODE === 'static' ? false : true,
   });
diff --git a/themes/article/app/routes/$slug[.json].tsx b/themes/article/app/routes/($a).($b).($c).($d).$slug[.json].tsx
similarity index 79%
rename from themes/article/app/routes/$slug[.json].tsx
rename to themes/article/app/routes/($a).($b).($c).($d).$slug[.json].tsx
index 52ae076b3..87c272eec 100644
--- a/themes/article/app/routes/$slug[.json].tsx
+++ b/themes/article/app/routes/($a).($b).($c).($d).$slug[.json].tsx
@@ -13,9 +13,12 @@ function api404(message = 'No API route found at this URL') {
 }
 
 export const loader: LoaderFunction = async ({ request, params }) => {
-  const { slug } = params;
+  const [first, ...rest] = new URL(request.url).pathname
+    .slice(1)
+    .replace(/\.json$/, '')
+    .split('/');
   // Handle /myst.xref.json as slug
-  if (slug === 'myst.xref') {
+  if (rest.length === 0 && first === 'myst.xref') {
     const xref = await getMystXrefJson();
     if (!xref) {
       return json({ message: 'myst.xref.json not found', status: 404 }, { status: 404 });
@@ -23,13 +26,14 @@ export const loader: LoaderFunction = async ({ request, params }) => {
     return json(xref);
   }
   // Handle /myst.search.json as slug
-  else if (slug === 'myst.search') {
+  else if (rest.length === 0 && first === 'myst.search') {
     const search = await getMystSearchJson();
     if (!search) {
       return json({ message: 'myst.search.json not found', status: 404 }, { status: 404 });
     }
     return json(search);
   }
+  const slug = [first, ...rest].join('.');
   const data = await getPage(request, { slug }).catch(() => null);
   if (!data) return api404('No page found at this URL.');
   return json(data, {
diff --git a/themes/article/app/utils/loaders.server.ts b/themes/article/app/utils/loaders.server.ts
index e6bc21570..12c2cd58a 100644
--- a/themes/article/app/utils/loaders.server.ts
+++ b/themes/article/app/utils/loaders.server.ts
@@ -62,11 +62,19 @@ export async function getPage(
   const project = getProject(config, projectName);
   if (!project) throw responseNoArticle();
   if (opts.slug === project.index && opts.redirect) {
-    return redirect(projectName ? `/${projectName}` : '/');
+    throw redirect(projectName ? `/${projectName}` : '/');
+  }
+  if (opts.slug?.endsWith('.index') && opts.redirect) {
+    const newSlug = opts.slug.slice(0, -6);
+    throw redirect(projectName ? `/${projectName}/${newSlug}` : `/${newSlug}`);
+  }
+  let slug = opts.loadIndexPage || opts.slug == null ? project.index : opts.slug;
+  let loader = await getStaticContent(projectName, slug).catch(() => null);
+  if (!loader) {
+    slug = `${slug}.index`;
+    loader = await getStaticContent(projectName, slug).catch(() => null);
+    if (!loader) throw responseNoArticle();
   }
-  const slug = opts.loadIndexPage || opts.slug == null ? project.index : opts.slug;
-  const loader = await getStaticContent(projectName, slug).catch(() => null);
-  if (!loader) throw responseNoArticle();
   const footer = getFooterLinks(config, projectName, slug);
   return { ...loader, footer, domain: getDomainFromRequest(request), project: projectName };
 }
diff --git a/themes/book/app/routes/$.tsx b/themes/book/app/routes/$.tsx
index def9465df..9639893c2 100644
--- a/themes/book/app/routes/$.tsx
+++ b/themes/book/app/routes/$.tsx
@@ -59,11 +59,12 @@ export const meta: V2_MetaFunction<typeof loader> = ({ data, matches, location }
 export const links: LinksFunction = () => [KatexCSS];
 
 export const loader: LoaderFunction = async ({ params, request }) => {
-  const [first, second] = new URL(request.url).pathname.slice(1).split('/');
-  const projectName = second ? first : undefined;
-  const slug = second || first;
+  const [first, ...rest] = new URL(request.url).pathname.slice(1).split('/');
   const config = await getConfig();
-  const project = getProject(config, projectName ?? slug);
+  const project = getProject(config, first);
+  const projectName = project?.slug === first ? first : undefined;
+  const slugParts = projectName ? rest : [first, ...rest];
+  const slug = slugParts.length ? slugParts.join('.') : undefined;
   const flat = isFlatSite(config);
   const page = await getPage(request, {
     project: flat ? projectName : (projectName ?? slug),
diff --git a/themes/book/app/routes/($project)_.$slug[.json].tsx b/themes/book/app/routes/($project)_.($a).($b).($c).($d).$slug[.json].tsx
similarity index 73%
rename from themes/book/app/routes/($project)_.$slug[.json].tsx
rename to themes/book/app/routes/($project)_.($a).($b).($c).($d).$slug[.json].tsx
index 438aaca31..1dbfacdf0 100644
--- a/themes/book/app/routes/($project)_.$slug[.json].tsx
+++ b/themes/book/app/routes/($project)_.($a).($b).($c).($d).$slug[.json].tsx
@@ -14,9 +14,12 @@ function api404(message = 'No API route found at this URL') {
 }
 
 export const loader: LoaderFunction = async ({ request, params }) => {
-  const { project, slug } = params;
+  const [first, ...rest] = new URL(request.url).pathname
+    .slice(1)
+    .replace(/\.json$/, '')
+    .split('/');
   // Handle /myst.xref.json as slug
-  if (project === undefined && slug === 'myst.xref') {
+  if (rest.length === 0 && first === 'myst.xref') {
     const xref = await getMystXrefJson();
     if (!xref) {
       return json({ message: 'myst.xref.json not found', status: 404 }, { status: 404 });
@@ -24,7 +27,7 @@ export const loader: LoaderFunction = async ({ request, params }) => {
     return json(xref);
   }
   // Handle /myst.search.json as slug
-  else if (slug === 'myst.search') {
+  else if (rest.length === 0 && first === 'myst.search') {
     const search = await getMystSearchJson();
     if (!search) {
       return json({ message: 'myst.search.json not found', status: 404 }, { status: 404 });
@@ -33,10 +36,10 @@ export const loader: LoaderFunction = async ({ request, params }) => {
   }
   const config = await getConfig();
   const flat = isFlatSite(config);
-  const data = await getPage(request, {
-    project: flat ? project : (project ?? slug),
-    slug: flat ? slug : project ? slug : undefined,
-  });
+  const project = flat ? undefined : first;
+  const slugParts = flat ? [first, ...rest] : rest;
+  const slug = slugParts.join('.');
+  const data = await getPage(request, { project, slug });
   if (!data) return api404('No page found at this URL.');
   return json(data, {
     headers: {
diff --git a/themes/book/app/utils/loaders.server.ts b/themes/book/app/utils/loaders.server.ts
index e92b7b28d..2c3c55477 100644
--- a/themes/book/app/utils/loaders.server.ts
+++ b/themes/book/app/utils/loaders.server.ts
@@ -9,7 +9,7 @@ import {
 } from '@myst-theme/common';
 import { redirect } from '@remix-run/node';
 import { responseNoArticle, responseNoSite, getDomainFromRequest } from '@myst-theme/site';
-import type { MystSearchIndex } from '@myst-theme/search'; 
+import type { MystSearchIndex } from '@myst-theme/search';
 
 const CONTENT_CDN_PORT = process.env.CONTENT_CDN_PORT ?? '3100';
 const CONTENT_CDN = process.env.CONTENT_CDN ?? `http://localhost:${CONTENT_CDN_PORT}`;
@@ -63,11 +63,19 @@ export async function getPage(
   const project = getProject(config, projectName);
   if (!project) throw responseNoArticle();
   if (opts.slug === project.index && opts.redirect) {
-    return redirect(projectName ? `/${projectName}` : '/');
+    throw redirect(projectName ? `/${projectName}` : '/');
+  }
+  if (opts.slug?.endsWith('.index') && opts.redirect) {
+    const newSlug = opts.slug.slice(0, -6);
+    throw redirect(projectName ? `/${projectName}/${newSlug}` : `/${newSlug}`);
+  }
+  let slug = opts.loadIndexPage || opts.slug == null ? project.index : opts.slug;
+  let loader = await getStaticContent(projectName, slug).catch(() => null);
+  if (!loader) {
+    slug = `${slug}.index`;
+    loader = await getStaticContent(projectName, slug).catch(() => null);
+    if (!loader) throw responseNoArticle();
   }
-  const slug = opts.loadIndexPage || opts.slug == null ? project.index : opts.slug;
-  const loader = await getStaticContent(projectName, slug).catch(() => null);
-  if (!loader) throw responseNoArticle();
   const footer = getFooterLinks(config, projectName, slug);
   return { ...loader, footer, domain: getDomainFromRequest(request), project: projectName };
 }

From 8714cd40eee17de4adb7c1c65ef1fac78833394e Mon Sep 17 00:00:00 2001
From: Franklin Koch <franklinwkoch@gmail.com>
Date: Wed, 23 Oct 2024 11:12:03 -0600
Subject: [PATCH 2/8] Add url_folders option to template.yml

---
 themes/article/template.yml | 3 +++
 themes/book/template.yml    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/themes/article/template.yml b/themes/article/template.yml
index d53d5e2dd..9663623e8 100644
--- a/themes/article/template.yml
+++ b/themes/article/template.yml
@@ -52,6 +52,9 @@ options:
   - type: boolean
     id: numbered_references
     description: Show references as numbered, rather than in APA-style. Only applies to parenthetical citations.
+  - type: boolean
+    id: url_folders
+    description: Respect nested folder structure in URL paths.
 build:
   install: npm install
   start: npm run start
diff --git a/themes/book/template.yml b/themes/book/template.yml
index c24d135e9..2890cf2e6 100644
--- a/themes/book/template.yml
+++ b/themes/book/template.yml
@@ -58,6 +58,9 @@ options:
   - type: boolean
     id: numbered_references
     description: Show references as numbered, rather than in APA-style. Only applies to parenthetical citations.
+  - type: boolean
+    id: url_folders
+    description: Respect nested folder structure in URL paths.
 build:
   install: npm install
   start: npm run start

From f52e3451c3f9328163f6123bb713a7a5f12af701 Mon Sep 17 00:00:00 2001
From: Franklin Koch <franklinwkoch@gmail.com>
Date: Wed, 23 Oct 2024 23:56:09 -0600
Subject: [PATCH 3/8] Replace all slug dots with slashes, not just first

---
 packages/common/src/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/common/src/utils.ts b/packages/common/src/utils.ts
index 60427a19c..9b9d59f32 100644
--- a/packages/common/src/utils.ts
+++ b/packages/common/src/utils.ts
@@ -40,7 +40,7 @@ export function getProjectHeadings(
     },
     ...project.pages.map((p) => {
       if (!('slug' in p)) return p;
-      const slug = p.slug?.replace('.', '/');
+      const slug = p.slug?.replaceAll('.', '/');
       return {
         ...p,
         path: projectSlug && project.slug ? `/${project.slug}/${slug}` : `/${slug}`,

From 83a9310d087b75b8f0b0be2d22f0c929169832aa Mon Sep 17 00:00:00 2001
From: Rowan Cockett <rowanc1@gmail.com>
Date: Thu, 24 Oct 2024 11:10:54 -0600
Subject: [PATCH 4/8] Sitemap

---
 packages/site/src/seo/sitemap.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/site/src/seo/sitemap.ts b/packages/site/src/seo/sitemap.ts
index 7505b1ff4..e2fd552c7 100644
--- a/packages/site/src/seo/sitemap.ts
+++ b/packages/site/src/seo/sitemap.ts
@@ -148,7 +148,10 @@ export function getSiteSlugs(
         const projectSlug = project.slug ? `/${project.slug}` : '';
         const pages = project.pages
           .filter((page): page is ManifestProjectItem => 'slug' in page)
-          .map((page) => `${baseurl}${projectSlug}/${page.slug}`);
+          .map(
+            (page) =>
+              `${baseurl}${projectSlug}/${page.slug?.replace(/\.index$/, '').replace(/\./g, '/')}`,
+          );
         if (opts?.excludeIndex) return [...pages];
         return [
           opts?.explicitIndex

From 8da5b4c4421a91f08a42f2774e9c626bb19cfd00 Mon Sep 17 00:00:00 2001
From: Rowan Cockett <rowanc1@gmail.com>
Date: Thu, 24 Oct 2024 11:43:02 -0600
Subject: [PATCH 5/8] code review

---
 packages/common/src/utils.ts            | 2 +-
 themes/book/app/utils/loaders.server.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/common/src/utils.ts b/packages/common/src/utils.ts
index 9b9d59f32..11ee658bb 100644
--- a/packages/common/src/utils.ts
+++ b/packages/common/src/utils.ts
@@ -40,7 +40,7 @@ export function getProjectHeadings(
     },
     ...project.pages.map((p) => {
       if (!('slug' in p)) return p;
-      const slug = p.slug?.replaceAll('.', '/');
+      const slug = p.slug?.replace(/\.index$/, '').replaceAll('.', '/');
       return {
         ...p,
         path: projectSlug && project.slug ? `/${project.slug}/${slug}` : `/${slug}`,
diff --git a/themes/book/app/utils/loaders.server.ts b/themes/book/app/utils/loaders.server.ts
index 2c3c55477..672ef8604 100644
--- a/themes/book/app/utils/loaders.server.ts
+++ b/themes/book/app/utils/loaders.server.ts
@@ -66,7 +66,7 @@ export async function getPage(
     throw redirect(projectName ? `/${projectName}` : '/');
   }
   if (opts.slug?.endsWith('.index') && opts.redirect) {
-    const newSlug = opts.slug.slice(0, -6);
+    const newSlug = opts.slug.replace(/\.index$/, '').replace(/\./g, '/');
     throw redirect(projectName ? `/${projectName}/${newSlug}` : `/${newSlug}`);
   }
   let slug = opts.loadIndexPage || opts.slug == null ? project.index : opts.slug;

From f8cd1ae845cee3f3f3501b785019cff921dac7ae Mon Sep 17 00:00:00 2001
From: Rowan Cockett <rowanc1@gmail.com>
Date: Thu, 24 Oct 2024 11:58:25 -0600
Subject: [PATCH 6/8] Move to folders

---
 themes/article/template.yml | 2 +-
 themes/book/template.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/article/template.yml b/themes/article/template.yml
index 9663623e8..9c4d59678 100644
--- a/themes/article/template.yml
+++ b/themes/article/template.yml
@@ -53,7 +53,7 @@ options:
     id: numbered_references
     description: Show references as numbered, rather than in APA-style. Only applies to parenthetical citations.
   - type: boolean
-    id: url_folders
+    id: folders
     description: Respect nested folder structure in URL paths.
 build:
   install: npm install
diff --git a/themes/book/template.yml b/themes/book/template.yml
index 2890cf2e6..db30fcb8a 100644
--- a/themes/book/template.yml
+++ b/themes/book/template.yml
@@ -59,7 +59,7 @@ options:
     id: numbered_references
     description: Show references as numbered, rather than in APA-style. Only applies to parenthetical citations.
   - type: boolean
-    id: url_folders
+    id: folders
     description: Respect nested folder structure in URL paths.
 build:
   install: npm install

From c2d115a2060de5919685d47c15d81a49053fa69d Mon Sep 17 00:00:00 2001
From: Rowan Cockett <rowanc1@gmail.com>
Date: Thu, 24 Oct 2024 12:53:52 -0600
Subject: [PATCH 7/8] upgrade myst

---
 package-lock.json                       | 88 ++++++++++++-------------
 packages/common/package.json            |  6 +-
 packages/common/src/utils.ts            |  3 +-
 packages/jupyter/package.json           |  8 +--
 packages/myst-demo/package.json         |  8 +--
 packages/myst-to-react/package.json     |  4 +-
 packages/providers/package.json         |  6 +-
 packages/site/package.json              |  6 +-
 packages/site/src/seo/sitemap.ts        |  6 +-
 themes/article/package.json             |  4 +-
 themes/book/app/utils/loaders.server.ts |  3 +-
 themes/book/package.json                |  4 +-
 12 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 39c876beb..64e1e5a52 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31182,13 +31182,13 @@
       }
     },
     "node_modules/myst-common": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/myst-common/-/myst-common-1.7.2.tgz",
-      "integrity": "sha512-xWYABtbIHNrX087EmwyuoSwhl9oJQfQ+3+6H+lv+bfLWRE1DZO4lr03113rjE4/I1IvjZgX3rE4Nb+SLF83DFQ==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/myst-common/-/myst-common-1.7.3.tgz",
+      "integrity": "sha512-eHZ1iHOk+Agob5s+Oni7DVkicBCaEtNE1tQPkI4XYP8hZPPkE5F/qUmaL9ijw3z9y3KPs/XBT2dPSLYRwU80hA==",
       "license": "MIT",
       "dependencies": {
         "mdast": "^3.0.0",
-        "myst-frontmatter": "^1.7.2",
+        "myst-frontmatter": "^1.7.3",
         "myst-spec": "^0.0.5",
         "nanoid": "^4.0.0",
         "unified": "^10.1.2",
@@ -31215,13 +31215,13 @@
       }
     },
     "node_modules/myst-config": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/myst-config/-/myst-config-1.7.2.tgz",
-      "integrity": "sha512-JuV54yVuMfgYGGFihNc/WDZ180smNer4wuw3jk7osmcow/CsldCWwXKNB44AO/Ii96aVLZCyPPm2CyhlE4W5pw==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/myst-config/-/myst-config-1.7.3.tgz",
+      "integrity": "sha512-f8l6vejVWSxJp1jeTz9ni/AiaEQz8n+fAIxfVrEUjlKYp9f+Y90DdUYsBgbUu0R2LJJ76Bt/WUnRh3NZFR461Q==",
       "license": "MIT",
       "dependencies": {
-        "myst-common": "^1.7.2",
-        "myst-frontmatter": "^1.7.2",
+        "myst-common": "^1.7.3",
+        "myst-frontmatter": "^1.7.3",
         "simple-validators": "^1.1.0"
       }
     },
@@ -31310,9 +31310,9 @@
       }
     },
     "node_modules/myst-frontmatter": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/myst-frontmatter/-/myst-frontmatter-1.7.2.tgz",
-      "integrity": "sha512-J2kvADyifsGkawRL8M96i3MIxCu3Z6JliBNYsEEfFGEJRGIzMtNAyJlLlu836QqQoBVV7WaRY5Dc6aYgSxqPUw==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/myst-frontmatter/-/myst-frontmatter-1.7.3.tgz",
+      "integrity": "sha512-abgMy6COBGXZwcNKPXPUAWQp34WLDFWLiZJDV3CzNamiGHa/r2ymuGRmV3yLBWc1NACYwn2RQ+zEOaX3tP2WaA==",
       "license": "MIT",
       "dependencies": {
         "credit-roles": "^2.1.0",
@@ -31383,9 +31383,9 @@
       "license": "MIT"
     },
     "node_modules/myst-spec-ext": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/myst-spec-ext/-/myst-spec-ext-1.7.2.tgz",
-      "integrity": "sha512-oYDMHicKW3tm16OwnsTTiAo0hYMXBK1v8MDFZyHzavb2Q8artsqyAl/O2N0cefM5zI8L2JdMHhewd9tcx9iwvA==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/myst-spec-ext/-/myst-spec-ext-1.7.3.tgz",
+      "integrity": "sha512-YOqwnSTImGnIEFk/g8NWmMWiJh96Xp17V+0vNCuVleGxDd7HI588FcnptLYCTp+3SENzIRVBztS8JjHxNi+V4Q==",
       "license": "MIT",
       "dependencies": {
         "myst-spec": "^0.0.5"
@@ -31566,14 +31566,14 @@
       }
     },
     "node_modules/myst-to-typst": {
-      "version": "0.0.24",
-      "resolved": "https://registry.npmjs.org/myst-to-typst/-/myst-to-typst-0.0.24.tgz",
-      "integrity": "sha512-d13fSRBGk+kdEaF5tX0T/RsmdGPkO1hSxcX+v5vvRE3wvhhSFVpD8tACxK+IHhZC7XrUUR+RZ7/F6KXPvpoIyw==",
+      "version": "0.0.25",
+      "resolved": "https://registry.npmjs.org/myst-to-typst/-/myst-to-typst-0.0.25.tgz",
+      "integrity": "sha512-akTsKaqFrsmiCLQOyxzeJYyUvXkDX2Y2T4Ir7gXIW8Cl/sjX9Jo807yNE8VV5LjFZzJHc597gCErQXSLOnCXZw==",
       "license": "MIT",
       "dependencies": {
-        "myst-common": "^1.7.2",
-        "myst-frontmatter": "^1.7.2",
-        "myst-spec-ext": "^1.7.2",
+        "myst-common": "^1.7.3",
+        "myst-frontmatter": "^1.7.3",
+        "myst-spec-ext": "^1.7.3",
         "tex-to-typst": "^0.0.7",
         "unist-util-select": "^4.0.3",
         "vfile-reporter": "^7.0.4"
@@ -40971,9 +40971,9 @@
       "version": "0.13.2",
       "license": "MIT",
       "dependencies": {
-        "myst-common": "^1.7.2",
-        "myst-config": "^1.7.2",
-        "myst-spec-ext": "^1.7.2",
+        "myst-common": "^1.7.3",
+        "myst-config": "^1.7.3",
+        "myst-spec-ext": "^1.7.3",
         "nbtx": "^0.2.3",
         "unist-util-select": "^4.0.3"
       }
@@ -41062,11 +41062,11 @@
         "buffer": "^6.0.3",
         "classnames": "^2.5.1",
         "jupyterlab-plotly": "^5.24.0",
-        "myst-common": "^1.7.2",
-        "myst-config": "^1.7.2",
-        "myst-frontmatter": "^1.7.2",
+        "myst-common": "^1.7.3",
+        "myst-config": "^1.7.3",
+        "myst-frontmatter": "^1.7.3",
         "myst-spec": "^0.0.5",
-        "myst-spec-ext": "^1.7.2",
+        "myst-spec-ext": "^1.7.3",
         "myst-to-react": "^0.13.2",
         "nanoid": "^4.0.2",
         "nbtx": "^0.2.3",
@@ -41118,15 +41118,15 @@
         "@heroicons/react": "^2.0.18",
         "classnames": "^2.3.2",
         "js-yaml": "^4.1.0",
-        "myst-common": "^1.7.2",
-        "myst-config": "^1.7.2",
+        "myst-common": "^1.7.3",
+        "myst-config": "^1.7.3",
         "myst-directives": "^1.5.7",
         "myst-ext-card": "^1.0.9",
         "myst-ext-exercise": "^1.0.8",
         "myst-ext-grid": "^1.0.8",
         "myst-ext-proof": "^1.0.11",
         "myst-ext-tabs": "^1.0.8",
-        "myst-frontmatter": "^1.7.2",
+        "myst-frontmatter": "^1.7.3",
         "myst-parser": "^1.5.7",
         "myst-spec": "^0.0.5",
         "myst-to-docx": "^1.0.12",
@@ -41134,7 +41134,7 @@
         "myst-to-jats": "^1.0.30",
         "myst-to-react": "^0.13.2",
         "myst-to-tex": "^1.0.38",
-        "myst-to-typst": "^0.0.24",
+        "myst-to-typst": "^0.0.25",
         "myst-transforms": "^1.3.26",
         "unified": "^10.1.2",
         "unist-util-remove": "^4.0.0",
@@ -41183,8 +41183,8 @@
         "@scienceicons/react": "^0.0.11",
         "buffer": "^6.0.3",
         "classnames": "^2.3.2",
-        "myst-common": "^1.7.2",
-        "myst-config": "^1.7.2",
+        "myst-common": "^1.7.3",
+        "myst-config": "^1.7.3",
         "myst-spec": "^0.0.5",
         "nanoid": "^4.0.2",
         "react-syntax-highlighter": "15.5.0",
@@ -41243,9 +41243,9 @@
       "peerDependencies": {
         "@types/react": "^16.8 || ^17.0 || ^18.0",
         "@types/react-dom": "^16.8 || ^17.0 || ^18.0",
-        "myst-common": "^1.7.2",
-        "myst-config": "^1.7.2",
-        "myst-frontmatter": "^1.7.2",
+        "myst-common": "^1.7.3",
+        "myst-config": "^1.7.3",
+        "myst-frontmatter": "^1.7.3",
         "react": "^16.8 || ^17.0 || ^18.0",
         "react-dom": "^16.8 || ^17.0 || ^18.0"
       }
@@ -41285,10 +41285,10 @@
         "@radix-ui/react-visually-hidden": "^1.1.0",
         "classnames": "^2.3.2",
         "lodash.throttle": "^4.1.1",
-        "myst-common": "^1.7.2",
-        "myst-config": "^1.7.2",
+        "myst-common": "^1.7.3",
+        "myst-config": "^1.7.3",
         "myst-demo": "^0.13.2",
-        "myst-spec-ext": "^1.7.2",
+        "myst-spec-ext": "^1.7.3",
         "myst-to-react": "^0.13.2",
         "nbtx": "^0.2.3",
         "node-cache": "^5.1.2",
@@ -41349,8 +41349,8 @@
         "@remix-run/node": "~1.17.0",
         "@remix-run/react": "~1.17.0",
         "@remix-run/vercel": "~1.17.0",
-        "myst-common": "^1.7.2",
-        "myst-config": "^1.7.2",
+        "myst-common": "^1.7.3",
+        "myst-config": "^1.7.3",
         "node-fetch": "^2.6.11",
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
@@ -41382,8 +41382,8 @@
         "@remix-run/node": "~1.17.0",
         "@remix-run/react": "~1.17.0",
         "@remix-run/vercel": "~1.17.0",
-        "myst-common": "^1.7.2",
-        "myst-config": "^1.7.2",
+        "myst-common": "^1.7.3",
+        "myst-config": "^1.7.3",
         "node-fetch": "^2.6.11",
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
diff --git a/packages/common/package.json b/packages/common/package.json
index aba63e4d8..6d41674ce 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -19,9 +19,9 @@
     "build": "npm-run-all -l clean -p build:esm"
   },
   "dependencies": {
-    "myst-common": "^1.7.2",
-    "myst-config": "^1.7.2",
-    "myst-spec-ext": "^1.7.2",
+    "myst-common": "^1.7.3",
+    "myst-config": "^1.7.3",
+    "myst-spec-ext": "^1.7.3",
     "nbtx": "^0.2.3",
     "unist-util-select": "^4.0.3"
   }
diff --git a/packages/common/src/utils.ts b/packages/common/src/utils.ts
index 11ee658bb..6eea17a11 100644
--- a/packages/common/src/utils.ts
+++ b/packages/common/src/utils.ts
@@ -4,6 +4,7 @@ import type { SiteManifest } from 'myst-config';
 import { selectAll } from 'unist-util-select';
 import type { Image as ImageSpec, Link as LinkSpec } from 'myst-spec';
 import type { FooterLinks, Heading, NavigationLink, PageLoader } from './types.js';
+import { slugToUrl } from 'myst-common';
 
 type Image = ImageSpec & { urlOptimized?: string };
 type Link = LinkSpec & { static?: boolean };
@@ -40,7 +41,7 @@ export function getProjectHeadings(
     },
     ...project.pages.map((p) => {
       if (!('slug' in p)) return p;
-      const slug = p.slug?.replace(/\.index$/, '').replaceAll('.', '/');
+      const slug = slugToUrl(p.slug);
       return {
         ...p,
         path: projectSlug && project.slug ? `/${project.slug}/${slug}` : `/${slug}`,
diff --git a/packages/jupyter/package.json b/packages/jupyter/package.json
index 24e8dfedb..22a05788d 100644
--- a/packages/jupyter/package.json
+++ b/packages/jupyter/package.json
@@ -30,11 +30,11 @@
     "buffer": "^6.0.3",
     "classnames": "^2.5.1",
     "jupyterlab-plotly": "^5.24.0",
-    "myst-common": "^1.7.2",
-    "myst-config": "^1.7.2",
-    "myst-frontmatter": "^1.7.2",
+    "myst-common": "^1.7.3",
+    "myst-config": "^1.7.3",
+    "myst-frontmatter": "^1.7.3",
     "myst-spec": "^0.0.5",
-    "myst-spec-ext": "^1.7.2",
+    "myst-spec-ext": "^1.7.3",
     "myst-to-react": "^0.13.2",
     "nanoid": "^4.0.2",
     "nbtx": "^0.2.3",
diff --git a/packages/myst-demo/package.json b/packages/myst-demo/package.json
index ef1c8fee7..51ef71c5e 100644
--- a/packages/myst-demo/package.json
+++ b/packages/myst-demo/package.json
@@ -23,15 +23,15 @@
     "@heroicons/react": "^2.0.18",
     "classnames": "^2.3.2",
     "js-yaml": "^4.1.0",
-    "myst-common": "^1.7.2",
-    "myst-config": "^1.7.2",
+    "myst-common": "^1.7.3",
+    "myst-config": "^1.7.3",
     "myst-directives": "^1.5.7",
     "myst-ext-card": "^1.0.9",
     "myst-ext-exercise": "^1.0.8",
     "myst-ext-grid": "^1.0.8",
     "myst-ext-proof": "^1.0.11",
     "myst-ext-tabs": "^1.0.8",
-    "myst-frontmatter": "^1.7.2",
+    "myst-frontmatter": "^1.7.3",
     "myst-parser": "^1.5.7",
     "myst-spec": "^0.0.5",
     "myst-to-docx": "^1.0.12",
@@ -39,7 +39,7 @@
     "myst-to-jats": "^1.0.30",
     "myst-to-react": "^0.13.2",
     "myst-to-tex": "^1.0.38",
-    "myst-to-typst": "^0.0.24",
+    "myst-to-typst": "^0.0.25",
     "myst-transforms": "^1.3.26",
     "unified": "^10.1.2",
     "unist-util-remove": "^4.0.0",
diff --git a/packages/myst-to-react/package.json b/packages/myst-to-react/package.json
index 48ae84374..880af1897 100644
--- a/packages/myst-to-react/package.json
+++ b/packages/myst-to-react/package.json
@@ -26,8 +26,8 @@
     "@radix-ui/react-hover-card": "^1.0.6",
     "buffer": "^6.0.3",
     "classnames": "^2.3.2",
-    "myst-common": "^1.7.2",
-    "myst-config": "^1.7.2",
+    "myst-common": "^1.7.3",
+    "myst-config": "^1.7.3",
     "myst-spec": "^0.0.5",
     "nanoid": "^4.0.2",
     "react-syntax-highlighter": "15.5.0",
diff --git a/packages/providers/package.json b/packages/providers/package.json
index 3fd379e47..6089b466f 100644
--- a/packages/providers/package.json
+++ b/packages/providers/package.json
@@ -27,9 +27,9 @@
   "peerDependencies": {
     "@types/react": "^16.8 || ^17.0 || ^18.0",
     "@types/react-dom": "^16.8 || ^17.0 || ^18.0",
-    "myst-common": "^1.7.2",
-    "myst-config": "^1.7.2",
-    "myst-frontmatter": "^1.7.2",
+    "myst-common": "^1.7.3",
+    "myst-config": "^1.7.3",
+    "myst-frontmatter": "^1.7.3",
     "react": "^16.8 || ^17.0 || ^18.0",
     "react-dom": "^16.8 || ^17.0 || ^18.0"
   },
diff --git a/packages/site/package.json b/packages/site/package.json
index 33dcb88dd..be272bbcf 100644
--- a/packages/site/package.json
+++ b/packages/site/package.json
@@ -35,10 +35,10 @@
     "@radix-ui/react-visually-hidden": "^1.1.0",
     "classnames": "^2.3.2",
     "lodash.throttle": "^4.1.1",
-    "myst-common": "^1.7.2",
-    "myst-config": "^1.7.2",
+    "myst-common": "^1.7.3",
+    "myst-config": "^1.7.3",
     "myst-demo": "^0.13.2",
-    "myst-spec-ext": "^1.7.2",
+    "myst-spec-ext": "^1.7.3",
     "myst-to-react": "^0.13.2",
     "nbtx": "^0.2.3",
     "node-cache": "^5.1.2",
diff --git a/packages/site/src/seo/sitemap.ts b/packages/site/src/seo/sitemap.ts
index e2fd552c7..c9bf279e7 100644
--- a/packages/site/src/seo/sitemap.ts
+++ b/packages/site/src/seo/sitemap.ts
@@ -1,3 +1,4 @@
+import { slugToUrl } from 'myst-common';
 import type { SiteManifest } from 'myst-config';
 
 type ManifestProjectItem = Required<SiteManifest>['projects'][0]['pages'][0];
@@ -148,10 +149,7 @@ export function getSiteSlugs(
         const projectSlug = project.slug ? `/${project.slug}` : '';
         const pages = project.pages
           .filter((page): page is ManifestProjectItem => 'slug' in page)
-          .map(
-            (page) =>
-              `${baseurl}${projectSlug}/${page.slug?.replace(/\.index$/, '').replace(/\./g, '/')}`,
-          );
+          .map((page) => `${baseurl}${projectSlug}/${slugToUrl(page.slug)}`);
         if (opts?.excludeIndex) return [...pages];
         return [
           opts?.explicitIndex
diff --git a/themes/article/package.json b/themes/article/package.json
index 7b1cb2303..5ac2349ff 100644
--- a/themes/article/package.json
+++ b/themes/article/package.json
@@ -25,8 +25,8 @@
     "@remix-run/node": "~1.17.0",
     "@remix-run/react": "~1.17.0",
     "@remix-run/vercel": "~1.17.0",
-    "myst-common": "^1.7.2",
-    "myst-config": "^1.7.2",
+    "myst-common": "^1.7.3",
+    "myst-config": "^1.7.3",
     "node-fetch": "^2.6.11",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
diff --git a/themes/book/app/utils/loaders.server.ts b/themes/book/app/utils/loaders.server.ts
index 672ef8604..daef03457 100644
--- a/themes/book/app/utils/loaders.server.ts
+++ b/themes/book/app/utils/loaders.server.ts
@@ -10,6 +10,7 @@ import {
 import { redirect } from '@remix-run/node';
 import { responseNoArticle, responseNoSite, getDomainFromRequest } from '@myst-theme/site';
 import type { MystSearchIndex } from '@myst-theme/search';
+import { slugToUrl } from 'myst-common';
 
 const CONTENT_CDN_PORT = process.env.CONTENT_CDN_PORT ?? '3100';
 const CONTENT_CDN = process.env.CONTENT_CDN ?? `http://localhost:${CONTENT_CDN_PORT}`;
@@ -66,7 +67,7 @@ export async function getPage(
     throw redirect(projectName ? `/${projectName}` : '/');
   }
   if (opts.slug?.endsWith('.index') && opts.redirect) {
-    const newSlug = opts.slug.replace(/\.index$/, '').replace(/\./g, '/');
+    const newSlug = slugToUrl(opts.slug);
     throw redirect(projectName ? `/${projectName}/${newSlug}` : `/${newSlug}`);
   }
   let slug = opts.loadIndexPage || opts.slug == null ? project.index : opts.slug;
diff --git a/themes/book/package.json b/themes/book/package.json
index 2d240df21..b629a5b05 100644
--- a/themes/book/package.json
+++ b/themes/book/package.json
@@ -25,8 +25,8 @@
     "@remix-run/node": "~1.17.0",
     "@remix-run/react": "~1.17.0",
     "@remix-run/vercel": "~1.17.0",
-    "myst-common": "^1.7.2",
-    "myst-config": "^1.7.2",
+    "myst-common": "^1.7.3",
+    "myst-config": "^1.7.3",
     "node-fetch": "^2.6.11",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

From 2cb7e558d683d0b156213f588830f81d18f16d9e Mon Sep 17 00:00:00 2001
From: Rowan Cockett <rowanc1@gmail.com>
Date: Thu, 24 Oct 2024 12:56:55 -0600
Subject: [PATCH 8/8] Update themes/article/app/utils/loaders.server.ts

---
 themes/article/app/utils/loaders.server.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/themes/article/app/utils/loaders.server.ts b/themes/article/app/utils/loaders.server.ts
index 12c2cd58a..8050f3641 100644
--- a/themes/article/app/utils/loaders.server.ts
+++ b/themes/article/app/utils/loaders.server.ts
@@ -71,6 +71,7 @@ export async function getPage(
   let slug = opts.loadIndexPage || opts.slug == null ? project.index : opts.slug;
   let loader = await getStaticContent(projectName, slug).catch(() => null);
   if (!loader) {
+    // If you haven't loaded the first time, try the `.index`
     slug = `${slug}.index`;
     loader = await getStaticContent(projectName, slug).catch(() => null);
     if (!loader) throw responseNoArticle();