@levino/shipyard-blog 0.4.1 → 0.4.2

package/astro/BlogEntry.astro

@@ -1,19 +1,32 @@
 ---
 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 getParams = (slug: string) => {
-    const [locale, ...rest] = slug.split('/')
-    return {
-      slug: rest.join('/'),
-      locale,
+  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 [locale, ...rest] = slug.split('/')
+      return {
+        slug: rest.join('/'),
+        locale,
+      }
+    } else {
+      // For non-i18n, treat the entire slug as the path
+      return {
+        slug: slug,
+      }
     }
   }
-  const blogPosts = await getCollection('blog')
+
   return blogPosts.map((entry) => ({
-    params: getParams(entry.id),
+    params: getParams(entry.id, hasI18n),
     props: { entry },
   }))
 }

package/astro/BlogIndex.astro

@@ -4,33 +4,52 @@ import config from 'virtual:shipyard/config'
 import type { GetStaticPaths } from 'astro'
 import Layout from './Layout.astro'
 
-export const getStaticPaths = (() =>
-  config.i18n.locales.map((locale) => {
-    if (typeof locale !== 'string') {
-      throw new Error('Shipyard does only support strings as locales.')
-    }
-    return {
-      params: {
-        locale,
-      },
-    }
-  })) satisfies GetStaticPaths
+export const getStaticPaths = (() => {
+  if (config.i18n) {
+    return config.i18n.locales.map((locale) => {
+      if (typeof locale !== 'string') {
+        throw new Error('Shipyard does only support strings as locales.')
+      }
+      return {
+        params: {
+          locale,
+        },
+      }
+    })
+  } else {
+    // For non-i18n, return a single path without locale
+    return [{ params: {} }]
+  }
+}) satisfies GetStaticPaths
 
 const { locale } = Astro.params
 
-const entries = 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()),
-)
+const entries = await getCollection('blog').then((posts) => {
+  if (config.i18n && locale) {
+    // With i18n: filter by locale
+    return posts
+      .filter(({ id }) => {
+        const [postLocale] = id.split('/')
+        return postLocale === locale
+      })
+      .toSorted((a, b) => b.data.date.getTime() - a.data.date.getTime())
+  } else {
+    // Without i18n: return all posts
+    return posts.toSorted(
+      (a, b) => b.data.date.getTime() - a.data.date.getTime(),
+    )
+  }
+})
 
-const getBlogPostLink = (id: string, locale: string) =>
-  id.replace(`${locale}/`, `${locale}/blog/`)
+const getBlogPostLink = (id: string, locale?: string) => {
+  if (config.i18n && locale) {
+    return id.replace(`${locale}/`, `${locale}/blog/`)
+  } else {
+    return `blog/${id}`
+  }
+}
 
-const formatDate = new Intl.DateTimeFormat(locale).format
+const formatDate = new Intl.DateTimeFormat(locale || 'en').format
 ---
 
 <Layout title="Blog">

package/package.json

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

package/src/index.ts

@@ -10,16 +10,29 @@ export const blogSchema = z.object({
 export default (blogPaths: string[]): AstroIntegration => ({
   name: 'shipyard-blog',
   hooks: {
-    'astro:config:setup': ({ injectRoute }) => {
+    'astro:config:setup': ({ injectRoute, config }) => {
       blogPaths.forEach((path) => {
-        injectRoute({
-          pattern: `/[locale]/${path}`,
-          entrypoint: `@levino/shipyard-blog/astro/BlogIndex.astro`,
-        })
-        injectRoute({
-          pattern: `/[locale]/${path}/[...slug]`,
-          entrypoint: `@levino/shipyard-blog/astro/BlogEntry.astro`,
-        })
+        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`,
+          })
+        }
       })
     },
   },