Merge pull request #92 from prototypa/astro2

Minimal changes for migration to Astro v2

.editorconfig

@@ -1,15 +0,0 @@
-# https://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_size = 2
-indent_style = tab
-insert_final_newline = true
-trim_trailing_whitespace = false
-
-[{.*,*.md,*.json,*.toml,*.yml,}]
-indent_style = space

.gitignore

@@ -22,4 +22,4 @@ pnpm-debug.log*
 package-lock.json
 pnpm-lock.yaml
 
-src/content/types.generated.d.ts
+.astro

astro.config.mjs

@@ -58,7 +58,6 @@ export default defineConfig({
 
   markdown: {
     remarkPlugins: [remarkReadingTime],
-    extendDefaultPlugins: true,
   },
 
   vite: {
@@ -68,8 +67,4 @@ export default defineConfig({
       },
     },
   },
-
-  experimental: {
-    contentCollections: true,
-  },
 });

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@onwidget/astrowind",
   "description": "A template to make your website using Astro + Tailwind CSS.",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "private": true,
   "scripts": {
     "dev": "astro dev",
@@ -14,23 +14,23 @@
     "subfont": "subfont -ir --no-fallbacks --silent --root dist"
   },
   "devDependencies": {
-    "@astrojs/image": "^0.12.1",
+    "@astrojs/image": "^1.0.0-beta.2",
-    "@astrojs/mdx": "^0.14.0",
+    "@astrojs/mdx": "^1.0.0-beta.2",
-    "@astrojs/partytown": "^1.0.2",
+    "@astrojs/partytown": "^1.0.3-beta.0",
     "@astrojs/rss": "^2.0.0",
     "@astrojs/sitemap": "^1.0.0",
-    "@astrojs/tailwind": "^2.1.3",
+    "@astrojs/tailwind": "^3.0.0-beta.1",
     "@astrolib/analytics": "^0.3.0",
     "@astrolib/seo": "^0.3.0",
     "@fontsource/inter": "^4.5.15",
     "@tailwindcss/typography": "^0.5.9",
     "@typescript-eslint/eslint-plugin": "^5.48.2",
     "@typescript-eslint/parser": "^5.48.2",
-    "astro": "^1.9.2",
+    "astro": "^2.0.0-beta.3",
-    "astro-compress": "1.1.27",
+    "astro-compress": "1.1.28",
     "astro-icon": "^0.8.0",
     "eslint": "^8.32.0",
-    "eslint-plugin-astro": "^0.22.0",
+    "eslint-plugin-astro": "^0.23.0",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "limax": "^2.1.0",
     "mdast-util-to-string": "^3.1.0",

public/_headers

@@ -1,2 +1,2 @@
-/assets/*
+/_astro/*
   Cache-Control: public, max-age=31536000, immutable

src/content/config.ts

@@ -1,7 +1,7 @@
 import { z, defineCollection } from 'astro:content';
 
 const blog = defineCollection({
-  schema: {
+  schema: z.object({
     title: z.string(),
     description: z.string().optional(),
     image: z.string().optional(),
@@ -16,7 +16,7 @@ const blog = defineCollection({
     category: z.string().optional(),
     tags: z.array(z.string()).optional(),
     author: z.string().optional(),
-  },
+  }),
   slug: ({ defaultSlug, data }) => {
     return data.permalink || defaultSlug;
   },

src/env.d.ts

@@ -1 +1,2 @@
+/// <reference path="../.astro/types.d.ts" />
 /// <reference types="@astrojs/image/client" />

src/utils/blog.ts

@@ -1,11 +1,11 @@
-import { getCollection, getEntry } from 'astro:content';
+import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import type { Post } from '~/types';
 import { cleanSlug } from './permalinks';
 
 const getNormalizedPost = async (post: CollectionEntry<'blog'>): Promise<Post> => {
   const { id, slug = '', data } = post;
-  const { Content, injectedFrontmatter } = await post.render();
+  const { Content, remarkPluginFrontmatter } = await post.render();
 
   const { tags = [], category = 'default', author = 'Anonymous', publishDate = new Date(), ...rest } = data;
 
@@ -23,7 +23,7 @@ const getNormalizedPost = async (post: CollectionEntry<'blog'>): Promise<Post> =
     Content: Content,
     // or 'body' in case you consume from API
 
-    readingTime: injectedFrontmatter.readingTime,
+    readingTime: remarkPluginFrontmatter?.readingTime,
   };
 };
 
@@ -67,12 +67,14 @@ export const findPostsBySlugs = async (slugs: Array<string>): Promise<Array<Post
 export const findPostsByIds = async (ids: Array<string>): Promise<Array<Post>> => {
   if (!Array.isArray(ids)) return [];
 
-  return await Promise.all(
+  const posts = await fetchPosts();
-    ids.map(async (id: never) => {
+
-      const post = await getEntry('blog', id);
+  return ids.reduce(function (r: Array<Post>, id: string) {
-      return await getNormalizedPost(post);
+    posts.some(function (post: Post) {
-    })
+      return id === post.id && r.push(post);
-  );
+    });
+    return r;
+  }, []);
 };
 
 /** */

src/utils/frontmatter.mjs

@@ -2,10 +2,11 @@ import getReadingTime from 'reading-time';
 import { toString } from 'mdast-util-to-string';
 
 export function remarkReadingTime() {
-  return function (tree, { data }) {
+  return function (tree, file) {
     const text = toString(tree);
     const readingTime = Math.ceil(getReadingTime(text).minutes);
 
-    data.astro.frontmatter.readingTime = readingTime;
+    const { frontmatter } = file.data.astro;
+    frontmatter.readingTime = readingTime;
   };
 }

vercel.json

@@ -3,7 +3,7 @@
   "trailingSlash": false,
   "headers": [
     {
-      "source": "/assets/(.*)",
+      "source": "/_astro/(.*)",
       "headers": [
         {
           "key": "Cache-Control",