chore: redesign in Astro

.editorconfig

@@ -0,0 +1,19 @@
+# EditorConfig: https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
+
+[Makefile]
+indent_style = tab

.github/CODEOWNERS

@@ -4,5 +4,6 @@
 # Codeowners
 .github/CODEOWNERS @expressjs/docs-captains
 
-# Blog
-_posts @expressjs/express-tc
+# Blog - TODO: Add once Astro blog structure is set up
+
+src/content/blog @expressjs/express-tc

.github/dependabot.yml

@@ -4,22 +4,54 @@ updates:
     directory: /
     schedule:
       interval: monthly
-
-  - package-ecosystem: docker
-    directory: /
-    schedule:
-      interval: monthly
-
-  - package-ecosystem: bundler
-    directory: /
-    schedule:
-      interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - '*'
 
   - package-ecosystem: npm
     directory: /
     schedule:
       interval: monthly
     open-pull-requests-limit: 10
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major"]
+    groups:
+      astro:
+        patterns:
+          - '@astrojs/*'
+          - 'astro'
+          - 'astro-*'
+          - 'prettier-plugin-astro'
+      orama:
+        patterns:
+          - '@orama/*'
+          - 'gray-matter'
+          - 'mdast-util-from-markdown'
+          - 'mdast-util-to-string'
+      linters:
+        patterns:
+          - 'eslint'
+          - 'eslint-*'
+          - '@eslint/*'
+          - 'prettier'
+          - 'typescript-eslint'
+          - 'globals'
+      production:
+        dependency-type: production
+        exclude-patterns:
+          - '@astrojs/*'
+          - 'astro'
+          - 'astro-*'
+          - '@orama/*'
+          - 'gray-matter'
+          - 'mdast-util-from-markdown'
+          - 'mdast-util-to-string'
+      development:
+        dependency-type: development
+        exclude-patterns:
+          - 'eslint'
+          - 'eslint-*'
+          - '@eslint/*'
+          - 'prettier'
+          - 'prettier-plugin-astro'
+          - 'typescript-eslint'
+          - 'globals'

.github/scripts/get-contributing.sh

@@ -2,19 +2,18 @@
 
 # This script replaces the contents of a section with the contents from the annotated source address or local file paths inside the DEST file.
 
+# TODO: change the DEST when astro project is in the root of the repo instead of in a subdirectory.
 # read contents of file into memory
-DEST="../../en/resources/contributing.md"
+DEST="../../src/content/pages/en/resources/contributing.md"
 
-# track the header level 
+# track the header level
 level=''
 # tracks src for curl calls
 src=''
-# tracks file paths for local file reads
-local=''
   while IFS= read -r line; do
   # REMOVE PREVIOUS CONTENT SECTION
-  # if src or local tags are not empty
-  if [[ -n "$src" || -n "$local" ]]; then
+  # if src tags are not empty
+  if [[ -n "$src" ]]; then
     #  if current line not a horitzontal rule hr
     if  [[ "$line" != "----"* ]]; then
     #  if line == level -- level is num of ##
@@ -29,63 +28,48 @@ local=''
 
  # PRINT TO PAGE SECTION
   src=''
