[pull] main from facebook:main

compiler/CHANGELOG.md

@@ -0,0 +1,59 @@
+## 19.1.0-rc.1 (April 21, 2025)
+
+## eslint-plugin-react-hooks
+* Temporarily disable ref access in render validation [#32839](https://github.com/facebook/react/pull/32839) by [@poteto](https://github.com/poteto)
+* Fix type error with recommended config [#32666](https://github.com/facebook/react/pull/32666) by [@niklasholm](https://github.com/niklasholm)
+* Merge rule from eslint-plugin-react-compiler into `react-hooks` plugin [#32416](https://github.com/facebook/react/pull/32416) by [@michaelfaith](https://github.com/michaelfaith)
+* Add dev dependencies for typescript migration [#32279](https://github.com/facebook/react/pull/32279) by [@michaelfaith](https://github.com/michaelfaith)
+* Support v9 context api [#32045](https://github.com/facebook/react/pull/32045) by [@michaelfaith](https://github.com/michaelfaith)
+* Support eslint 8+ flat plugin syntax out of the box for eslint-plugin-react-compiler [#32120](https://github.com/facebook/react/pull/32120) by [@orta](https://github.com/orta)
+
+## babel-plugin-react-compiler
+* Support satisfies operator [#32742](https://github.com/facebook/react/pull/32742) by [@rodrigofariow](https://github.com/rodrigofariow)
+* Fix inferEffectDependencies lint false positives [#32769](https://github.com/facebook/react/pull/32769) by [@mofeiZ](https://github.com/mofeiZ)
+* Fix hoisting of let declarations [#32724](https://github.com/facebook/react/pull/32724) by [@mofeiZ](https://github.com/mofeiZ)
+* Avoid failing builds when import specifiers conflict or shadow vars [#32663](https://github.com/facebook/react/pull/32663) by [@mofeiZ](https://github.com/mofeiZ)
+* Optimize components declared with arrow function and implicit return and `compilationMode: 'infer'` [#31792](https://github.com/facebook/react/pull/31792) by [@dimaMachina](https://github.com/dimaMachina)
+* Validate static components [#32683](https://github.com/facebook/react/pull/32683) by [@josephsavona](https://github.com/josephsavona)
+* Hoist dependencies from functions more conservatively [#32616](https://github.com/facebook/react/pull/32616) by [@mofeiZ](https://github.com/mofeiZ)
+* Implement NumericLiteral as ObjectPropertyKey [#31791](https://github.com/facebook/react/pull/31791) by [@dimaMachina](https://github.com/dimaMachina)
+* Avoid bailouts when inserting gating [#32598](https://github.com/facebook/react/pull/32598) by [@mofeiZ](https://github.com/mofeiZ)
+* Stop bailing out early for hoisted gated functions [#32597](https://github.com/facebook/react/pull/32597) by [@mofeiZ](https://github.com/mofeiZ)
+* Add shape for Array.from [#32522](https://github.com/facebook/react/pull/32522) by [@mofeiZ](https://github.com/mofeiZ)
+* Patch array and argument spread mutability [#32521](https://github.com/facebook/react/pull/32521) by [@mofeiZ](https://github.com/mofeiZ)
+* Make CompilerError compatible with reflection [#32539](https://github.com/facebook/react/pull/32539) by [@poteto](https://github.com/poteto)
+* Add simple walltime measurement [#32331](https://github.com/facebook/react/pull/32331) by [@poteto](https://github.com/poteto)
+* Improve error messages for unhandled terminal and instruction kinds [#32324](https://github.com/facebook/react/pull/32324) by [@inottn](https://github.com/inottn)
+* Handle TSInstantiationExpression in lowerExpression [#32302](https://github.com/facebook/react/pull/32302) by [@inottn](https://github.com/inottn)
+* Fix invalid Array.map type [#32095](https://github.com/facebook/react/pull/32095) by [@mofeiZ](https://github.com/mofeiZ)
+* Patch for JSX escape sequences in @babel/generator [#32131](https://github.com/facebook/react/pull/32131) by [@mofeiZ](https://github.com/mofeiZ)
+* `JSXText` emits incorrect with bracket [#32138](https://github.com/facebook/react/pull/32138) by [@himself65](https://github.com/himself65)
+* Validation against calling impure functions [#31960](https://github.com/facebook/react/pull/31960) by [@josephsavona](https://github.com/josephsavona)
+* Always target node [#32091](https://github.com/facebook/react/pull/32091) by [@poteto](https://github.com/poteto)
+* Patch compilationMode:infer object method edge case [#32055](https://github.com/facebook/react/pull/32055) by [@mofeiZ](https://github.com/mofeiZ)
+* Generate ts defs [#31994](https://github.com/facebook/react/pull/31994) by [@poteto](https://github.com/poteto)
+* Relax react peer dep requirement [#31915](https://github.com/facebook/react/pull/31915) by [@poteto](https://github.com/poteto)
+* Allow type cast expressions with refs [#31871](https://github.com/facebook/react/pull/31871) by [@josephsavona](https://github.com/josephsavona)
+* Add shape for global Object.keys [#31583](https://github.com/facebook/react/pull/31583) by [@mofeiZ](https://github.com/mofeiZ)
+* Optimize method calls w props receiver [#31775](https://github.com/facebook/react/pull/31775) by [@josephsavona](https://github.com/josephsavona)
+* Fix dropped ref with spread props in InlineJsxTransform [#31726](https://github.com/facebook/react/pull/31726) by [@jackpope](https://github.com/jackpope)
+* Support for non-declatation for in/of iterators [#31710](https://github.com/facebook/react/pull/31710) by [@mvitousek](https://github.com/mvitousek)
+* Support for context variable loop iterators [#31709](https://github.com/facebook/react/pull/31709) by [@mvitousek](https://github.com/mvitousek)
+* Replace deprecated dependency in `eslint-plugin-react-compiler` [#31629](https://github.com/facebook/react/pull/31629) by [@rakleed](https://github.com/rakleed)
+* Support enableRefAsProp in jsx transform [#31558](https://github.com/facebook/react/pull/31558) by [@jackpope](https://github.com/jackpope)
+* Fix: ref.current now correctly reactive [#31521](https://github.com/facebook/react/pull/31521) by [@mofeiZ](https://github.com/mofeiZ)
+* Outline JSX with non-jsx children [#31442](https://github.com/facebook/react/pull/31442) by [@gsathya](https://github.com/gsathya)
+* Outline jsx with duplicate attributes [#31441](https://github.com/facebook/react/pull/31441) by [@gsathya](https://github.com/gsathya)
+* Store original and new prop names [#31440](https://github.com/facebook/react/pull/31440) by [@gsathya](https://github.com/gsathya)
+* Stabilize compiler output: sort deps and decls by name [#31362](https://github.com/facebook/react/pull/31362) by [@mofeiZ](https://github.com/mofeiZ)
+* Bugfix for hoistable deps for nested functions [#31345](https://github.com/facebook/react/pull/31345) by [@mofeiZ](https://github.com/mofeiZ)
+* Remove compiler runtime-compat fixture library [#31430](https://github.com/facebook/react/pull/31430) by [@poteto](https://github.com/poteto)
+* Wrap inline jsx transform codegen in conditional [#31267](https://github.com/facebook/react/pull/31267) by [@jackpope](https://github.com/jackpope)
+* Check if local identifier is a hook when resolving globals [#31384](https://github.com/facebook/react/pull/31384) by [@poteto](https://github.com/poteto)
+* Handle member expr as computed property [#31344](https://github.com/facebook/react/pull/31344) by [@gsathya](https://github.com/gsathya)
+* Fix to ref access check to ban ref?.current [#31360](https://github.com/facebook/react/pull/31360) by [@mvitousek](https://github.com/mvitousek)
+* InlineJSXTransform transforms jsx inside function expressions [#31282](https://github.com/facebook/react/pull/31282) by [@josephsavona](https://github.com/josephsavona)
+
+## Other
+* Add shebang to banner [#32225](https://github.com/facebook/react/pull/32225) by [@Jeremy-Hibiki](https://github.com/Jeremy-Hibiki)
+* remove terser from react-compiler-runtime build [#31326](https://github.com/facebook/react/pull/31326) by [@henryqdineen](https://github.com/henryqdineen)

compiler/packages/react-mcp-server/package.json

@@ -19,12 +19,12 @@
     "@modelcontextprotocol/sdk": "^1.9.0",
     "algoliasearch": "^5.23.3",
     "cheerio": "^1.0.0",
+    "html-to-text": "^9.0.5",
     "prettier": "^3.3.3",
-    "turndown": "^7.2.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@types/turndown": "^5.0.5"
+    "@types/html-to-text": "^9.0.4"
   },
   "license": "MIT",
   "repository": {

compiler/packages/react-mcp-server/src/index.ts

@@ -5,10 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {
-  McpServer,
-  ResourceTemplate,
-} from '@modelcontextprotocol/sdk/server/mcp.js';
+import {McpServer} from '@modelcontextprotocol/sdk/server/mcp.js';
 import {StdioServerTransport} from '@modelcontextprotocol/sdk/server/stdio.js';
 import {z} from 'zod';
 import {compile, type PrintedCompilerPipelineValue} from './compiler';
@@ -20,82 +17,55 @@ import {
   SourceLocation,
 } from 'babel-plugin-react-compiler/src';
 import * as cheerio from 'cheerio';
-import TurndownService from 'turndown';
 import {queryAlgolia} from './utils/algolia';
 import assertExhaustive from './utils/assertExhaustive';
+import {convert} from 'html-to-text';
 
-const turndownService = new TurndownService();
 const server = new McpServer({
   name: 'React',
   version: '0.0.0',
 });
 
-function slugify(heading: string): string {
-  return heading
-    .split(' ')
-    .map(w => w.toLowerCase())
-    .join('-');
-}
-
-// TODO: how to verify this works?
-server.resource(
-  'docs',
-  new ResourceTemplate('docs://{message}', {list: undefined}),
-  async (_uri, {message}) => {
-    const hits = await queryAlgolia(message);
-    const deduped = new Map();
-    for (const hit of hits) {
-      // drop hashes to dedupe properly
-      const u = new URL(hit.url);
-      if (deduped.has(u.pathname)) {
-        continue;
+server.tool(
+  'query-react-dev-docs',
+  'Search/look up official docs from react.dev',
+  {
+    query: z.string(),
+  },
+  async ({query}) => {
+    try {
+      const pages = await queryAlgolia(query);
+      if (pages.length === 0) {
+        return {
+          content: [{type: 'text' as const, text: `No results`}],
+        };
       }
-      deduped.set(u.pathname, hit);
-    }
-    const pages: Array<string | null> = await Promise.all(
-      Array.from(deduped.values()).map(hit => {
-        return fetch(hit.url, {
-          headers: {
-            'User-Agent':
-              'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36',
-          },
-        }).then(res => {
-          if (res.ok === true) {
-            return res.text();
-          } else {
-            console.error(
-              `Could not fetch docs: ${res.status} ${res.statusText}`,
-            );
-            return null;
-          }
-        });
-      }),
-    );
-
-    const resultsMarkdown = pages
-      .filter(html => html !== null)
-      .map(html => {
+      const content = pages.map(html => {
         const $ = cheerio.load(html);
-        const title = encodeURIComponent(slugify($('h1').text()));
         // react.dev should always have at least one <article> with the main content
         const article = $('article').html();
         if (article != null) {
           return {
-            uri: `docs://${title}`,
-            text: turndownService.turndown(article),
+            type: 'text' as const,
+            text: convert(article),
           };
         } else {
           return {
-            uri: `docs://${title}`,
-            // Fallback to converting the whole page to markdown
-            text: turndownService.turndown($.html()),
+            type: 'text' as const,
+            // Fallback to converting the whole page to text.
+            text: convert($.html()),
           };
         }
       });
-
-    return {
-      contents: resultsMarkdown,
-    };
+      return {
+        content,
+      };
+    } catch (err) {
+      return {
+        isError: true,
+        content: [{type: 'text' as const, text: `Error: ${err.stack}`}],
+      };
+    }
   },
 );
 
@@ -341,10 +311,8 @@ Design for a good user experience - Provide clear, minimal, and non-blocking UI
 
 Server Components - Shift data-heavy logic to the server whenever possible. Break up the more static parts of the app into server components. Break up data fetching into server components. Only client components (denoted by the 'use client' top level directive) need interactivity. By rendering parts of your UI on the server, you reduce the client-side JavaScript needed and avoid sending unnecessary data over the wire. Use Server Components to prefetch and pre-render data, allowing faster initial loads and smaller bundle sizes. This also helps manage or eliminate certain waterfalls by resolving data on the server before streaming the HTML (and partial React tree) to the client.
 
-## Available Resources
-- 'docs': Look up documentation from docs://{query}. Returns markdown as a string.
-
 ## Available Tools
+- 'docs': Look up documentation from react.dev. Returns text as a string.
 - 'compile': Run the user's code through React Compiler. Returns optimized JS/TS code with potential diagnostics.
 
 ## Process

compiler/packages/react-mcp-server/src/utils/algolia.ts

@@ -44,7 +44,7 @@ export function printHierarchy(
 
 export async function queryAlgolia(
   message: string | Array<string>,
-): Promise<Hit<DocSearchHit>[]> {
+): Promise<Array<string>> {
   const {results} = await ALGOLIA_CLIENT.search<DocSearchHit>({
     requests: [
       {
@@ -87,5 +87,33 @@ export async function queryAlgolia(
   });
   const firstResult = results[0] as SearchResponse<DocSearchHit>;
   const {hits} = firstResult;
-  return hits;
+  const deduped = new Map();
+  for (const hit of hits) {
+    // drop hashes to dedupe properly
+    const u = new URL(hit.url);
+    if (deduped.has(u.pathname)) {
+      continue;
+    }
+    deduped.set(u.pathname, hit);
+  }
+  const pages: Array<string | null> = await Promise.all(
+    Array.from(deduped.values()).map(hit => {
+      return fetch(hit.url, {
+        headers: {
+          'User-Agent':
+            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36',
+        },
+      }).then(res => {
+        if (res.ok === true) {
+          return res.text();
+        } else {
+          console.error(
+            `Could not fetch docs: ${res.status} ${res.statusText}`,
+          );
+          return null;
+        }
+      });
+    }),
+  );
+  return pages.filter(page => page !== null);
 }