Astro 5 Update

tordans · tordans · commit 57a20d164edd · 2024-12-06T09:05:23.000+01:00
Streamline config with FMC Projects and osm-berlin.
Small content changes that where also applied to osm-berlin.
diff --git a/keystatic/campaignsKeystatic.ts b/keystatic/campaignsKeystatic.ts
@@ -1,5 +1,5 @@
 import { collection, fields } from '@keystatic/core'
-import { mdxComponentsKeystatic } from './mdxComponents'
+import { mdxComponentsKeystatic } from './components/mdxComponentsKeystatic'
 import { authorsSelect } from './utils/authorsSelect'
 import { languagesSelect } from './utils/languagesSelect'
 import { projectsSelect } from './utils/projectsSelect'
diff --git a/keystatic/components/mdxComponentsAstro.astro b/keystatic/components/mdxComponentsAstro.astro
@@ -0,0 +1,7 @@
+---
+import Callout from '@components/text/Callout.astro'
+import Image from '@components/text/Image.astro'
+import Video from '@components/text/Video.astro'
+
+export const mdxComponentsAstro = { Video, Callout, Image }
+---
diff --git a/keystatic/components/mdxComponentsKeystatic.ts b/keystatic/components/mdxComponentsKeystatic.ts
@@ -1,14 +1,9 @@
-import Callout from '@components/text/Callout.astro'
 import { CalloutKeystatic } from '@components/text/Callout.keystatic'
-import Image from '@components/text/Image.astro'
 import { ImageKeystatic } from '@components/text/Image.keystatic'
-import Video from '@components/text/Video.astro'
 import { VideoKeystatic } from '@components/text/Video.keystatic'
 
 export const mdxComponentsKeystatic = {
   Video: VideoKeystatic,
   Callout: CalloutKeystatic,
   Image: ImageKeystatic,
 }
-
-export const mdxComponentsAstro = { Video, Callout, Image }
diff --git a/keystatic/postsKeystatic.ts b/keystatic/postsKeystatic.ts
@@ -1,5 +1,5 @@
 import { collection, fields } from '@keystatic/core'
-import { mdxComponentsKeystatic } from './mdxComponents'
+import { mdxComponentsKeystatic } from './components/mdxComponentsKeystatic'
 import { authorsSelect } from './utils/authorsSelect'
 import { languagesSelect } from './utils/languagesSelect'
 import { projectsSelect } from './utils/projectsSelect'
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,7 +51,6 @@
     "@keystatic/core": "^0.5.42",
     "@nanostores/react": "^0.8.2",
     "@nanostores/router": "^0.16.1",
-    "@total-typescript/ts-reset": "^0.6.1",
     "@turf/turf": "^7.1.0",
     "@types/geojson": "^7946.0.14",
     "astro": "^5.0.2",
