Merge remote-tracking branch 'upstream/main'

Author: g-francesca

.github/CODEOWNERS

@@ -33,7 +33,6 @@ apps/site/redirects.json @nodejs/web-infra
 
 # Critical Documents
 LICENSE @nodejs/tsc
-GOVERNANCE.md @nodejs/tsc
 CONTRIBUTING.md @nodejs/nodejs-website @nodejs/web-infra
 docs @nodejs/nodejs-website @nodejs/web-infra
 SECURITY.md @nodejs/security-wg

.github/workflows/build.yml

@@ -69,3 +69,11 @@ jobs:
           NODE_OPTIONS: '--max_old_space_size=4096'
           # We want to ensure that static exports for all locales do not occur on `pull_request` events
           NEXT_PUBLIC_STATIC_EXPORT_LOCALE: ${{ github.event_name == 'push' }}
+          # See https://github.com/vercel/next.js/pull/81318
+          TURBOPACK_STATS: ${{ matrix.os == 'ubuntu-latest' }}
+
+      - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        if: matrix.os == 'ubuntu-latest'
+        with:
+          name: webpack-stats
+          path: apps/site/.next/server/webpack-stats.json

.github/workflows/bundle-compare.yml

@@ -0,0 +1,68 @@
+name: Compare Bundle Size
+
+on:
+  workflow_run:
+    workflows: ['Build']
+    types: [completed]
+
+permissions:
+  contents: read
+  actions: read
+  # To create the comment
+  pull-requests: write
+
+jobs:
+  compare:
+    name: Compare Bundle Stats
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        with:
+          egress-policy: audit
+
+      - name: Git Checkout
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+
+      - name: Download Stats (HEAD)
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+        with:
+          name: webpack-stats
+          path: head-stats
+          run-id: ${{ github.event.workflow_run.workflow_id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get Run ID from BASE
+        id: base-run
+        env:
+          WORKFLOW_ID: ${{ github.event.workflow_run.workflow_id }}
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          ID=$(gh run list -c $GITHUB_SHA -w $WORKFLOW_ID -L 1 --json databaseId --jq ".[].databaseId")
+          echo "run_id=$ID" >> $GITHUB_OUTPUT
+
+      - name: Download Stats (BASE)
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+        with:
+          name: webpack-stats
+          path: base-stats
+          run-id: ${{ steps.base-run.outputs.run_id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Compare Bundle Size
+        id: compare-bundle-size
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        env:
+          HEAD_STATS_PATH: ./head-stats/webpack-stats.json
+          BASE_STATS_PATH: ./base-stats/webpack-stats.json
+        with:
+          script: |
+            const { compare } = await import('${{github.workspace}}/apps/site/scripts/compare-size/index.mjs')
+            await compare({core})
+
+      - name: Add Comment to PR
+        uses: thollander/actions-comment-pull-request@e2c37e53a7d2227b61585343765f73a9ca57eda9 # v3.0.0
+        with:
+          comment-tag: 'compare_bundle_size'
+          message: ${{ steps.compare-bundle-size.outputs.comment }}

.github/workflows/sync-orama.yml

@@ -43,5 +43,6 @@ jobs:
         run: node --run sync-orama
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ORAMA_INDEX_ID: ${{ github.event_name == 'push' && secrets.ORAMA_PRODUCTION_INDEX_ID || secrets.ORAMA_INDEX_ID }}
-          ORAMA_SECRET_KEY: ${{ github.event_name == 'push' && secrets.ORAMA_PRODUCTION_SECRET_KEY || secrets.ORAMA_SECRET_KEY }}
+          NEW_ORAMA_PROJECT_ID: ${{ github.event_name == 'push' && secrets.NEW_ORAMA_PRODUCTION_PROJECT_ID || secrets.NEW_ORAMA_PROJECT_ID }}
+          NEW_ORAMA_PRIVATE_API_KEY: ${{ github.event_name == 'push' && secrets.NEW_ORAMA_PRODUCTION_PRIVATE_API_KEY || secrets.NEW_ORAMA_PRIVATE_API_KEY }}
+          NEW_ORAMA_DATASOURCE_ID: ${{ github.event_name == 'push' && secrets.NEW_ORAMA_PRODUCTION_DATASOURCE_ID || secrets.NEW_ORAMA_DATASOURCE_ID }}

.gitignore

@@ -49,4 +49,6 @@ playwright-report
 
 ## MacOS Ignored Files
 .DS_Store
+
+## Other Files
 .env

GOVERNANCE.md

@@ -94,6 +94,8 @@ These are maintained in different repositories and we urge users to open **issue
 
 [Collaborator Guide][]
 
+[Governance Document][]
+
 [Figma Design][]
 
 [Content vs Code][]
@@ -121,5 +123,6 @@ These are maintained in different repositories and we urge users to open **issue
 [content vs code]: https://github.com/nodejs/nodejs.org/blob/main/docs/content-vs-code.md
 [dependency pinning]: https://github.com/nodejs/nodejs.org/blob/main/docs/dependency-pinning.md
 [collaborator guide]: https://github.com/nodejs/nodejs.org/blob/main/docs/collaborator-guide.md
+[governance document]: https://github.com/nodejs/web-team/blob/main/GOVERNANCE.md
 [figma design]: https://www.figma.com/file/a10cjjw3MzvRQMPT9FP3xz
 [translation guidelines]: https://github.com/nodejs/nodejs.org/blob/main/docs/translation.md

README.md

@@ -1,8 +1,8 @@
 import { NextResponse } from 'next/server';
 
-import provideWebsiteFeeds from '#site/next-data/providers/websiteFeeds';
 import { siteConfig } from '#site/next.json.mjs';
 import { defaultLocale } from '#site/next.locales.mjs';
+import { getFeeds } from '#site/util/feeds';
 
 type DynamicStaticPaths = { locale: string; feed: string };
 type StaticParams = { params: Promise<DynamicStaticPaths> };
@@ -14,7 +14,7 @@ export const GET = async (_: Request, props: StaticParams) => {
   const params = await props.params;
 
   // Generate the Feed for the given feed type (blog, releases, etc)
-  const websiteFeed = provideWebsiteFeeds(params.feed);
+  const websiteFeed = getFeeds(params.feed);
 
   return new NextResponse(websiteFeed, {
     headers: { 'Content-Type': 'application/xml' },

apps/site/app/[locale]/feed/[feed]/route.ts

@@ -6,8 +6,8 @@
 }
 
 .subtitle {
-  @apply mb-2
-    mt-6
+  @apply mt-6
+    mb-2
     inline-block
     text-xs
     font-semibold

apps/site/components/Blog/BlogPostCard/index.module.css

@@ -15,7 +15,7 @@ type BlogPostCardProps = {
   category: BlogCategory;
   description?: string;
   authors?: Array<string>;
-  date?: Date;
+  date?: string | Date;
   slug?: string;
 };