Merge branch 'master' into fix/activity

The youtube video linked for Horizontal Autoscaling was not English which goes against our contribution guidelines.

.astro/settings.json

@@ -0,0 +1,8 @@
+{
+	"devToolbar": {
+		"enabled": false
+	},
+	"_variables": {
+		"lastUpdateCheck": 1714413381505
+	}
+}

.github/workflows/cloudfront-cache.yml

@@ -0,0 +1,20 @@
+name: Clears Cloudfront Cache
+on:
+  # Allow manual Run
+  workflow_dispatch:
+  # Run at midnight utc
+  schedule:
+    - cron: '0 0 * * *'
+jobs:
+  aws_costs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clear Cloudfront Caching
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.GH_PAT }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/roadmapsh/infra-ansible/actions/workflows/playbook.yml/dispatches \
+            -d '{ "ref":"master", "inputs": { "playbook": "roadmap_web.yml", "tags": "cloudfront", "is_verbose": false } }'

.github/workflows/deployment.yml

@@ -1,41 +1,62 @@
-name: App Deployment
+name: Deploy to EC2
 on:
+  workflow_dispatch: # allow manual run
   push:
-    branches: [ master ]
-env:
-  PUBLIC_API_URL: "https://api.roadmap.sh"
-  PUBLIC_EDITOR_APP_URL: "https://draw.roadmap.sh"
-  PUBLIC_AVATAR_BASE_URL: "https://dodrc8eu8m09s.cloudfront.net/avatars"
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  CI: true
+    branches:
+      - master
 jobs:
-  build:
+  deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-    - uses: actions/setup-node@v1
-      with:
-        node-version: 18
-    - name: Prepare Draw Repository
-      run: |
-        git clone https://${{ secrets.GH_PAT }}@github.com/roadmapsh/web-draw.git .temp/web-draw --depth 1
-    - uses: pnpm/action-setup@v2.2.2
-      with:
-        version: 7.13.4
-    - name: Setup Environment
-      run: |
-        pnpm install
-    - name: Generate meta and build
-      run: |
-        npm run generate-renderer
-        npm run build
-        touch ./dist/.nojekyll
-        echo 'roadmap.sh' > ./dist/CNAME
-    - name: Deploy to GH Pages
-      run: |
-        git config user.email "kamranahmed.se@gmail.com"
-        git config user.name "Kamran Ahmed"
-        git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
-        npm run deploy
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 20
+      - uses: pnpm/action-setup@v3.0.0
+        with:
+          version: 8.15.6
+
+      # --------------------
+      # Setup configuration
+      # --------------------
+      - name: Prepare configuration files
+        run: |
+          git clone https://${{ secrets.GH_PAT }}@github.com/roadmapsh/infra-config.git configuration --depth 1
+      - name: Copy configuration files
+        run: |
+          cp configuration/dist/github/developer-roadmap.env .env
+
+      # --------------------
+      # Prepare the build
+      # --------------------
+      - name: Install dependencies
+        run: |
+          pnpm install
+      - name: Generate build
+        run: |
+          git clone https://${{ secrets.GH_PAT }}@github.com/roadmapsh/web-draw.git .temp/web-draw --depth 1
+          npm run generate-renderer
+          npm run compress:images
+          npm run build
+
+      # --------------------
+      # Deploy to EC2
+      # --------------------
+      - uses: webfactory/ssh-agent@v0.7.0
+        with:
+          ssh-private-key: ${{ secrets.EC2_PRIVATE_KEY }}
+      - name: Deploy app to EC2
+        run: |
+          rsync -apvz --delete --no-times --exclude "configuration" -e "ssh -o StrictHostKeyChecking=no" -p ./ ${{ secrets.EC2_USERNAME }}@${{ secrets.EC2_HOST }}:/var/www/roadmap.sh/
+      - name: Restart PM2
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          script: |
+            cd /var/www/roadmap.sh
+            sudo pm2 restart web-roadmap

astro.config.mjs

@@ -1,10 +1,9 @@
 // https://astro.build/config
 import sitemap from '@astrojs/sitemap';
 import tailwind from '@astrojs/tailwind';
