astro-accelerator 0.0.64 → 0.0.66

package/astro.config.mjs

@@ -1,3 +1,4 @@
+import mdx from '@astrojs/mdx';
 import remarkDirective from 'remark-directive';
 import { defineConfig } from 'astro/config';
 import { attributeMarkdown, wrapTables } from '/src/themes/accelerator/utilities/custom-markdown.mjs';
@@ -5,6 +6,7 @@ import { attributeMarkdown, wrapTables } from '/src/themes/accelerator/utilities
 // https://astro.build/config
 export default defineConfig({
     site: 'https://astro.stevefenton.co.uk',
+    integrations: [mdx()],
     markdown: {
         remarkPlugins: [
             remarkDirective,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.64",
+  "version": "0.0.66",
   "author": "Steve Fenton",
   "name": "astro-accelerator",
   "description": "A super-lightweight, accessible, SEO-friendly starter project for Astro",
@@ -24,9 +24,10 @@
     "dts": "tsc ./tests/locate-content.js ./tests/locate-navigation.js ./tests/locate-search.js --allowJs --declaration --emitDeclarationOnly"
   },
   "dependencies": {
+    "@astrojs/mdx": "^0.17.0",
     "@squoosh/lib": "^0.4.0",
-    "astro": "^2.0.1",
-    "astro-accelerator-utils": "^0.2.20",
+    "astro": "^2.0.13",
+    "astro-accelerator-utils": "^0.2.23",
     "hast-util-from-selector": "^2.0.1",
     "remark-directive": "^2.0.1"
   },

package/src/config.ts

@@ -3,6 +3,7 @@ import type { Site } from "astro-accelerator-utils/types/Site";
 const SITE: Site = {
 	owner: 'Steve Fenton',
 	url: 'https://astro.stevefenton.co.uk',
+	useTrailingUrlSlash: true,
 	feedUrl: '/articles/feed.xml',
 	title: 'Astro Accelerator',
 	description: 'An Astro quick start project.',

package/src/pages/articles/[page].astro

@@ -37,7 +37,7 @@ const _ = Lang(lang);
 const accelerator = new Accelerator(SITE);
 
 export async function getData() {
-  const sourcePosts = await Astro.glob('./**/*.md') as MarkdownInstance[];
+  const sourcePosts = await Astro.glob('./**/*.md', './**/*.mdx') as MarkdownInstance[];
   const posts = sourcePosts
     .filter(PostFiltering.isListable)
     .sort(PostOrdering.sortByPubDateDesc);
@@ -57,7 +57,7 @@ export async function getStaticPaths({ paginate }: any) {
 const pageLinks = accelerator.paging.links(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
 ---
 <Default frontmatter={ frontmatter } headings={ headings }>
-  <h2>{ _(Translations.articles.page_title).replace('{n}', page.currentPage.toString())}</h2>
+  <h2>{ _(Translations.articles.page_title).replace('{n}', page.currentPage.toString()) }</h2>
   <ArticleList lang={ lang } posts={ page.data } />
   <PagingLinks lang={ lang } page={ page } pageLinks={ pageLinks } />
 </Default>

package/src/pages/articles/feed.xml.ts

@@ -6,7 +6,7 @@ import { Accelerator, PostFiltering } from 'astro-accelerator-utils';
 
 async function getData() {
   //@ts-ignore
-  const allArticles = import.meta.glob('./**/*.md');
+  const allArticles = import.meta.glob('./**/*.md', './**/*.mdx');
 
   const accelerator = new Accelerator(SITE);
   
@@ -34,7 +34,7 @@ async function getData() {
     <entry>
       <title>${a.frontmatter.title ?? ''}</title>
       <link href="${ SITE.url + a.url }" />
-      <id>${ SITE.url + accelerator.urlFormatter.addSlashToAddress(a.url) }</id>
+      <id>${ SITE.url + accelerator.urlFormatter.formatAddress(a.url) }</id>
       <published>${ a.frontmatter.pubDate }</published>
       <updated>${ a.frontmatter.pubDate ?? a.frontmatter.pubDate }</updated>
       <summary>${ a.frontmatter.description ?? '' }</summary>

package/src/pages/authors/[author]/[page].astro

@@ -55,7 +55,7 @@ type AuthorData = {
 }
 
 export async function getData() {
-  const sourcePosts = await Astro.glob('../../**/*.md') satisfies MarkdownInstance[];
+  const sourcePosts = await Astro.glob(['../../**/*.md', '../../**/*.mdx']) satisfies MarkdownInstance[];
   const data: AuthorData = { posts: [], authors: []};
 
   data.posts = sourcePosts
@@ -98,7 +98,7 @@ const pageLinks = accelerator.paging.links(SITE.pageLinks, page.lastPage, page.c
 ---
 <Default frontmatter={ authorFrontmatter } headings={ headings }>
   <Fragment set:html={ authorText } />
-  <h2>{ _(Translations.articles.page_title).replace('{n}', page.currentPage.toString())}</h2>
+  <h2>{ _(Translations.articles.page_title).replace('{n}', page.currentPage.toString()) }</h2>
   <ArticleList lang={ lang } posts={ page.data } />
   <PagingLinks lang={ lang } page={ page } pageLinks={ pageLinks } />
 </Default>

package/src/pages/category/[category]/[page].astro

@@ -47,7 +47,7 @@ type CategoryData = {
 
 export async function getData() {
   // TODO: Replace with call to Posts.all()
-  const sourcePosts = await Astro.glob('../../**/*.md') as MarkdownInstance[];
+  const sourcePosts = await Astro.glob(['../../**/*.md', '../../**/*.mdx']) as MarkdownInstance[];
   
   const data: CategoryData = { posts: [], categories: []};
 

package/src/pages/report/missing-banner.astro

@@ -28,7 +28,7 @@ const pages = missingBanner.sort(PostOrdering.sortByPubDateDesc).slice(0, Math.m
             </thead>
         {pages.map(p => 
         <tr>
-            <td><a href={ accelerator.urlFormatter.addSlashToAddress(p.url) }>{ p.frontmatter.title }</a></td>
+            <td><a href={ accelerator.urlFormatter.formatAddress(p.url) }>{ p.frontmatter.title }</a></td>
             <td>{ p.frontmatter.pubDate }</td>
             <td>{ p.frontmatter.modDate }</td>
         </tr>

package/src/pages/report/missing-meta.astro

@@ -28,7 +28,7 @@ const pages = missingMeta.sort(PostOrdering.sortByPubDateDesc).slice(0, Math.min
             </thead>
         {pages.map(p => 
         <tr>
-            <td><a href={ accelerator.urlFormatter.addSlashToAddress(p.url) }>{ p.frontmatter.title }</a></td>
+            <td><a href={ accelerator.urlFormatter.formatAddress(p.url) }>{ p.frontmatter.title }</a></td>
             <td>{ p.frontmatter.pubDate }</td>
             <td>{ p.frontmatter.modDate }</td>
         </tr>

package/src/pages/report/missing-pubdate.astro

@@ -28,7 +28,7 @@ const pages = missingMeta.slice(0, Math.min(50, pageCount));
             </thead>
         {pages.map(p => 
         <tr>
-            <td><a href={ accelerator.urlFormatter.addSlashToAddress(p.url) }>{ p.frontmatter.title }</a></td>
+            <td><a href={ accelerator.urlFormatter.formatAddress(p.url) }>{ p.frontmatter.title }</a></td>
             <td>{ p.frontmatter.pubDate }</td>
             <td>{ p.frontmatter.modDate }</td>
         </tr>

package/src/pages/report/oldest-content.astro

@@ -29,7 +29,7 @@ const pages = allPages.sort(PostOrdering.sortByModDate).slice(0, Math.min(50, pa
         <tr>
             <td>
                 {PostFiltering.isListable(p) && (
-                    <a href={ accelerator.urlFormatter.addSlashToAddress(p.url) }>{ p.frontmatter.title }</a>
+                    <a href={ accelerator.urlFormatter.formatAddress(p.url) }>{ p.frontmatter.title }</a>
                 )}
                 {PostFiltering.isListable(p) == false && (
                     <span>{ p.frontmatter.title }</span>

package/src/pages/search.json.ts

@@ -6,7 +6,7 @@ import { SITE } from '@config';
 
 const getData = async () => {
     //@ts-ignore
-    const allPages = import.meta.glob('./**/*.md');
+    const allPages = import.meta.glob(['./**/*.md'), './**/*.mdx')]);
     const items = [];
 
     const accelerator = new Accelerator(SITE);
@@ -34,7 +34,7 @@ const getData = async () => {
             }),
             description: page.frontmatter.description ?? '',
             tags: page.frontmatter.tags ?? [],
-            url: SITE.url + accelerator.urlFormatter.addSlashToAddress(url),
+            url: SITE.url + accelerator.urlFormatter.formatAddress(url),
             date: page.frontmatter.pubDate ?? ''
         });
     }

package/src/pages/sitemap.xml.ts

@@ -6,7 +6,7 @@ import { PostFiltering, Accelerator } from 'astro-accelerator-utils';
 
 async function getData() {
   //@ts-ignore
-  const allPages = import.meta.glob('./**/*.md');
+  const allPages = import.meta.glob('./**/*.md', './**/*.mdx');
   
   const accelerator = new Accelerator(SITE);
   let pages = [];
@@ -15,7 +15,7 @@ async function getData() {
     const article: any = await allPages[path]();
     const addToSitemap = PostFiltering.showInSitemap(article);
 
-    let url = accelerator.urlFormatter.addSlashToAddress(article.url);
+    let url = accelerator.urlFormatter.formatAddress(article.url);
 
     if (article.frontmatter.layout == 'src/layouts/Author.astro') {
       url += '1/';

package/src/pages/tag/[tag]/[page].astro

@@ -46,7 +46,7 @@ type CacheData = {
 }
 
 export async function getData() {
-  const sourcePosts = await Astro.glob('../../**/*.md') satisfies MarkdownInstance[];
+  const sourcePosts = await Astro.glob(['../../**/*.md', '../../**/*.mdx']) satisfies MarkdownInstance[];
     
   const data: CacheData = { posts: [], tags: []};
 
@@ -113,7 +113,7 @@ if (page.url.current != pageLinks[0].url) {
 }
 ---
 <Default frontmatter={ frontmatter } headings={ headings } breadcrumbs={ breadcrumbs }>
-  <h2>{ _(Translations.articles.page_title).replace('{n}', page.currentPage.toString())}</h2>
+  <h2>{ _(Translations.articles.page_title).replace('{n}', page.currentPage.toString()) }</h2>
   <ArticleList lang={ lang } posts={ page.data } />
   <PagingLinks lang={ lang } page={ page } pageLinks={ pageLinks } />
 </Default>

package/src/themes/accelerator/components/ArticleList.astro

@@ -59,7 +59,7 @@ function getLoadingAttribute() {
 ---
 <ul class="post-list anim-show-parent">
   {articles.map((post) => (
-  <li class="list-item" data-destination={ accelerator.urlFormatter.addSlashToAddress(post.url) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
+  <li class="list-item" data-destination={ accelerator.urlFormatter.formatAddress(post.url) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
     <article>
       <div class="list-item-image">
       {post.img && (
@@ -76,7 +76,7 @@ function getLoadingAttribute() {
       </div>
       <div class="list-item-content">
         <h3>
-          <a href={ accelerator.urlFormatter.addSlashToAddress(post.url) }>{ post.title }</a>
+          <a href={ accelerator.urlFormatter.formatAddress(post.url) }>{ post.title }</a>
         </h3>
         <AuthorsMini lang={ lang } frontmatter={ post.frontmatter satisfies Frontmatter } />
       </div>

package/src/themes/accelerator/components/Authors.astro

@@ -41,9 +41,9 @@ const authorImage = authorList?.image?.src
   <div class="author-info">
     <span class="author-list">{ _(Translations.post.written_by) }
       {authorList.mainAuthor &&
-        <span itemprop="author" itemscope itemtype="https://schema.org/Person"><a href={ accelerator.urlFormatter.addSlashToAddress(authorList.mainAuthor.url) + '1/' } itemprop="url"><span itemprop="name">{ authorList.mainAuthor.frontmatter.title }</span></a></span>
+        <span itemprop="author" itemscope itemtype="https://schema.org/Person"><a href={ accelerator.urlFormatter.formatAddress(authorList.mainAuthor.url) + '1/' } itemprop="url"><span itemprop="name">{ authorList.mainAuthor.frontmatter.title }</span></a></span>
       }{authorList.contributors.map((writer) => (
-        <span>, </span><span itemprop="contributor" itemscope itemtype="https://schema.org/Person"><a href={ accelerator.urlFormatter.addSlashToAddress(writer.url) + '1/' } itemprop="url"><span itemprop="name">{ writer.frontmatter.title }</span></a></span>
+        <span>, </span><span itemprop="contributor" itemscope itemtype="https://schema.org/Person"><a href={ accelerator.urlFormatter.formatAddress(writer.url) + '1/' } itemprop="url"><span itemprop="name">{ writer.frontmatter.title }</span></a></span>
       ))}
       <br /><time datetime={ frontmatter.pubDate.toString() } itemprop="datePublished">
       { accelerator.dateFormatter.formatDate(frontmatter.pubDate, lang) }

package/src/themes/accelerator/components/Breadcrumbs.astro

@@ -28,13 +28,13 @@ let metaIndex = navPages.length;
     {navPages.map((page, index) => (
     <li property="itemListElement" typeof="ListItem">
       <meta property="position" content={ index.toString() } />
-      <a property="item" typeof="WebPage" href={ accelerator.urlFormatter.addSlashToAddress(page.url) } aria-current={ page.ariaCurrent } rel={ page.rel }><span property="name">{ page.title }</span></a>
+      <a property="item" typeof="WebPage" href={ accelerator.urlFormatter.formatAddress(page.url) } aria-current={ page.ariaCurrent } rel={ page.rel }><span property="name">{ page.title }</span></a>
     </li>
     ))}
     {breadcrumbs && breadcrumbs.map( (crumb) => (
     <li property="itemListElement" typeof="ListItem">
       <meta property="position" content={ (metaIndex++).toString() } />
-      <a property="item" typeof="WebPage" href={ accelerator.urlFormatter.addSlashToAddress(crumb.url) } aria-current={ crumb.ariaCurrent }><span property="name">{ crumb.title }</span></a>
+      <a property="item" typeof="WebPage" href={ accelerator.urlFormatter.formatAddress(crumb.url) } aria-current={ crumb.ariaCurrent }><span property="name">{ crumb.title }</span></a>
     </li>
     ))}
   </ol>

package/src/themes/accelerator/components/Header.astro

@@ -31,7 +31,7 @@ const search = accelerator.posts.all().filter(PostFiltering.isSearch).shift() ??
   </svg></a>
   <a href={ (SITE.subfolder ?? '') + '/' } class="site-title" translate="no">{ SITE.title }</a>
   {search != null &&
-  <a href={ accelerator.urlFormatter.addSlashToAddress(search.url) } class="search-icon" title={ _(Translations.header.open_search) }><svg xmlns="http://www.w3.org/2000/svg" 
+  <a href={ accelerator.urlFormatter.formatAddress(search.url) } class="search-icon" title={ _(Translations.header.open_search) }><svg xmlns="http://www.w3.org/2000/svg" 
     width="40" height="40" viewBox="0 0 24 24" stroke-width="1" 
     fill="none" stroke-linecap="round" stroke-linejoin="round">
     <path stroke="none" d="M0 0h24v24H0z" fill="none"/>

package/src/themes/accelerator/components/HtmlHead.astro

@@ -18,7 +18,7 @@ const imageSrc = frontmatter.bannerImage?.src ?? OPEN_GRAPH.image.src;
 const imageAlt = frontmatter.bannerImage?.alt ?? OPEN_GRAPH.image.alt;
 const robots = frontmatter.robots ?? 'index, follow';
 const canonicalImageSrc = new URL(imageSrc, Astro.site);
-const canonicalURL =  accelerator.urlFormatter.addSlashToUrl(new URL(Astro.url.pathname, Astro.site + SITE.subfolder));
+const canonicalURL =  accelerator.urlFormatter.formatUrl(new URL(Astro.url.pathname, Astro.site + SITE.subfolder));
 const socialTitle = await accelerator.markdown.getTextFrom(frontmatter.title);
 const title = `${ socialTitle } ${ ((frontmatter.titleAdditional) ? ` ${frontmatter.titleAdditional}` : '') } | ${ SITE.title }`;
 ---

package/src/themes/accelerator/components/NavigationItem.astro

@@ -15,7 +15,7 @@ const accelerator = new Accelerator(SITE);
 ---
 {(page.children.length == 0) && (
 <li>
-  <a href={ accelerator.urlFormatter.addSlashToAddress(page.url) } aria-current={ page.ariaCurrent } rel={ page.rel }>{ page.title }</a>
+  <a href={ accelerator.urlFormatter.formatAddress(page.url) } aria-current={ page.ariaCurrent } rel={ page.rel }>{ page.title }</a>
 </li>
 )}
 {(page.children.length > 0) && (

package/src/themes/accelerator/components/PagingLinks.astro

@@ -21,12 +21,12 @@ const accelerator = new Accelerator(SITE);
 ---
 <nav class="post-paging" aria-label={ _(Translations.aria.paging) }>
   {page.url.prev
-    ? <a href={ accelerator.urlFormatter.addSlashToAddress(page.url.prev) }>{ _(Translations.articles.previous) }</a>
+    ? <a href={ accelerator.urlFormatter.formatAddress(page.url.prev) }>{ _(Translations.articles.previous) }</a>
     : <span>{ _(Translations.articles.previous) }</span>}
   {pageLinks.map((link) => (
-      <a href={ accelerator.urlFormatter.addSlashToAddress(link.url) } aria-current={ link.ariaCurrent } class={ link.class }>{ link.title }</a>
+      <a href={ accelerator.urlFormatter.formatAddress(link.url) } aria-current={ link.ariaCurrent } class={ link.class }>{ link.title }</a>
   ))}
   {page.url.next
-    ? <a href={ accelerator.urlFormatter.addSlashToAddress(page.url.next) }>{ _(Translations.articles.next) }</a>
+    ? <a href={ accelerator.urlFormatter.formatAddress(page.url.next) }>{ _(Translations.articles.next) }</a>
     : <span>{ _(Translations.articles.next) }</span>}
   </nav>

package/src/themes/accelerator/components/Related.astro

@@ -55,7 +55,7 @@ const articles = relatedPosts.map(p => {
 {articles.length > 0 &&
 <ul class="post-list anim-show-parent">
   {articles.map((post) => (
-  <li class="list-item" data-destination={ accelerator.urlFormatter.addSlashToAddress(post.url) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
+  <li class="list-item" data-destination={ accelerator.urlFormatter.formatAddress(post.url) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
     <article>
       <div class="list-item-image">
       {post.img && (
@@ -72,7 +72,7 @@ const articles = relatedPosts.map(p => {
       </div>
       <div class="list-item-content">
         <h3>
-          <a href={ accelerator.urlFormatter.addSlashToAddress(post.url) }>{ post.frontmatter.title }</a>
+          <a href={ accelerator.urlFormatter.formatAddress(post.url) }>{ post.frontmatter.title }</a>
         </h3>
         <AuthorsMini lang={ lang } frontmatter={ post.frontmatter satisfies Frontmatter } />
       </div>

package/src/themes/accelerator/components/TableOfContents.astro

@@ -1,6 +1,8 @@
 ---
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
+import { SITE } from '@config';
 import { Translations, Lang } from '@util/Languages';
+import { Accelerator } from 'astro-accelerator-utils';
 
 // Properties
 type Props = {

package/src/themes/accelerator/layouts/Author.astro

@@ -16,7 +16,7 @@ const lang = frontmatter.lang ?? SITE.default.lang;
 const accelerator = new Accelerator(SITE);
 const redirectFrontmatter = { 
     ...frontmatter,
-    redirect: accelerator.urlFormatter.addSlashToAddress(Astro.request.url) + '1/'
+    redirect: accelerator.urlFormatter.formatAddress(Astro.request.url) + '1/'
 };
 ---
 <Redirect frontmatter={ redirectFrontmatter } headings={ headings } />

package/src/themes/accelerator/layouts/Default.astro

@@ -22,6 +22,8 @@ type Props = {
 }
 const { frontmatter, headings, breadcrumbs } = Astro.props satisfies Props;
 
+console.log(headings);
+
 const lang = frontmatter.lang ?? SITE.default.lang;
 const textDirection = frontmatter.dir ?? SITE.default.dir;