-  local=''
   # if line is a header
   if [[ "$line" == '#'* ]]; then
   # if header has (#id-of-link) or {#id-on-page} patterns
     if [[ $line =~ (\(\#.*\))\. || "$line" =~ \{\#.*\} ]]; then
-      # isolate the matching part of line 
+      # isolate the matching part of line
       match=${BASH_REMATCH[0]}
       # remove match - leaving rest
       rest=${line//${match}}
-      # remove any # symbols from start 
+      # remove any # symbols from start
       title_rest=${rest##*\#}
       # slice rest of line to get only level
       level="${rest:0:$((${#rest} - ${#title_rest}))}"
     else
-    # any other headers -- these before SRC/LOCAL pages anchors
-      header=${line##*\#} 
+    # any other headers -- these before SRC pages anchors
+      header=${line##*\#}
       level="${line:0:$((${#line} - ${#header}))}"
     fi
-  # if line is SRC anchor in read file 
+  # if line is SRC anchor in read file
   elif [[ "$line" == '<!-- SRC:'* ]]; then
     # remove the first 10 chars
     src=${line:10}
     # % remove from end until after white space -- leaves src details
     src=${src% *}
-  # if line is LOCAL anchor in read file 
-  elif [[ "$line" == '<!-- LOCAL:'* ]]; then
-    # remove the first 12 chars
-    local=${line:12}
-    # % remove from end until after white space -- leave local details
-    local=${local% *}
-    # leave only path to file
-    local=${local#* }
-  fi 
-  # prints line to the page 
+  fi
+  # prints line to the page
   echo "$line"
-
-  if [[ -n "$local" ]]; then
-  # cat file -- outputs full contents of file at local path 
-    cat "$local" | \
-    # remove the top 1# headers from cat'd file
-      sed -En '/^##|^[^#]/,$p' | \
-    # remove GH MD specific tags start w '[!NOTE\] + the following line
-      sed -E '/^>\[!NOTE\]*/{N;d;}' | \
-    # change GH specific MD IMPORTANT tags -> change into plain MD
-      sed -E 's/> \[!IMPORTANT\]/> **IMPORTANT:** /g'
-      echo
-  elif [[ -n "$src" ]]; then  
+
+  if [[ -n "$src" ]]; then
     echo
     path=${src#* }
     repo=${src% *}
     curl -s "https://raw.githubusercontent.com/${repo}/master/${path}" | \
       # if line is ## or not #
       sed -En '/^##|^[^#]/,$p' | \
-      # add additional # every header 
+      # add additional # every header
       sed 's/^#/&'"${level:1}"'/g' | \
       # format GH links when match
-      sed -E 's/(\[[^]]*\])\(([^):#]*)\)/\1(https:\/\/github.com\/'"$(sed 's/\//\\\//g' <<< "$repo")"'\/blob\/master\/\2)/g'
+      sed -E 's/(\[[^]]*\])\(([^):#]*)\)/\1(https:\/\/github.com\/'"$(sed 's/\//\\\//g' <<< "$repo")"'\/blob\/master\/\2)/g' | \
+      # remove GH MD specific tags start w '[!NOTE]' + the following line
+      sed -E '/^>\[!NOTE\]*/{N;d;}' | \
+      # change GH specific MD IMPORTANT tags -> change into plain MD
+      sed -E 's/> \[!IMPORTANT\]/> **IMPORTANT:** /g'
     echo
   fi
   # read in dest file then write back to file

.github/scripts/get-readmes.sh

@@ -10,7 +10,6 @@
 (cat <<LIST_END
 expressjs body-parser master
 expressjs compression master
-expressjs connect-rid master
 expressjs cookie-parser master
 expressjs cookie-session master
 expressjs cors master
@@ -25,26 +24,45 @@ expressjs serve-static master
 expressjs session master
 expressjs timeout master
 expressjs vhost master
-expressjs express master/examples
 LIST_END
 ) | while read org repo branch; do
+  # TODO: change the DEST when astro project is in the root of the repo instead of in a subdirectory.
   # Write the README.md to a file named after the repo
-  DEST="../../_includes/readmes/$repo.md"
+  DEST="../../src/content/pages/en/resources/middleware/$repo.md"
   # When fetching from a branch of a gh repo
   GHURL="https://raw.githubusercontent.com/$org/$repo/$branch/README.md"
   # When fetching from the latest release of a node module
   NPMURL="https://registry.npmjs.org/$repo"
+
+  # Preserve existing frontmatter if the file already exists
+  FRONTMATTER=""
+  if [ -f "$DEST" ]; then
+    # Extract full frontmatter block (between --- delimiters)
+    FRONTMATTER=$(awk '/^---$/{c++;next} c==1{print} c==2{exit}' "$DEST")
+  fi
+
   if [ -z "$branch" ]; then
     # No branch means latest release, so fetch from npmjs.org
     echo "fetching $org/$repo from latest npmjs.org release..."
-    curl -s $NPMURL | jq -r '.readme|rtrimstr("\n")' > $DEST
+    CONTENT=$(curl -s $NPMURL | jq -r '.readme|rtrimstr("\n")')
   else
     # This allows us to specify a branch other than master if we want to.
     # In this case, the branch name is added to the readme name in the filename.
     if [ "$branch" != "master" ]; then
-      DEST="../../_includes/readmes/$repo-$branch.md"
+      DEST="../../src/content/pages/en/resources/middleware/$repo-$branch.md"
     fi
     echo "fetching $org/$repo/$branch from GitHub's raw content domain..."
-    curl -s $GHURL > $DEST
+    CONTENT=$(curl -s $GHURL)
+  fi
+
+  # Remove the first h1 heading (title is rendered by the layout)
+  CONTENT=$(echo "$CONTENT" | sed '0,/^# /{/^# /d}')
+
+  # Write with frontmatter preserved
+  if [ -n "$FRONTMATTER" ]; then
+    printf '%s\n%s\n%s\n\n%s\n' "---" "$FRONTMATTER" "---" "$CONTENT" > $DEST
+  else
+    DESC=$(curl -s "https://registry.npmjs.org/$repo" | jq -r '.description // empty')
+    printf '%s\n%s\n%s\n%s\n\n%s\n' "---" "title: $repo middleware" "description: $DESC" "---" "$CONTENT" > $DEST
   fi
 done

.github/workflows/build.yml

@@ -0,0 +1,103 @@
+name: ci
+
+on:
+  pull_request:
+    branches:
+      - redesign
+  pull_request_review:
+    types: [submitted]
+  push:
+    branches:
+      - redesign
+
+# Cancel in progress workflows
+# in the scenario where we already had a run going for that PR/branch/tag but then triggered a new run
+concurrency:
+  group: '${{ github.workflow }} ✨ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    if: |
+      github.event.pull_request.draft != true &&
+      (github.event_name == 'pull_request_review' && github.event.review.state == 'approved') ||
+      github.event_name != 'pull_request_review'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v6
+        with:
+          # node-version-file: ".nvmrc" use when .nvmrc is on root of the repo
+          node-version: '24.13'
+          # cache: "npm" use when package-lock.json is on root of the repo
+
+      - name: Install Node.js dependencies
+        run: npm ci
+
+      - name: Run tests
+        shell: bash
+        run: npm run check
+
+  build:
+    name: build
+    runs-on: ubuntu-latest
+    if: |
+      github.event.pull_request.draft != true &&
+      (github.event_name == 'pull_request_review' && github.event.review.state == 'approved') ||
+      github.event_name != 'pull_request_review'
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+
+      - name: Install Node.js dependencies
+        run: npm ci
+
+      - name: Build Astro site
+        run: npm run build
+
+  linkChecker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+
+      - name: Install Node.js dependencies
+        run: npm ci
+
+      - name: Build Astro site
+        run: npm run build
+
+      - name: Check links
+        uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0 # v2.7.0
+        with:
+          args: |
+            --root-dir $PWD/dist
+            --remap "https://expressjs\.com\/((?:[^\/]+\/)*[^\/\.]+)\/?$ file://$PWD/dist/\$1/index.html"
+            --remap "https://expressjs\.com\/(.*\.html)$ file://$PWD/dist/\$1"
+            dist/
+          fail: true