Merge branch 'main' into swagger

.github/workflows/commit-preview.yaml

@@ -19,17 +19,15 @@ jobs:
           fetch-depth: 0
           filter: 'blob:none'
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - name: Setup PNPM and install dependencies
+        uses: pnpm/action-setup@v4
         with:
-          cache: "npm"
-          node-version: "20"
-
-      - name: Install dependencies
-        run: npm ci
+          version: latest
+          run_install: |
+            - args: [--frozen-lockfile]
 
       - name: Build the project
-        run: npm run build
+        run: pnpm run build
 
       - name: Upload HTML artifact
         uses: actions/upload-artifact@v4

.github/workflows/pr-preview.yaml

@@ -14,17 +14,15 @@ jobs:
           fetch-depth: 0
           filter: 'blob:none'
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - name: Setup PNPM and install dependencies
+        uses: pnpm/action-setup@v4
         with:
-          cache: "npm"
-          node-version: "20"
-
-      - name: Install dependencies
-        run: npm ci
+          version: latest
+          run_install: |
+            - args: [--frozen-lockfile]
 
       - name: Build the project
-        run: npm run build
+        run: pnpm run build
 
       - name: Upload HTML artifact
         uses: actions/upload-artifact@v4
@@ -46,5 +44,5 @@ jobs:
           name: website-package
           path: |
             package.json
-            package-lock.json
+            pnpm-lock.yaml
           retention-days: 1

.github/workflows/publish-pr-preview.yaml

@@ -30,15 +30,19 @@ jobs:
         with:
           name: website-package
           run_id: ${{ github.event.workflow_run.id }}
-
-      - name: Setup Node.js
+      
+      - name: Setup node
         uses: actions/setup-node@v4
         with:
-          cache: "npm"
-          node-version: "20"
+          node-version-file: package.json
+
+      - name: Setup PNPM and install dependencies
+        uses: pnpm/action-setup@v4
+        with:
+          version: latest
+          run_install: |
+            - args: [--frozen-lockfile]
 
-      - name: Install dependencies
-        run: npm ci
 
       # TODO this action is deprecated!
       - name: Gather PR details

.gitignore

