@levino/shipyard-blog 0.4.2 → 0.4.3

package/astro/BlogEntry.astro

@@ -1,17 +1,13 @@
 ---
+import { i18n } from 'astro:config/server'
 import { getCollection, render } from 'astro:content'
-import config from 'virtual:shipyard/config'
 import { TableOfContents } from '@levino/shipyard-base/components'
 import Layout from './Layout.astro'
 
 export const getStaticPaths = async () => {
   const blogPosts = await getCollection('blog')
-
-  // Check if i18n is configured using Shipyard's config
-  const hasI18n = Boolean(config.i18n)
-
-  const getParams = (slug: string, hasI18n: boolean) => {
-    if (hasI18n) {
+  const getParams = (slug: string) => {
+    if (i18n) {
       const [locale, ...rest] = slug.split('/')
       return {
         slug: rest.join('/'),
@@ -26,7 +22,7 @@ export const getStaticPaths = async () => {
   }
 
   return blogPosts.map((entry) => ({
-    params: getParams(entry.id, hasI18n),
+    params: getParams(entry.id),
     props: { entry },
   }))
 }

package/astro/BlogIndex.astro

@@ -1,12 +1,12 @@
 ---
+import { i18n } from 'astro:config/server'
 import { getCollection } from 'astro:content'
-import config from 'virtual:shipyard/config'
 import type { GetStaticPaths } from 'astro'
 import Layout from './Layout.astro'
 
 export const getStaticPaths = (() => {
-  if (config.i18n) {
-    return config.i18n.locales.map((locale) => {
+  if (i18n) {
+    return i18n.locales.map((locale) => {
       if (typeof locale !== 'string') {
         throw new Error('Shipyard does only support strings as locales.')
       }
@@ -22,15 +22,13 @@ export const getStaticPaths = (() => {
   }
 }) satisfies GetStaticPaths
 
-const { locale } = Astro.params
-
 const entries = await getCollection('blog').then((posts) => {
-  if (config.i18n && locale) {
+  if (i18n) {
     // With i18n: filter by locale
     return posts
       .filter(({ id }) => {
         const [postLocale] = id.split('/')
-        return postLocale === locale
+        return postLocale === Astro.currentLocale
       })
       .toSorted((a, b) => b.data.date.getTime() - a.data.date.getTime())
   } else {
@@ -42,21 +40,21 @@ const entries = await getCollection('blog').then((posts) => {
 })
 
 const getBlogPostLink = (id: string, locale?: string) => {
-  if (config.i18n && locale) {
+  if (i18n && locale) {
     return id.replace(`${locale}/`, `${locale}/blog/`)
   } else {
     return `blog/${id}`
   }
 }
 
-const formatDate = new Intl.DateTimeFormat(locale || 'en').format
+const formatDate = new Intl.DateTimeFormat(Astro.currentLocale || 'en').format
 ---
 
 <Layout title="Blog">
   <div class="mx-auto max-w-prose px-8">
     {
       entries.map(async (entry) => (
-        <a class="block my-8" href={`/${getBlogPostLink(entry.id, locale)}`}>
+        <a class="block my-8" href={`/${getBlogPostLink(entry.id, Astro.currentLocale)}`}>
           <div class="prose">
             <div class="text-sm">{formatDate(entry.data.date)}</div>
             <h2 class="my-0">{entry.data.title}</h2>

package/astro/Layout.astro

@@ -1,4 +1,5 @@
 ---
+import { i18n } from 'astro:config/server'
 import { getCollection } from 'astro:content'
 import type { NavigationTree } from '@levino/shipyard-base'
 import { Page as BaseLayout } from '@levino/shipyard-base/layouts'
@@ -9,21 +10,33 @@ type Props = {
 
 const locale = Astro.currentLocale
 const { title } = Astro.props
-const entry = await getCollection('blog').then((posts) =>
-  posts
-    .filter(({ id }) => {
-      const [postLocale] = id.split('/')
-      return postLocale === locale
-    })
-    .toSorted((a, b) => b.data.date.getTime() - a.data.date.getTime())
-    .reduce((acc, { id, data: { title } }, key) => {
-      acc[key] = {
-        href: `/${locale}/blog/${id.slice(3)}`,
-        label: title,
-      }
-      return acc
-    }, {} as NavigationTree),
-)
+const entry = await getCollection('blog').then((posts) => {
+  if (i18n) {
+    return posts
+      .filter(({ id }) => {
+        const [postLocale] = id.split('/')
+        return postLocale === locale
+      })
+      .toSorted((a, b) => b.data.date.getTime() - a.data.date.getTime())
+      .reduce((acc, { id, data: { title } }, key) => {
+        acc[key] = {
+          href: `/${locale}/blog/${id.slice(3)}`,
+          label: title,
+        }
+        return acc
+      }, {} as NavigationTree)
+  } else {
+    return posts
+      .toSorted((a, b) => b.data.date.getTime() - a.data.date.getTime())
+      .reduce((acc, { id, data: { title } }, key) => {
+        acc[key] = {
+          href: `/blog/${id}`,
+          label: title,
+        }
+        return acc
+      }, {} as NavigationTree)
+  }
+})
 ---
 
 <BaseLayout title={title} sidebarNavigation={entry}>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@levino/shipyard-blog",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "",
   "type": "module",
   "main": "src/index.ts",
@@ -17,7 +17,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@levino/shipyard-base": "^0.5.3"
+    "@levino/shipyard-base": "^0.5.4"
   },
   "peerDependencies": {
     "astro": "^5.7"

package/src/index.ts

@@ -7,33 +7,31 @@ export const blogSchema = z.object({
   description: z.string(),
 })
 
-export default (blogPaths: string[]): AstroIntegration => ({
+export default (): AstroIntegration => ({
   name: 'shipyard-blog',
   hooks: {
     'astro:config:setup': ({ injectRoute, config }) => {
-      blogPaths.forEach((path) => {
-        if (config.i18n) {
-          // With i18n: use locale prefix
-          injectRoute({
-            pattern: `/[locale]/${path}`,
-            entrypoint: `@levino/shipyard-blog/astro/BlogIndex.astro`,
-          })
-          injectRoute({
-            pattern: `/[locale]/${path}/[...slug]`,
-            entrypoint: `@levino/shipyard-blog/astro/BlogEntry.astro`,
-          })
-        } else {
-          // Without i18n: direct path
-          injectRoute({
-            pattern: `/${path}`,
-            entrypoint: `@levino/shipyard-blog/astro/BlogIndex.astro`,
-          })
-          injectRoute({
-            pattern: `/${path}/[...slug]`,
-            entrypoint: `@levino/shipyard-blog/astro/BlogEntry.astro`,
-          })
-        }
-      })
+      if (config.i18n) {
+        // With i18n: use locale prefix
+        injectRoute({
+          pattern: `/[locale]/blog`,
+          entrypoint: `@levino/shipyard-blog/astro/BlogIndex.astro`,
+        })
+        injectRoute({
+          pattern: `/[locale]/blog/[...slug]`,
+          entrypoint: `@levino/shipyard-blog/astro/BlogEntry.astro`,
+        })
+      } else {
+        // Without i18n: direct path
+        injectRoute({
+          pattern: `/blog`,
+          entrypoint: `@levino/shipyard-blog/astro/BlogIndex.astro`,
+        })
+        injectRoute({
+          pattern: `/blog/[...slug]`,
+          entrypoint: `@levino/shipyard-blog/astro/BlogEntry.astro`,
+        })
+      }
     },
   },
 })