-import compress from 'astro-compress';
+import node from '@astrojs/node';
 import { defineConfig } from 'astro/config';
 import rehypeExternalLinks from 'rehype-external-links';
-import { fileURLToPath } from 'node:url';
 import { serializeSitemap, shouldIndexPage } from './sitemap.mjs';
 
 import react from '@astrojs/react';
@@ -29,7 +28,7 @@ export default defineConfig({
               'mailto:',
               'https://github.com/kamranahmedse',
               'https://thenewstack.io',
-              'https://cs.fyi',
+              'https://kamranahmed.info',
               'https://roadmap.sh',
             ];
             if (whiteListedStarts.some((start) => href.startsWith(start))) {
@@ -41,9 +40,11 @@ export default defineConfig({
       ],
     ],
   },
-  build: {
-    format: 'file',
-  },
+  output: 'hybrid',
+  adapter: node({
+    mode: 'standalone',
+  }),
+  trailingSlash: 'never',
   integrations: [
     tailwind({
       config: {
@@ -54,11 +55,6 @@ export default defineConfig({
       filter: shouldIndexPage,
       serialize: serializeSitemap,
     }),
-    compress({
-      HTML: false,
-      CSS: false,
-      JavaScript: false,
-    }),
     react(),
   ],
 });

package.json

@@ -11,7 +11,6 @@
     "format": "prettier --write .",
     "astro": "astro",
     "deploy": "NODE_DEBUG=gh-pages gh-pages -d dist -t",
-    "compress:jsons": "node scripts/compress-jsons.cjs",
     "upgrade": "ncu -u",
     "roadmap-links": "node scripts/roadmap-links.cjs",
     "roadmap-dirs": "node scripts/roadmap-dirs.cjs",
@@ -19,55 +18,69 @@
     "generate-renderer": "sh scripts/generate-renderer.sh",
     "best-practice-dirs": "node scripts/best-practice-dirs.cjs",
     "best-practice-content": "node scripts/best-practice-content.cjs",
+    "generate:og": "node ./scripts/generate-og-images.mjs",
+    "compress:images": "tsx ./scripts/compress-images.ts",
     "test:e2e": "playwright test"
   },
   "dependencies": {
-    "@astrojs/react": "^3.0.10",
-    "@astrojs/sitemap": "^3.0.5",
+    "@astrojs/node": "^8.2.5",
+    "@astrojs/react": "^3.3.1",
+    "@astrojs/sitemap": "^3.1.4",
     "@astrojs/tailwind": "^5.1.0",
-    "@fingerprintjs/fingerprintjs": "^4.2.2",
-    "@nanostores/react": "^0.7.1",
-    "@types/react": "^18.2.56",
-    "@types/react-dom": "^18.2.19",
-    "astro": "^4.4.0",
-    "astro-compress": "^2.2.10",
-    "clsx": "^2.1.0",
+    "@fingerprintjs/fingerprintjs": "^4.3.0",
+    "@nanostores/react": "^0.7.2",
+    "@resvg/resvg-js": "^2.6.2",
+    "@types/react": "^18.3.1",
+    "@types/react-dom": "^18.3.0",
+    "astro": "^4.7.0",
+    "clsx": "^2.1.1",
+    "dayjs": "^1.11.11",
     "dom-to-image": "^2.6.0",
     "dracula-prism": "^2.1.16",
-    "jose": "^5.2.2",
+    "gray-matter": "^4.0.3",
+    "htm": "^3.1.1",
+    "image-size": "^1.1.1",
+    "jose": "^5.2.4",
     "js-cookie": "^3.0.5",
-    "lucide-react": "^0.334.0",
-    "nanoid": "^5.0.5",
-    "nanostores": "^0.9.5",
-    "node-html-parser": "^6.1.12",
-    "npm-check-updates": "^16.14.15",
+    "lucide-react": "^0.376.0",
+    "nanoid": "^5.0.7",
+    "nanostores": "^0.10.3",
+    "node-html-parser": "^6.1.13",
+    "npm-check-updates": "^16.14.20",
     "prismjs": "^1.29.0",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
+    "react-calendar-heatmap": "^1.9.0",
     "react-confetti": "^6.1.0",
-    "react-dom": "^18.2.0",
-    "reactflow": "^11.10.4",
+    "react-dom": "^18.3.1",
+    "react-tooltip": "^5.26.4",
+    "reactflow": "^11.11.2",
     "rehype-external-links": "^3.0.0",
     "remark-parse": "^11.0.0",
     "roadmap-renderer": "^1.0.6",
+    "satori": "^0.10.13",
+    "satori-html": "^0.3.2",
+    "sharp": "^0.33.3",
     "slugify": "^1.6.6",
-    "tailwind-merge": "^2.2.1",
-    "tailwindcss": "^3.4.1",
+    "tailwind-merge": "^2.3.0",
+    "tailwindcss": "^3.4.3",
     "unified": "^11.0.4",
-    "zustand": "^4.5.1"
+    "zustand": "^4.5.2"
   },
   "devDependencies": {
-    "@playwright/test": "^1.41.2",
-    "@tailwindcss/typography": "^0.5.10",
+    "@playwright/test": "^1.43.1",
+    "@tailwindcss/typography": "^0.5.13",
     "@types/dom-to-image": "^2.6.7",
     "@types/js-cookie": "^3.0.6",
     "@types/prismjs": "^1.26.3",
+    "@types/react-calendar-heatmap": "^1.6.7",
     "csv-parser": "^3.0.0",
     "gh-pages": "^6.1.1",
     "js-yaml": "^4.1.0",
-    "markdown-it": "^14.0.0",
-    "openai": "^4.28.0",
+    "markdown-it": "^14.1.0",
+    "openai": "^4.38.5",
     "prettier": "^3.2.5",
     "prettier-plugin-astro": "^0.13.0",
-    "prettier-plugin-tailwindcss": "^0.5.11"
+    "prettier-plugin-tailwindcss": "^0.5.14",
+    "tsx": "^4.7.3"
   }
 }