@@ -32,3 +32,4 @@ functions/*
 
 # Local development
 .wrangler
+.astro

astro-i18next.config.ts

@@ -1,15 +1,15 @@
 import type { AstroI18nextConfig } from "astro-i18next";
 
 export default {
-	defaultLanguage: "en",
-	supportedLanguages: ["en"],
-	i18next: {
-		//debug: true, // convenient during development to check for missing keys
+	defaultLocale: "en",
+	locales: ["en"],
+	i18nextServer: {
+		// debug: true, // convenient during development to check for missing keys
 		defaultNS: "common",
 		ns: ["common", "footer", "home", "install", "team"],
 	},
-	i18nextPlugins: {
-		backend: "i18next-fs-fluent-backend",
+	i18nextServerPlugins: {
+		Backend: "i18next-fs-fluent-backend",
 		fluent: "i18next-fluent",
 	},
 } as AstroI18nextConfig;

astro.config.ts

@@ -5,25 +5,23 @@ import sitemap from "@astrojs/sitemap";
 import purgecss from "astro-purgecss";
 import rehypeAutolinkHeadings from 'rehype-autolink-headings';
 import { fromHtml } from 'hast-util-from-html';
-import searchIndex from "./src/integration/search-index";
+import icon from "astro-icon"
 
-import playformCompress from "@playform/compress";
+import compress from "astro-compress";
+import searchIndex from "./src/integration/search-index";
 
 // https://astro.build/config
 export default defineConfig({
-  site: "https://quiltmc.org",
+  site: "https://quiltmc.org/",
   integrations: [
-		mdx(),
-		astroI18next(),
-		sitemap(),
-		purgecss({
-    	safelist: ["has-background-info", "has-background-link"]
-  	}),
-		searchIndex(),
-		playformCompress({
-			SVG: false,
-		}),
-	],
+      mdx(),
+    astroI18next(),
+    sitemap(),
+    purgecss({ safelist: ["has-background-info", "has-background-link"] }),
+    compress({ SVG: false, }),
+    searchIndex(),
+    icon()
+  ],
   markdown: {
     syntaxHighlight: "prism",
     rehypePlugins: [[rehypeAutolinkHeadings, {
@@ -35,5 +33,12 @@ export default defineConfig({
     build: {
       assetsInlineLimit: 0
     }
+  },
+  i18n: {
+    defaultLocale: "en",
+    locales: ["en"],
+    routing: {
+      prefixDefaultLocale: true
+    }
   }
 });

package.json

@@ -10,50 +10,59 @@
 		"clean": "node scripts/clean.mjs"
 	},
 	"devDependencies": {
-		"@astrojs/markdown-component": "^1.0.5",
-		"@astrojs/mdx": "^0.19.0",
-		"@astrojs/rss": "^1.2.1",
-		"@astrojs/sitemap": "^1.4.0",
+		"@astrojs/mdx": "^3.1.5",
+		"@astrojs/rss": "^4.0.7",
+		"@astrojs/sitemap": "^3.1.6",
 		"@types/file-saver": "^2.0.7",
-		"@types/jsdom": "^21.1.6",
+		"@types/jsdom": "^21.1.7",
 		"@types/lunr": "^2.3.7",
-		"@types/luxon": "^3.3.3",
-		"@types/prismjs": "^1.26.3",
+		"@types/luxon": "^3.4.2",
+		"@types/prismjs": "^1.26.4",
 		"@types/semver-compare": "^1.0.3",
 		"@types/semver-sort": "^0.0.5",
 		"@types/swagger-ui": "^3.52.4",
-		"astro": "^2.2.0",
-		"astro-i18next": "1.0.0-beta.21",
-		"astro-purgecss": "^2.3.0",
-		"bulma-toast": "^2.4.3",
-		"execa": "^6.1.0",
+		"astro": "^4.14.6",
+		"astro-i18next": "github:quiltmc/astro-i18next#74e0be3",
+		"astro-purgecss": "^4.3.0",
+		"bulma-toast": "^2.4.4",
+		"execa": "^9.3.0",
 		"file-saver": "^2.0.5",
-		"glob": "^8.1.0",
-		"hast-util-from-html": "^1.0.2",
-		"i18next": "^21.10.0",
+		"glob": "^11.0.0",
+		"hast-util-from-html": "^2.0.1",
+		"i18next": "^23.12.2",
 		"i18next-fluent": "^2.0.0",
-		"i18next-fs-fluent-backend": "github:pluiedev/i18next-fs-fluent-backend",
-		"jsdom": "^24.0.0",
+		"i18next-fs-fluent-backend": "github:quiltmc/i18next-fs-fluent-backend",
+		"jsdom": "^24.1.1",
 		"jszip": "^3.10.1",
 		"lunr": "^2.3.9",
-		"marked": "^12.0.1",
+		"marked": "^14.0.0",
 		"node-fetch": "^3.3.2",
 		"prismjs": "^1.29.0",
 		"quilt-bulma": "0.0.24",
-		"rehype-autolink-headings": "^6.1.1",
-		"rollup": "^3.29.4",
-		"sass": "^1.69.4",
+		"rehype-autolink-headings": "^7.1.0",
+		"rollup": "^4.20.0",
+		"sass": "^1.77.8",
 		"semver-compare": "^1.0.0",
-		"typescript": "^4.9.5"
+		"swagger-ui": "^5.17.14",
+		"typescript": "^5.5.4"
 	},
 	"dependencies": {
 		"@astro-openapi/gui-swagger": "^0.0.5",
-		"@babel/traverse": "^7.23.4",
-		"@playform/compress": "^0.0.13",
-		"@tsndr/cloudflare-worker-jwt": "^2.2.5",
+		"@babel/traverse": "^7.25.3",
+		"@iconify-json/cib": "^1.1.10",
+		"@iconify-json/material-symbols": "^1.1.87",
+		"@iconify-json/mdi": "^1.1.68",
+		"@tsndr/cloudflare-worker-jwt": "^2.5.3",
+		"astro-compress": "^2.3.1",
+		"astro-icon": "^1.1.0",
 		"semver-sort": "^1.0.0",
 		"xml-js": "^1.6.11"
 	},
+	"pnpm": {
+		"overrides": {
+			"@iconify/tools": "^4.0.0"
+		}
+	},
 	"engines": {
 		"node": ">=20"
 	}