Merge pull request #285 from blz-it/update-everything

Update Everything

.github/workflows/pages.yml → .github/workflows/cd.yml

@@ -1,4 +1,4 @@
-name: Deploy Astro Project to GitHub Pages
+name: Continuous Deployment
 
 on:
   push:
@@ -13,10 +13,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-      - name: Install, Build, and Upload
-        uses: withastro/action@v1
+      - uses: actions/checkout@v4
+      - uses: withastro/action@v3
+        with:
+          node-version: 20
 
   deploy:
     needs: build
@@ -27,5 +27,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        # Can't upgrade to v4 yet: https://github.com/withastro/action/issues/40
-        uses: actions/deploy-pages@v3
+        uses: actions/deploy-pages@v4

.gitignore

@@ -1,8 +1,8 @@
-.direnv/
-
 # build output
 dist/
-.output/
+
+# generated types
+.astro/
 
 # dependencies
 node_modules/
@@ -13,10 +13,15 @@ yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
 
-
 # environment variables
 .env
 .env.production
 
 # macOS-specific files
 .DS_Store
+
+# jetbrains setting folder
+.idea/
+
+# direnv
+.direnv/

.prettierignore

@@ -0,0 +1,4 @@
+dist
+node_modules
+.github
+.changeset

.prettierrc.mjs

@@ -0,0 +1,12 @@
+/** @type {import("prettier").Config} */
+export default {
+  plugins: ["prettier-plugin-astro", "prettier-plugin-tailwindcss"],
+  overrides: [
+    {
+      files: "*.astro",
+      options: {
+        parser: "astro",
+      },
+    },
+  ],
+};

.vscode/extensions.json

@@ -1,4 +1,8 @@
 {
-  "recommendations": ["astro-build.astro-vscode", "editorconfig.editorconfig"],
+  "recommendations": [
+    "astro-build.astro-vscode",
+    "bradlc.vscode-tailwindcss",
+    "esbenp.prettier-vscode"
+  ],
   "unwantedRecommendations": []
 }

astro.config.mjs

@@ -1,9 +1,17 @@
+// @ts-check
 import react from "@astrojs/react";
 import tailwind from "@astrojs/tailwind";
-import astroI18next from "astro-i18next";
+import icon from "astro-icon";
 import { defineConfig } from "astro/config";
+import { defaultLang, languages } from "./src/i18n/constants";
 
+// https://astro.build/config
 export default defineConfig({
+  i18n: {
+    defaultLocale: defaultLang,
+    locales: Object.keys(languages),
+    routing: "manual", // see: src/middleware.ts
+  },
+  integrations: [tailwind(), react(), icon()],
   site: "https://blz-it.de",
-  integrations: [tailwind(), astroI18next(), react()],
 });

package.json

@@ -1,35 +1,34 @@
 {
-  "name": "@example/basics",
+  "name": "@blz-it/blz-it.de",
   "type": "module",
   "version": "0.0.1",
-  "private": true,
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
-    "build": "astro build",
+    "build": "astro check && astro build",
     "preview": "astro preview",
-    "astro": "astro",
-    "gen-i18n": "astro-i18next generate"
+    "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/react": "^1.2.2",
-    "@astrojs/tailwind": "^2.1.3",
-    "@headlessui/react": "^1.7.19",
-    "@heroicons/react": "^2.1.3",
-    "@hookform/resolvers": "^3.3.4",
-    "@tailwindcss/forms": "^0.5.7",
-    "@tailwindcss/typography": "^0.5.13",
-    "@types/react": "^18.2.78",
-    "@types/react-dom": "^18.2.23",
-    "astro": "^1.9.2",
-    "astro-i18next": "^1.0.0-beta.21",
-    "astro-icon": "^0.8.1",
-    "classnames": "^2.5.1",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "react-hook-form": "^7.51.3",
-    "react-i18next": "^12.1.4",
-    "tailwindcss": "^3.4.3",
-    "zod": "^3.23.0"
+    "@astrojs/check": "^0.9.4",
+    "@astrojs/react": "^3.6.2",
+    "@astrojs/tailwind": "^5.1.1",
+    "@fontsource/poppins": "^5.1.0",
+    "@headlessui/react": "^2.1.10",
+    "@heroicons/react": "^2.1.5",
+    "@iconify-json/mdi": "^1.2.1",
+    "@tailwindcss/typography": "^0.5.15",
+    "@types/react": "^18.3.11",
+    "@types/react-dom": "^18.3.0",
+    "astro": "^4.15.11",
+    "astro-icon": "^1.1.1",
+    "clsx": "^2.1.1",
+    "prettier": "^3.3.3",
+    "prettier-plugin-astro": "^0.14.1",
+    "prettier-plugin-tailwindcss": "^0.6.8",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "tailwindcss": "^3.4.13",
+    "typescript": "^5.6.2"
   }
 }