Merge pull request #12 from nemanjam/feature/astro-v5

nemanjam · web-flow · commit 70298d203cec · 2024-12-21T18:10:12.000+01:00
Update to Astro v5
diff --git a/.astro/types.d.ts b/.astro/types.d.ts
@@ -1,3 +1,3 @@
 /// <reference types="astro/client" />
-/// <reference path="astro/content.d.ts" />
-/// <reference path="astro/env.d.ts" />
+/// <reference path="content.d.ts" />
+/// <reference path="env.d.ts" />
diff --git a/astro.config.ts b/astro.config.ts
@@ -19,8 +19,11 @@ const remarkPlugins = [remarkReadingTime];
 
 export default defineConfig({
   site: SITE_URL,
-  experimental: { env: envSchema },
   trailingSlash: 'ignore',
+  env: envSchema,
+  legacy: {
+    collections: true,
+  },
   // default
   compressHTML: true,
   server: { port: 3000 },
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -14,10 +14,6 @@ FROM base AS build
 COPY package.json yarn.lock ./
 RUN yarn install --frozen-lockfile
 
-# override sharp 0.32.6 with 0.33.3, fails without this
-RUN yarn remove sharp
-RUN yarn add --ignore-engines sharp@0.33.4
-
 COPY . .
 
 ARG ARG_SITE_URL_ARM64
diff --git a/docs/working-notes/todo4.md b/docs/working-notes/todo4.md
@@ -17,4 +17,16 @@ breadcrumbs
 
 gallery lazy load, blur, pagination on scroll
 
+
+git checkout -b feature/astro-v5
+
+------------
+astro v5
+// these 2 fail with react 19, unrelated to astro 5, gallery page fails
+"react-grid-gallery": "^1.0.1",
+"react-image-lightbox": "^5.1.4",
+
+migrate gallery to astro components
+migrate content collections to content layer, restructure folder with slug to contain images
+
 ```
diff --git a/package.json b/package.json
@@ -28,13 +28,13 @@
     "dc:up": "docker compose up --build --force-recreate -d"
   },
   "dependencies": {
-    "@astrojs/mdx": "^3.1.9",
+    "@astrojs/mdx": "^4.0.3",
     "@astrojs/partytown": "^2.1.2",
-    "@astrojs/react": "^3.6.3",
+    "@astrojs/react": "^4.1.2",
     "@astrojs/sitemap": "^3.2.1",
     "@astrojs/tailwind": "^5.1.2",
     "@fontsource-variable/inter": "^5.1.0",
-    "astro": "^4.16.16",
+    "astro": "^5.1.1",
     "astro-embed": "^0.9.0",
     "astro-expressive-code": "^0.38.3",
     "astro-icon": "^1.1.4",
@@ -55,7 +55,7 @@
     "react-grid-gallery": "^1.0.1",
     "react-image-lightbox": "^5.1.4",
     "reading-time": "^1.5.0",
-    "sharp": "0.32.6",
+    "sharp": "0.33.5",
     "tailwind-clip-path": "^1.0.0",
     "tailwind-merge": "^2.5.5",
     "zod": "^3.23.4"
@@ -85,9 +85,6 @@
     "tailwindcss": "^3.4.15",
     "typescript": "^5.7.2"
   },
-  "resolutions": {
-    "sharp": "0.32.6"
-  },
   "packageManager": "yarn@1.22.22",
   "engines": {
     "node": ">=v22.9.0"
diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro
@@ -2,7 +2,7 @@
 import '@fontsource-variable/inter/index.css';
 import '@/styles/main.css';
 
-import { ViewTransitions } from 'astro:transitions';
+import { ClientRouter } from 'astro:transitions';
 
 import ThemeScript from '@/components/ThemeScript.astro';
 import { DEFAULT_METADATA } from '@/constants/metadata';
@@ -122,13 +122,13 @@ const ogImageUrl = new URL(image, url);
   {/* MUST be inside <head /> to avoid white flash, IMPORTANT */}
   <ThemeScript />
 
-  <ViewTransitions fallback="none" />
+  <ClientRouter fallback="none" />
 
   <!-- 
     <style>
-      @view-transition {
-        navigation: auto; /* enabled! */
-      }
+    @view-transition {
+      navigation: auto; /* enabled! */
+    }
     </style> 
   -->
 </head>
diff --git a/tsconfig.json b/tsconfig.json
@@ -26,6 +26,6 @@
       "@/config/*": ["config/*"]
     }
   },
-  "include": ["**/*.ts", "**/*.tsx", "**/*.astro"],
+  "include": ["**/*.ts", "**/*.tsx", "**/*.astro", ".astro/types.d.ts"],
   "exclude": ["dist", "docs", "node_modules"]
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@`
`26`	`26`	`"@/config/": ["config/"]`
`27`	`27`	`}`
`28`	`28`	`},`
`29`		`- "include": ["*/.ts", "*/.tsx", "*/.astro"],`
	`29`	`+ "include": ["*/.ts", "*/.tsx", "*/.astro", ".astro/types.d.ts"],`
`30`	`30`	`"exclude": ["dist", "docs", "node_modules"]`
`31`	`31`	`}`