@@ -71,6 +70,7 @@
     "typescript": "^5.7.2"
   },
   "devDependencies": {
+    "@total-typescript/ts-reset": "^0.6.1",
     "@tailwindcss/forms": "^0.5.9",
     "@tailwindcss/typography": "^0.5.15",
     "@types/bun": "^1.1.14",
diff --git a/src/components/text/Card.astro b/src/components/text/Card.astro
@@ -29,12 +29,13 @@ const { href, external, text, alt, image, variant } = Astro.props
         densities={[1.5, 2]}
         formats={['png', 'avif']}
         class="m-0 max-h-40 w-full overflow-clip rounded-t border border-gray-100 object-cover"
+        pictureAttributes={{ class: 'not-prose w-full' }}
         alt=""
       />
     ) : (
       <div
         class={twJoin(
-          variant === 'iconImageGrid' ? 'h-40 w-full border-b border-gray-50' : 'pb-2 pt-5',
+          variant === 'iconImageGrid' ? 'h-40 w-full border-b border-gray-50' : 'pt-5',
           'm-0 flex items-center justify-center',
         )}
       >
diff --git a/src/components/text/ProseSection.astro b/src/components/text/ProseSection.astro
@@ -14,10 +14,9 @@ const { id, highlight, classes } = Astro.props
 <section
   id={id}
   class={twMerge(
-    'group relative mb-20 rounded leading-normal',
+    'group relative mb-20 rounded',
     'prose prose-lg prose-blue max-w-prose',
     'prose-headings:mb-5 prose-headings:text-sky-700 prose-headings:first:mt-0',
-    'prose-p:m-0',
     highlight ? 'bg-emerald-100 p-4' : '',
     id ? 'target:bg-purple-100' : '',
     classes,
diff --git a/src/env.d.ts b/src/env.d.ts
diff --git a/src/pages/benches/posts/[...slug].astro b/src/pages/benches/posts/[...slug].astro
@@ -1,7 +1,9 @@
 ---
+export const prerender = true
+
 import LayoutArticlePost from '@layouts/LayoutArticlePost.astro'
 import { type CollectionEntry, getCollection, render } from 'astro:content'
-import { mdxComponentsAstro } from 'keystatic/mdxComponents'
+import { mdxComponentsAstro } from 'keystatic/components/mdxComponentsAstro.astro'
 
 export async function getStaticPaths() {
   const project = 'benches' // REMINDER: this needs to be change for each project and added to `src/projectsConfig.const.ts`
diff --git a/src/pages/bicycle-parking/posts/[...slug].astro b/src/pages/bicycle-parking/posts/[...slug].astro
@@ -1,7 +1,9 @@
 ---
+export const prerender = true
+
 import LayoutArticlePost from '@layouts/LayoutArticlePost.astro'
 import { getCollection, render, type CollectionEntry } from 'astro:content'
-import { mdxComponentsAstro } from 'keystatic/mdxComponents'
+import { mdxComponentsAstro } from 'keystatic/components/mdxComponentsAstro.astro'
 
 export async function getStaticPaths() {
   const project = 'bicycle-parking' // REMINDER: this needs to be change for each project and added to `src/projectsConfig.const.ts`
diff --git a/src/pages/cqi/posts/[...slug].astro b/src/pages/cqi/posts/[...slug].astro
@@ -1,7 +1,9 @@
 ---
+export const prerender = true
+
 import LayoutArticlePost from '@layouts/LayoutArticlePost.astro'
 import { type CollectionEntry, getCollection, render } from 'astro:content'
-import { mdxComponentsAstro } from 'keystatic/mdxComponents'
+import { mdxComponentsAstro } from 'keystatic/components/mdxComponentsAstro.astro'
 
 export async function getStaticPaths() {
   const project = 'cqi' // REMINDER: this needs to be change for each project
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -97,7 +97,7 @@ const showcaseProjects = projects
     <p class="my-0 sm:col-span-2">
       Die Projekte der OSM Berlin Gruppe könnten euch auch interessieren:
     </p>
-    <Card external href="https://www.osm-berlin.org" text="OSM Berlin Projekte" variant="iconGrid">
+    <Card external href="https://www.osm-berlin.org" text="OSM Berlin Projekte" alt="">
       <QueueList class="size-10" />
     </Card>
   </CardWrapper>
diff --git a/src/pages/mapillary/posts/[...slug].astro b/src/pages/mapillary/posts/[...slug].astro
@@ -1,7 +1,9 @@
 ---
+export const prerender = true
+
 import LayoutArticlePost from '@layouts/LayoutArticlePost.astro'
 import { type CollectionEntry, getCollection, render } from 'astro:content'
-import { mdxComponentsAstro } from 'keystatic/mdxComponents'
+import { mdxComponentsAstro } from 'keystatic/components/mdxComponentsAstro.astro'
 
 export async function getStaticPaths() {
   const project = 'mapillary' // REMINDER: this needs to be change for each project and added to `src/projectsConfig.const.ts`
diff --git a/src/pages/parking/posts/[...slug].astro b/src/pages/parking/posts/[...slug].astro
@@ -1,7 +1,9 @@
 ---
+export const prerender = true
+
 import LayoutArticlePost from '@layouts/LayoutArticlePost.astro'
 import { type CollectionEntry, getCollection, render } from 'astro:content'
-import { mdxComponentsAstro } from 'keystatic/mdxComponents'
+import { mdxComponentsAstro } from 'keystatic/components/mdxComponentsAstro.astro'
 
 export async function getStaticPaths() {
   const project = 'parking' // REMINDER: this needs to be change for each project and added to `src/projectsConfig.const.ts`
diff --git a/src/pages/root/posts/[...slug].astro b/src/pages/root/posts/[...slug].astro
@@ -1,7 +1,9 @@
 ---
+export const prerender = true
+
 import LayoutArticlePost from '@layouts/LayoutArticlePost.astro'
 import { type CollectionEntry, getCollection, render } from 'astro:content'
-import { mdxComponentsAstro } from 'keystatic/mdxComponents'
+import { mdxComponentsAstro } from 'keystatic/components/mdxComponentsAstro.astro'
 
 export async function getStaticPaths() {
   const project = 'root' // REMINDER: this needs to be change for each project and added to `src/projectsConfig.const.ts`
diff --git a/src/pages/traffic-signs/campaigns/[...slug].astro b/src/pages/traffic-signs/campaigns/[...slug].astro
@@ -1,4 +1,6 @@
 ---
+export const prerender = true
+
 import { maprouletteChallengeUrl } from '@components/campaigns/maprouletteChallengeUrl'
 import MegaButton from '@components/Link/MegaButton.astro'
 import LayoutArticlePost from '@layouts/LayoutArticlePost.astro'
diff --git a/src/pages/traffic-signs/posts/[...slug].astro b/src/pages/traffic-signs/posts/[...slug].astro
@@ -1,7 +1,9 @@
 ---
+export const prerender = true
+
 import LayoutArticlePost from '@layouts/LayoutArticlePost.astro'
 import { type CollectionEntry, getCollection, render } from 'astro:content'
-import { mdxComponentsAstro } from 'keystatic/mdxComponents'
+import { mdxComponentsAstro } from 'keystatic/components/mdxComponentsAstro.astro'
 
 export async function getStaticPaths() {
   const project = 'traffic-signs' // REMINDER: this needs to be change for each project and added to `src/projectsConfig.const.ts`
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,20 +1,23 @@
 {
-  "extends": "astro/tsconfigs/strictest",
+  "extends": "astro/tsconfigs/strict",
   "compilerOptions": {
     "jsx": "react-jsx",
     "jsxImportSource": "react",
+    "plugins": [
+      {
+        // https://docs.astro.build/en/guides/typescript/#setup
+        "name": "@astrojs/ts-plugin"
+      }
+    ],
+    "verbatimModuleSyntax": true,
     "baseUrl": ".",
-    "strictNullChecks": true, // https://docs.astro.build/de/guides/content-collections/#setting-up-typescript
     "paths": {
-      "@data/*": ["data/*"],
       "@assets/*": ["src/assets/*"],
       "@components/*": ["src/components/*"],
       "@layouts/*": ["src/layouts/*"]
     },
-    "plugins": [
-      // https://docs.astro.build/en/guides/typescript/#setup
-      { "name": "@astrojs/ts-plugin" }
-    ]
+    "noErrorTruncation": true // https://stackoverflow.com/a/53131824
   },
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }
