Preview

.github/workflows/publish.yml → .github/workflows/deploy.yml

@@ -3,6 +3,7 @@ on:
     branches:
       - main
       - preview
+      - 'v*'
     paths-ignore: 
       - "*.md"
       - ".github/**/*.md"
@@ -13,10 +14,10 @@ jobs:
     permissions:
       contents: read
       deployments: write
-    name: Publish to Cloudflare Pages
+    name: Deploy
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
@@ -36,12 +37,10 @@ jobs:
       - name: Build
         run: pnpm run build
 
-      - name: Publish to Cloudflare Pages
-        uses: cloudflare/pages-action@v1
+      - name: Deploy
+        uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          projectName: web
-          directory: dist
+          command: pages deploy dist --project-name=web
           gitHubToken: ${{ secrets.GITHUB_TOKEN }}
-          wranglerVersion: '3'

.github/workflows/protect.yml

@@ -0,0 +1,16 @@
+name: Enforce preview branch for main merges
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  check-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fail if not from preview branch
+        run: | 
+          if [[ "${{ github.head_ref }}" != "preview" ]]; then
+            echo "Only pull requests from 'preview' branch can be merged into 'main'."
+            exit 1
+          fi

astro.config.mjs

@@ -2,7 +2,6 @@ import mdx from '@astrojs/mdx';
 import sitemap from '@astrojs/sitemap';
 import tailwind from '@astrojs/tailwind';
 import critters from 'astro-critters';
-import pagefind from 'astro-pagefind';
 import robotsTxt from 'astro-robots-txt';
 import { defineConfig } from 'astro/config';
 
@@ -31,7 +30,7 @@ export default defineConfig({
                 return item;
             }
         }),
-        mdx(), pagefind(), critters(), robotsTxt()
+        mdx(), critters(), robotsTxt()
     ],
     markdown: { shikiConfig: { theme: 'css-variables' } },
     i18n: {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "web",
   "type": "module",
-  "version": "0.0.1",
+  "version": "5.21.0",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
@@ -11,26 +11,26 @@
   },
   "dependencies": {
     "@astrojs/check": "^0.7.0",
-    "@astrojs/mdx": "^3.0.1",
-    "@astrojs/rss": "^4.0.6",
-    "@astrojs/sitemap": "^3.1.5",
-    "@astrojs/tailwind": "^5.1.0",
-    "@fontsource-variable/instrument-sans": "^5.1.0",
-    "@fontsource-variable/space-grotesk": "^5.0.18",
-    "@fontsource/instrument-serif": "^5.0.22",
-    "astro": "^4.9.2",
-    "astro-critters": "^2.1.10",
-    "astro-pagefind": "^1.5.0",
+    "@astrojs/mdx": "^3.1.9",
+    "@astrojs/rss": "^4.0.11",
+    "@astrojs/sitemap": "^3.3.0",
+    "@astrojs/tailwind": "^5.1.5",
+    "@fontsource-variable/instrument-sans": "^5.2.5",
+    "@fontsource-variable/space-grotesk": "^5.2.6",
+    "@fontsource/instrument-serif": "^5.2.5",
+    "astro": "^4.16.18",
+    "astro-critters": "^2.2.1",
+    "astro-pagefind": "^1.8.3",
     "clsx": "^2.1.1",
-    "tailwind-merge": "^2.3.0",
-    "tailwindcss": "^3.4.3",
-    "typescript": "^5.4.5"
+    "tailwind-merge": "^2.6.0",
+    "tailwindcss": "^3.4.17",
+    "typescript": "^5.8.3"
   },
   "devDependencies": {
-    "@tailwindcss/typography": "^0.5.13",
+    "@tailwindcss/typography": "^0.5.16",
     "astro-robots-txt": "^1.0.0",
-    "pagefind": "^1.1.0",
-    "prettier": "^3.2.5",
+    "pagefind": "^1.3.0",
+    "prettier": "^3.5.3",
     "prettier-plugin-astro": "^0.13.0",
     "prettier-plugin-organize-imports": "^3.2.4",
     "prettier-plugin-tailwindcss": "^0.5.14",