public/images/graph.svg

@@ -0,0 +1,3 @@
+ <svg width="46" height="27" viewBox="0 0 46 27" fill="none" xmlns="http://www.w3.org/2000/svg">
+   <path d="M43.354 0.9C42.184 0.9 41.2371 1.84684 41.2371 3.01686C41.2371 3.30867 41.3062 3.57708 41.4117 3.82435L33.4085 15.0163C33.38 15.0161 33.3514 15.0167 33.3248 15.0172C33.3051 15.0176 33.2864 15.018 33.2697 15.018C32.8703 15.018 32.484 15.1223 32.161 15.3186L25.2976 11.9024C25.1995 10.8219 24.2903 9.97585 23.1854 9.97585C22.0154 9.97585 21.0686 10.9227 21.0686 12.0927C21.0686 12.1865 21.0799 12.2794 21.0925 12.3656L13.8077 18.1561C13.5852 18.0783 13.3472 18.0433 13.1011 18.0433C12.0622 18.0433 11.2066 18.7882 11.0265 19.7732L4.26122 22.5041C3.91213 22.2447 3.48642 22.077 3.01686 22.077C1.84684 22.077 0.9 23.0238 0.9 24.1938C0.9 25.3639 1.84684 26.3107 3.01686 26.3107C4.06426 26.3107 4.92372 25.5497 5.0923 24.5492L11.8566 21.8497C12.2057 22.1092 12.6315 22.277 13.1011 22.277C14.2711 22.277 15.218 21.3301 15.218 20.1601C15.218 20.0663 15.2067 19.9735 15.194 19.8873L22.4789 14.0968C22.7013 14.1746 22.9393 14.2096 23.1854 14.2096C23.5848 14.2096 23.9711 14.1053 24.2941 13.909L31.1575 17.3252C31.2556 18.4057 32.1649 19.2517 33.2697 19.2517C34.4397 19.2517 35.3866 18.3049 35.3866 17.1348C35.3866 16.843 35.3175 16.5746 35.2119 16.3273L43.2151 5.13536C43.2437 5.13561 43.2723 5.13503 43.2989 5.13449C43.3186 5.13409 43.3373 5.13371 43.354 5.13371C44.524 5.13371 45.4708 4.18687 45.4708 3.01686C45.4708 1.84684 44.524 0.9 43.354 0.9Z" fill="black" stroke="black" stroke-width="0.2" />
+ </svg>