Merge remote-tracking branch 'origin/master' into fohte/runok

Author: fohte

.gitattributes

@@ -1 +1,2 @@
 *.lockb binary diff=lockb
+*.pen linguist-generated -diff

.github/workflows/deploy.yml

@@ -46,29 +46,25 @@ jobs:
       - name: Install dependencies
         run: bun install --frozen-lockfile
 
-      - name: Cache Next.js build
+      - name: Cache Astro build
         uses: actions/cache@v4
         with:
-          path: |
-            .next/cache
-            .contentlayer/.cache
-          key: ${{ runner.os }}-nextjs-${{ hashFiles('bun.lock') }}-${{ hashFiles('src/**', 'contents/**', 'contentlayer.config.ts', 'next.config.js', '!node_modules/**/*') }}
+          path: .astro
+          key: ${{ runner.os }}-astro-${{ hashFiles('bun.lock') }}-${{ hashFiles('src/**', 'astro.config.mjs', '!node_modules/**/*') }}
           restore-keys: |
-            ${{ runner.os }}-nextjs-${{ hashFiles('bun.lock') }}-
-            ${{ runner.os }}-nextjs-
+            ${{ runner.os }}-astro-${{ hashFiles('bun.lock') }}-
+            ${{ runner.os }}-astro-
 
       - name: Build
         run: bun run build
-        env:
-          NEXT_PUBLIC_APP_ENV: ${{ github.ref == 'refs/heads/master' && 'production' || 'preview' }}
 
       - name: Deploy to Cloudflare Pages
         id: cloudflare-deployment
         uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: pages deploy ./out --project-name=fohte-net
+          command: pages deploy ./dist --project-name=fohte-net
 
       - name: Extract deployment URLs
         if: github.ref != 'refs/heads/master'

.github/workflows/test.yml

@@ -40,15 +40,6 @@ jobs:
 
       - run: bun install --frozen-lockfile
 
-      - name: Install Playwright browsers
-        run: bunx playwright install chromium
-
-      - name: Cache Playwright browsers
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: ${{ runner.os }}-playwright-${{ hashFiles('bun.lock') }}
-
       - name: Cache pre-commit
         uses: actions/cache@v4
         with:
@@ -72,11 +63,5 @@ jobs:
           workflow: deny
           github_token: ${{ steps.app-token.outputs.token }}
 
-      - name: Run tests (without E2E)
+      - name: Run tests
         run: bun run test
-
-      - name: Run Percy E2E tests
-        run: bun run test:e2e
-        env:
-          NEXT_PUBLIC_APP_ENV: test
-          PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}

.gitignore

@@ -1,15 +1,11 @@
 node_modules
 .next
+dist/
+.astro/
 
 # Local Netlify folder
 .netlify
 
-# Ignore next-mdx-enhanced cache directory
-.mdx-data
-
-# contentlayer build output
-.contentlayer
-
 tsconfig.tsbuildinfo
 
 out/

.prettierrc.yml

@@ -2,3 +2,8 @@ trailingComma: all
 semi: false
 singleQuote: true
 proseWrap: preserve
+plugins:
+  - prettier-plugin-astro
+  # prettier-plugin-tailwindcss must be loaded last
+  # ref: https://github.com/tailwindlabs/prettier-plugin-tailwindcss?tab=readme-ov-file#compatibility-with-other-prettier-plugins
+  - prettier-plugin-tailwindcss

astro.config.mjs

@@ -0,0 +1,30 @@
+import mdx from '@astrojs/mdx'
+import react from '@astrojs/react'
+import tailwindcss from '@tailwindcss/vite'
+import { defineConfig } from 'astro/config'
+import embeds from 'astro-embed/integration'
+import icon from 'astro-icon'
+import remarkBreaks from 'remark-breaks'
+import remarkGfm from 'remark-gfm'
+import remarkUnwrapImages from 'remark-unwrap-images'
+
+export default defineConfig({
+  site: 'https://fohte.net',
+  integrations: [
+    react(),
+    embeds({
+      services: {
+        LinkPreview: false,
+      },
+    }),
+    mdx(),
+    icon(),
+  ],
+  markdown: {
+    remarkPlugins: [remarkGfm, remarkBreaks, remarkUnwrapImages],
+    syntaxHighlight: false,
+  },
+  vite: {
+    plugins: [tailwindcss()],
+  },
+})