merging all conflicts

Author: react-translations-bot

.claude/skills/docs-writer-blog/SKILL.md

@@ -9,7 +9,8 @@
     "react-hooks/exhaustive-deps": "error",
     "react/no-unknown-property": ["error", {"ignore": ["meta"]}],
     "react-compiler/react-compiler": "error",
-    "local-rules/lint-markdown-code-blocks": "error"
+    "local-rules/lint-markdown-code-blocks": "error",
+    "no-trailing-spaces": "error"
   },
   "env": {
     "node": true,

.claude/skills/react-expert/SKILL.md

@@ -1,6 +1,6 @@
 contact_links:
   - name: 📃 Bugs in React
-    url: https://github.com/facebook/react/issues/new/choose
+    url: https://github.com/react/react/issues/new/choose
     about: This issue tracker is not for bugs in React. Please file React issues here.
   - name: 🤔 Questions and Help
     url: https://reactjs.org/community/support.html

.eslintrc

@@ -8,7 +8,7 @@ permissions: {}
 
 jobs:
   check_maintainer:
-    uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
+    uses: react/react/.github/workflows/shared_check_maintainer.yml@main
     permissions:
       # Used by check_maintainer
       contents: read

.github/ISSUE_TEMPLATE/config.yml

@@ -12,7 +12,7 @@ env:
 
 jobs:
   check_maintainer:
-    uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
+    uses: react/react/.github/workflows/shared_check_maintainer.yml@main
     permissions:
       # Used by check_maintainer
       contents: read

.github/workflows/discord_notify.yml

@@ -46,3 +46,6 @@ public/rss.xml
 
 # worktrees
 .worktrees/
+
+# Generated OG images (scripts/generateOgImages.mjs)
+public/images/og/

.github/workflows/label_core_team_prs.yml

@@ -7,7 +7,7 @@
     "analyze": "ANALYZE=true next build",
     "dev": "next-remote-watch ./src/content",
     "prebuild:rsc": "node scripts/buildRscWorker.mjs",
-    "build": "node scripts/buildRscWorker.mjs && next build && node --experimental-modules ./scripts/downloadFonts.mjs",
+    "build": "node scripts/buildRscWorker.mjs && next build && node --experimental-modules ./scripts/downloadFonts.mjs && node ./scripts/generateOgImages.mjs",
     "lint": "next lint && eslint \"src/content/**/*.md\"",
     "lint:fix": "next lint --fix && eslint \"src/content/**/*.md\" --fix",
     "format:source": "prettier --config .prettierrc --write \"{plugins,src}/**/*.{js,ts,jsx,tsx,css}\"",
@@ -51,6 +51,7 @@
     "@babel/plugin-transform-modules-commonjs": "^7.18.6",
     "@babel/preset-react": "^7.18.6",
     "@mdx-js/mdx": "^2.1.3",
+    "@resvg/resvg-js": "^2.6.2",
     "@types/body-scroll-lock": "^2.6.1",
     "@types/classnames": "^2.2.10",
     "@types/debounce": "^1.2.1",
@@ -102,6 +103,7 @@
     "retext": "^7.0.1",
     "retext-smartypants": "^4.0.0",
     "rss": "^1.2.2",
+    "satori": "^0.26.0",
     "tailwindcss": "^3.4.1",
     "typescript": "^5.7.2",
     "unist-util-visit": "^2.0.3",