From 23274d5c0542404f6414de3549b76476811e971f Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Mon, 6 May 2024 15:27:05 -0700
Subject: [PATCH 01/30] unit test

---
 .../__tests__/unit/LexicalComposer.test.tsx   | 57 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx b/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx
index 2a79c9bc636..145192b1287 100644
--- a/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx
+++ b/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx
@@ -7,13 +7,19 @@
  */
 
 import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {
+  $createParagraphNode,
+  $createTextNode,
+  $getRoot,
+  LexicalEditor,
+} from 'lexical';
 import * as React from 'react';
 import {createRoot, Root} from 'react-dom/client';
 import * as ReactTestUtils from 'react-dom/test-utils';
 
 import {LexicalComposer} from '../../LexicalComposer';
 
-describe('LexicalNodeHelpers tests', () => {
+describe('LexicalComposer tests', () => {
   let container: HTMLDivElement | null = null;
   let reactRoot: Root;
 
@@ -59,4 +65,53 @@ describe('LexicalNodeHelpers tests', () => {
       reactRoot.render(<App />);
     });
   });
+
+  describe('LexicalComposerContext editor identity', () => {
+    (
+      [
+        {name: 'StrictMode', size: 2},
+        {name: 'Fragment', size: 1},
+      ] as const
+    ).forEach(({name, size}) => {
+      const Wrapper = React[name];
+      const editors = new Set<LexicalEditor>();
+      function App() {
+        return (
+          <LexicalComposer
+            initialConfig={{
+              editorState(editor) {
+                editors.add(editor);
+                editor.update(() => {
+                  const p = $createParagraphNode();
+                  p.append($createTextNode('initial state'));
+                  $getRoot().append(p);
+                });
+              },
+              namespace: '',
+              nodes: [],
+              onError: () => {
+                throw Error();
+              },
+            }}
+          />
+        );
+      }
+      it(`renders ${size} editors under ${name}`, async () => {
+        await ReactTestUtils.act(async () => {
+          reactRoot.render(
+            <Wrapper>
+              <App />
+            </Wrapper>,
+          );
+        });
+        expect(editors.size).toBe(size);
+        [...editors].forEach((editor, i) => {
+          expect([
+            i,
+            editor.getEditorState().read(() => $getRoot().getTextContent()),
+          ]).toEqual([i, 'initial state']);
+        });
+      });
+    });
+  });
 });

From e5e470db50cb18989ac3e70f01a69b93916f4874 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Mon, 13 May 2024 09:18:50 -0700
Subject: [PATCH 02/30] try the unit tests with react beta

---
 .github/workflows/call-core-tests.yml    |   5 +
 .github/workflows/call-e2e-all-tests.yml | 121 +++++++++++++++++++----
 2 files changed, 108 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/call-core-tests.yml b/.github/workflows/call-core-tests.yml
index e6f1d5c2bd5..586dcca2323 100644
--- a/.github/workflows/call-core-tests.yml
+++ b/.github/workflows/call-core-tests.yml
@@ -30,6 +30,7 @@ jobs:
     strategy:
       matrix:
         node-version: [18.18.0]
+        react-override: ['', 'beta']
     env:
       CI: true
     steps:
@@ -41,6 +42,10 @@ jobs:
           cache: npm
       - name: Install dependencies
         run: npm ci
+      - name: Override React ${{ matrix.react-override }}
+        if: matrix.react-override != ''
+        # This should be safe since we are caching ~/.npm and not node_modules
+        run: npm i --no-save react@${{ matrix.react-override }} react-dom@${{ matrix.react-override }}
       - run: npm run test-unit
 
   integration:
diff --git a/.github/workflows/call-e2e-all-tests.yml b/.github/workflows/call-e2e-all-tests.yml
index 2b5a9475df0..7c740b61d9d 100644
--- a/.github/workflows/call-e2e-all-tests.yml
+++ b/.github/workflows/call-e2e-all-tests.yml
@@ -1,17 +1,95 @@
-name: Lexical e2e tests
+name: Lexical Tests
 
 on:
-  workflow_call:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'packages/lexical-website/**'
+  pull_request:
+    types: [opened, synchronize, reopened]
+    paths-ignore:
+      - 'packages/lexical-website/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  mac:
+  integrity:
+    if: github.repository_owner == 'facebook'
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20.11.0]
+    env:
+      CI: true
+      GITHUB_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: npm
+      - name: Install dependencies
+        run: npm ci
+      - run: npm run ci-check
+      - run: npm run build
+      - run: npm run build-www
+
+  unit:
+    if: github.repository_owner == 'facebook'
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.18.0]
+        react-override: ['', 'beta']
+    env:
+      CI: true
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: npm
+      - name: Install dependencies
+        run: npm ci
+      - name: Override React ${{ matrix.react-override }}
+        if: matrix.react-override != ''
+        # This should be safe since we are caching ~/.npm and not node_modules
+        run: npm i --no-save react@${{ matrix.react-override }} react-dom@${{ matrix.react-override }}
+      - run: npm run test-unit
+
+  integration:
+    if: github.repository_owner == 'facebook'
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.18.0]
+    env:
+      CI: true
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: npm
+      - name: Install dependencies
+        run: npm ci
+      - run: npm run test-integration
+
+  e2e-mac:
+    if: github.repository_owner == 'facebook'
     strategy:
       matrix:
         node-version: [18.18.0]
         browser: ['chromium', 'firefox', 'webkit']
         editor-mode: ['rich-text', 'plain-text']
         events-mode: ['legacy-events', 'modern-events']
-    uses: ./.github/workflows/call-e2e-test.yml
+    uses: ./.github/workflows/e2e-test.yml
     with:
       os: 'macos-latest'
       node-version: ${{ matrix.node-version }}
@@ -19,14 +97,15 @@ jobs:
       editor-mode: ${{ matrix.editor-mode }}
       events-mode: ${{ matrix.events-mode }}
 
-  linux:
+  e2e-linux:
+    if: github.repository_owner == 'facebook'
     strategy:
       matrix:
         node-version: [18.18.0]
         browser: ['chromium', 'firefox']
         editor-mode: ['rich-text', 'plain-text']
         events-mode: ['legacy-events', 'modern-events']
-    uses: ./.github/workflows/call-e2e-test.yml
+    uses: ./.github/workflows/e2e-test.yml
     with:
       os: 'ubuntu-latest'
       node-version: ${{ matrix.node-version }}
@@ -34,14 +113,15 @@ jobs:
       editor-mode: ${{ matrix.editor-mode }}
       events-mode: ${{ matrix.events-mode }}
 
-  windows:
+  e2e-windows:
+    if: github.repository_owner == 'facebook'
     strategy:
       matrix:
         node-version: [18.18.0]
         browser: ['chromium', 'firefox']
         editor-mode: ['rich-text', 'plain-text']
         events-mode: ['legacy-events', 'modern-events']
-    uses: ./.github/workflows/call-e2e-test.yml
+    uses: ./.github/workflows/e2e-test.yml
     with:
       os: 'windows-latest'
       node-version: ${{ matrix.node-version }}
@@ -49,12 +129,13 @@ jobs:
       editor-mode: ${{ matrix.editor-mode }}
       events-mode: ${{ matrix.events-mode }}
 
-  collab-mac:
+  e2e-collab-mac:
+    if: github.repository_owner == 'facebook'
     strategy:
       matrix:
         node-version: [18.18.0]
         browser: ['chromium', 'firefox', 'webkit']
-    uses: ./.github/workflows/call-e2e-test.yml
+    uses: ./.github/workflows/e2e-test.yml
     with:
       os: 'macos-latest'
       node-version: ${{ matrix.node-version }}
@@ -62,12 +143,13 @@ jobs:
       editor-mode: 'rich-text-with-collab'
       events-mode: 'modern-events'
 
-  collab-linux:
+  e2e-collab-linux:
+    if: github.repository_owner == 'facebook'
     strategy:
       matrix:
         node-version: [18.18.0]
         browser: ['chromium', 'firefox']
-    uses: ./.github/workflows/call-e2e-test.yml
+    uses: ./.github/workflows/e2e-test.yml
     with:
       os: 'ubuntu-latest'
       node-version: ${{ matrix.node-version }}
@@ -75,12 +157,13 @@ jobs:
       editor-mode: 'rich-text-with-collab'
       events-mode: 'modern-events'
 
-  collab-windows:
+  e2e-collab-windows:
+    if: github.repository_owner == 'facebook'
     strategy:
       matrix:
         node-version: [18.18.0]
         browser: ['chromium', 'firefox']
-    uses: ./.github/workflows/call-e2e-test.yml
+    uses: ./.github/workflows/e2e-test.yml
     with:
       os: 'windows-latest'
       node-version: ${{ matrix.node-version }}
@@ -88,7 +171,8 @@ jobs:
       editor-mode: 'rich-text-with-collab'
       events-mode: 'modern-events'
 
-  prod:
+  e2e-prod:
+    if: github.repository_owner == 'facebook'
     strategy:
       matrix:
         os: ['macos-latest']
@@ -96,7 +180,7 @@ jobs:
         browser: ['chromium']
         editor-mode: ['rich-text']
         events-mode: ['modern-events']
-    uses: ./.github/workflows/call-e2e-test.yml
+    uses: ./.github/workflows/e2e-test.yml
     with:
       prod: true
       os: ${{ matrix.os }}
@@ -105,7 +189,8 @@ jobs:
       editor-mode: ${{ matrix.editor-mode }}
       events-mode: ${{ matrix.events-mode }}
 
-  collab-prod:
+  e2e-collab-prod:
+    if: github.repository_owner == 'facebook'
     strategy:
       matrix:
         os: ['macos-latest']
@@ -113,7 +198,7 @@ jobs:
         browser: ['chromium']
         editor-mode: ['rich-text-with-collab']
         events-mode: ['modern-events']
-    uses: ./.github/workflows/call-e2e-test.yml
+    uses: ./.github/workflows/e2e-test.yml
     with:
       prod: true
       os: ${{ matrix.os }}

From 8cd0664de7613d7a9cf6b0ed86cac1d56f2fd48e Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Tue, 7 May 2024 07:57:02 -0700
Subject: [PATCH 03/30] Silence __DEV__ ArtificialNode__DO_NOT_USE warnings

---
 packages/lexical/src/LexicalEditor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/lexical/src/LexicalEditor.ts b/packages/lexical/src/LexicalEditor.ts
index 7c03d00c790..6b1d1c7e8d3 100644
--- a/packages/lexical/src/LexicalEditor.ts
+++ b/packages/lexical/src/LexicalEditor.ts
@@ -447,7 +447,7 @@ export function createEditor(editorConfig?: CreateEditorArgs): LexicalEditor {
       // Ensure custom nodes implement required methods.
       if (__DEV__) {
         const name = klass.name;
-        if (name !== 'RootNode') {
+        if (name !== 'RootNode' && name !== 'ArtificialNode__DO_NOT_USE') {
           const proto = klass.prototype;
           ['getType', 'clone'].forEach((method) => {
             // eslint-disable-next-line no-prototype-builtins

From 7f470c01aa508f73c8d3bb31b19ca909012e8ac0 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Tue, 7 May 2024 08:04:19 -0700
Subject: [PATCH 04/30] handle react-dom/test-utils deprecation

---
 packages/lexical-devtools/tsconfig.json        |  1 +
 .../src/__tests__/unit/LexicalHistory.test.tsx |  2 +-
 .../__tests__/unit/LexicalComposer.test.tsx    |  2 +-
 .../unit/PlainRichTextPlugin.test.tsx          |  2 +-
 .../unit/useLexicalIsTextContentEmpty.test.tsx |  2 +-
 .../lexical-react/src/__tests__/unit/utils.tsx |  2 +-
 .../__tests__/unit/LexicalSelection.test.tsx   |  2 +-
 .../unit/LexicalTableSelection.test.tsx        |  2 +-
 .../unit/LexicalEventHelpers.test.tsx          |  2 +-
 .../src/__tests__/unit/LexicalEditor.test.tsx  |  2 +-
 .../__tests__/unit/LexicalListPlugin.test.tsx  |  2 +-
 packages/lexical/src/__tests__/utils/index.tsx |  2 +-
 .../__tests__/unit/LexicalElementNode.test.tsx |  2 +-
 .../__tests__/unit/LexicalTextNode.test.tsx    |  2 +-
 packages/shared/src/react-test-utils.ts        | 18 ++++++++++++++++++
 tsconfig.build.json                            |  1 +
 tsconfig.json                                  |  1 +
 17 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 packages/shared/src/react-test-utils.ts

diff --git a/packages/lexical-devtools/tsconfig.json b/packages/lexical-devtools/tsconfig.json
index 8978b961e03..ddfcd95c055 100644
--- a/packages/lexical-devtools/tsconfig.json
+++ b/packages/lexical-devtools/tsconfig.json
@@ -158,6 +158,7 @@
       "shared/environment": ["../shared/src/environment.ts"],
       "shared/invariant": ["../shared/src/invariant.ts"],
       "shared/normalizeClassNames": ["../shared/src/normalizeClassNames.ts"],
+      "shared/react-test-utils": ["../shared/src/react-test-utils.ts"],
       "shared/simpleDiffWithCursor": ["../shared/src/simpleDiffWithCursor.ts"],
       "shared/useLayoutEffect": ["../shared/src/useLayoutEffect.ts"],
       "shared/warnOnlyOnce": ["../shared/src/warnOnlyOnce.ts"]
diff --git a/packages/lexical-history/src/__tests__/unit/LexicalHistory.test.tsx b/packages/lexical-history/src/__tests__/unit/LexicalHistory.test.tsx
index 804defbd8b2..057f6b75240 100644
--- a/packages/lexical-history/src/__tests__/unit/LexicalHistory.test.tsx
+++ b/packages/lexical-history/src/__tests__/unit/LexicalHistory.test.tsx
@@ -35,7 +35,7 @@ import {
 import {createTestEditor, TestComposer} from 'lexical/src/__tests__/utils';
 import React from 'react';
 import {createRoot, Root} from 'react-dom/client';
-import * as ReactTestUtils from 'react-dom/test-utils';
+import * as ReactTestUtils from 'shared/react-test-utils';
 
 describe('LexicalHistory tests', () => {
   let container: HTMLDivElement | null = null;
diff --git a/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx b/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx
index 145192b1287..ae9da26b1e8 100644
--- a/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx
+++ b/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx
@@ -15,7 +15,7 @@ import {
 } from 'lexical';
 import * as React from 'react';
 import {createRoot, Root} from 'react-dom/client';
-import * as ReactTestUtils from 'react-dom/test-utils';
+import * as ReactTestUtils from 'shared/react-test-utils';
 
 import {LexicalComposer} from '../../LexicalComposer';
 
diff --git a/packages/lexical-react/src/__tests__/unit/PlainRichTextPlugin.test.tsx b/packages/lexical-react/src/__tests__/unit/PlainRichTextPlugin.test.tsx
index 42bfea40230..60f5c8b269d 100644
--- a/packages/lexical-react/src/__tests__/unit/PlainRichTextPlugin.test.tsx
+++ b/packages/lexical-react/src/__tests__/unit/PlainRichTextPlugin.test.tsx
@@ -26,7 +26,7 @@ import {
 } from 'lexical';
 import * as React from 'react';
 import {createRoot, Root} from 'react-dom/client';
-import * as ReactTestUtils from 'react-dom/test-utils';
+import * as ReactTestUtils from 'shared/react-test-utils';
 
 import {LexicalComposer} from '../../LexicalComposer';
 import {ContentEditable} from '../../LexicalContentEditable';
diff --git a/packages/lexical-react/src/__tests__/unit/useLexicalIsTextContentEmpty.test.tsx b/packages/lexical-react/src/__tests__/unit/useLexicalIsTextContentEmpty.test.tsx
index 652946f168b..9d1c30f7bdf 100644
--- a/packages/lexical-react/src/__tests__/unit/useLexicalIsTextContentEmpty.test.tsx
+++ b/packages/lexical-react/src/__tests__/unit/useLexicalIsTextContentEmpty.test.tsx
@@ -17,7 +17,7 @@ import {
 import * as React from 'react';
 import {createRef} from 'react';
 import {createRoot, Root} from 'react-dom/client';
-import * as ReactTestUtils from 'react-dom/test-utils';
+import * as ReactTestUtils from 'shared/react-test-utils';
 
 import {useLexicalIsTextContentEmpty} from '../../useLexicalIsTextContentEmpty';
 
diff --git a/packages/lexical-react/src/__tests__/unit/utils.tsx b/packages/lexical-react/src/__tests__/unit/utils.tsx
index c8c4beeba72..32c75551785 100644
--- a/packages/lexical-react/src/__tests__/unit/utils.tsx
+++ b/packages/lexical-react/src/__tests__/unit/utils.tsx
@@ -11,7 +11,7 @@ import {LexicalEditor} from 'lexical';
 import * as React from 'react';
 import {Container} from 'react-dom';
 import {createRoot, Root} from 'react-dom/client';
-import * as ReactTestUtils from 'react-dom/test-utils';
+import * as ReactTestUtils from 'shared/react-test-utils';
 import * as Y from 'yjs';
 
 import {useCollaborationContext} from '../../LexicalCollaborationContext';
diff --git a/packages/lexical-selection/src/__tests__/unit/LexicalSelection.test.tsx b/packages/lexical-selection/src/__tests__/unit/LexicalSelection.test.tsx
index 07b63a7f519..d2acde40cfa 100644
--- a/packages/lexical-selection/src/__tests__/unit/LexicalSelection.test.tsx
+++ b/packages/lexical-selection/src/__tests__/unit/LexicalSelection.test.tsx
@@ -48,7 +48,7 @@ import {
   TestComposer,
 } from 'lexical/src/__tests__/utils';
 import {createRoot} from 'react-dom/client';
-import * as ReactTestUtils from 'react-dom/test-utils';
+import * as ReactTestUtils from 'shared/react-test-utils';
 
 import {
   $setAnchorPoint,
diff --git a/packages/lexical-table/src/__tests__/unit/LexicalTableSelection.test.tsx b/packages/lexical-table/src/__tests__/unit/LexicalTableSelection.test.tsx
index 7112c101222..a3dab04aef0 100644
--- a/packages/lexical-table/src/__tests__/unit/LexicalTableSelection.test.tsx
+++ b/packages/lexical-table/src/__tests__/unit/LexicalTableSelection.test.tsx
@@ -21,7 +21,7 @@ import {
 import {createTestEditor} from 'lexical/src/__tests__/utils';
 import {createRef, useEffect, useMemo} from 'react';
 import {createRoot, Root} from 'react-dom/client';
-import * as ReactTestUtils from 'react-dom/test-utils';
+import * as ReactTestUtils from 'shared/react-test-utils';
 
 describe('table selection', () => {
   let originalText: TextNode;
diff --git a/packages/lexical-utils/src/__tests__/unit/LexicalEventHelpers.test.tsx b/packages/lexical-utils/src/__tests__/unit/LexicalEventHelpers.test.tsx
index 089dd086ad1..162ffcfd281 100644
--- a/packages/lexical-utils/src/__tests__/unit/LexicalEventHelpers.test.tsx
+++ b/packages/lexical-utils/src/__tests__/unit/LexicalEventHelpers.test.tsx
@@ -25,7 +25,7 @@ import {TableCellNode, TableNode, TableRowNode} from '@lexical/table';
 import {LexicalEditor} from 'lexical';
 import {initializeClipboard, TestComposer} from 'lexical/src/__tests__/utils';
 import {createRoot} from 'react-dom/client';
-import * as ReactTestUtils from 'react-dom/test-utils';
+import * as ReactTestUtils from 'shared/react-test-utils';
 
 jest.mock('shared/environment', () => {
   const originalModule = jest.requireActual('shared/environment');
diff --git a/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx b/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx
index 2efc5c7309e..94197ff270e 100644
--- a/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx
+++ b/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx
@@ -50,7 +50,7 @@ import {
 } from 'react';
 import {createPortal} from 'react-dom';
 import {createRoot, Root} from 'react-dom/client';
-import * as ReactTestUtils from 'react-dom/test-utils';
+import * as ReactTestUtils from 'shared/react-test-utils';
 
 import {
   $createTestDecoratorNode,
diff --git a/packages/lexical/src/__tests__/unit/LexicalListPlugin.test.tsx b/packages/lexical/src/__tests__/unit/LexicalListPlugin.test.tsx
index f9e6544fe95..dcd9c3b6bba 100644
--- a/packages/lexical/src/__tests__/unit/LexicalListPlugin.test.tsx
+++ b/packages/lexical/src/__tests__/unit/LexicalListPlugin.test.tsx
@@ -22,7 +22,7 @@ import {
   TestComposer,
 } from 'lexical/src/__tests__/utils';
 import {createRoot, Root} from 'react-dom/client';
-import * as ReactTestUtils from 'react-dom/test-utils';
+import * as ReactTestUtils from 'shared/react-test-utils';
 
 import {
   INSERT_UNORDERED_LIST_COMMAND,
diff --git a/packages/lexical/src/__tests__/utils/index.tsx b/packages/lexical/src/__tests__/utils/index.tsx
index c09e062d8f0..3861e8c7f6e 100644
--- a/packages/lexical/src/__tests__/utils/index.tsx
+++ b/packages/lexical/src/__tests__/utils/index.tsx
@@ -43,7 +43,7 @@ import {format} from 'prettier';
 import * as React from 'react';
 import {createRef} from 'react';
 import {createRoot} from 'react-dom/client';
-import * as ReactTestUtils from 'react-dom/test-utils';
+import * as ReactTestUtils from 'shared/react-test-utils';
 
 import {CreateEditorArgs, LexicalNodeReplacement} from '../../LexicalEditor';
 import {resetRandomKey} from '../../LexicalUtils';
diff --git a/packages/lexical/src/nodes/__tests__/unit/LexicalElementNode.test.tsx b/packages/lexical/src/nodes/__tests__/unit/LexicalElementNode.test.tsx
index 94090d32746..21e9ed3c899 100644
--- a/packages/lexical/src/nodes/__tests__/unit/LexicalElementNode.test.tsx
+++ b/packages/lexical/src/nodes/__tests__/unit/LexicalElementNode.test.tsx
@@ -19,7 +19,7 @@ import {
 import * as React from 'react';
 import {createRef, useEffect} from 'react';
 import {createRoot} from 'react-dom/client';
-import * as ReactTestUtils from 'react-dom/test-utils';
+import * as ReactTestUtils from 'shared/react-test-utils';
 
 import {
   $createTestElementNode,
diff --git a/packages/lexical/src/nodes/__tests__/unit/LexicalTextNode.test.tsx b/packages/lexical/src/nodes/__tests__/unit/LexicalTextNode.test.tsx
index a90e2de3300..b034c96814a 100644
--- a/packages/lexical/src/nodes/__tests__/unit/LexicalTextNode.test.tsx
+++ b/packages/lexical/src/nodes/__tests__/unit/LexicalTextNode.test.tsx
@@ -24,7 +24,7 @@ import {
 import * as React from 'react';
 import {createRef, useEffect, useMemo} from 'react';
 import {createRoot} from 'react-dom/client';
-import * as ReactTestUtils from 'react-dom/test-utils';
+import * as ReactTestUtils from 'shared/react-test-utils';
 
 import {
   $createTestSegmentedNode,
diff --git a/packages/shared/src/react-test-utils.ts b/packages/shared/src/react-test-utils.ts
new file mode 100644
index 00000000000..8e086744d5e
--- /dev/null
+++ b/packages/shared/src/react-test-utils.ts
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+import * as React from 'react';
+import * as ReactTestUtils from 'react-dom/test-utils';
+
+/**
+ * React 19 moved act from react-dom/test-utils to react
+ * https://react.dev/blog/2024/04/25/react-19-upgrade-guide#removed-react-dom-test-utils
+ */
+export const act =
+  'act' in React
+    ? (React.act as typeof ReactTestUtils.act)
+    : ReactTestUtils.act;
diff --git a/tsconfig.build.json b/tsconfig.build.json
index 6b35fbf19ed..0de1e087418 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -161,6 +161,7 @@
       "shared/normalizeClassNames": [
         "./packages/shared/src/normalizeClassNames.ts"
       ],
+      "shared/react-test-utils": ["./packages/shared/src/react-test-utils.ts"],
       "shared/simpleDiffWithCursor": [
         "./packages/shared/src/simpleDiffWithCursor.ts"
       ],
diff --git a/tsconfig.json b/tsconfig.json
index e106a0d58b1..2e1958aa7f8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -169,6 +169,7 @@
       "shared/normalizeClassNames": [
         "./packages/shared/src/normalizeClassNames.ts"
       ],
+      "shared/react-test-utils": ["./packages/shared/src/react-test-utils.ts"],
       "shared/simpleDiffWithCursor": [
         "./packages/shared/src/simpleDiffWithCursor.ts"
       ],

From e275d04a80a25c404745d6a0187d2b69680343ac Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Tue, 7 May 2024 09:17:55 -0700
Subject: [PATCH 05/30] e2e with beta

---
 .github/workflows/call-e2e-all-tests.yml | 136 ++++++-----------------
 .github/workflows/call-e2e-test.yml      |  10 +-
 2 files changed, 42 insertions(+), 104 deletions(-)

diff --git a/.github/workflows/call-e2e-all-tests.yml b/.github/workflows/call-e2e-all-tests.yml
index 7c740b61d9d..cdf48c23605 100644
--- a/.github/workflows/call-e2e-all-tests.yml
+++ b/.github/workflows/call-e2e-all-tests.yml
@@ -1,95 +1,17 @@
-name: Lexical Tests
+name: Lexical e2e tests
 
 on:
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - 'packages/lexical-website/**'
-  pull_request:
-    types: [opened, synchronize, reopened]
-    paths-ignore:
-      - 'packages/lexical-website/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  workflow_call:
 
 jobs:
-  integrity:
-    if: github.repository_owner == 'facebook'
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20.11.0]
-    env:
-      CI: true
-      GITHUB_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: npm
-      - name: Install dependencies
-        run: npm ci
-      - run: npm run ci-check
-      - run: npm run build
-      - run: npm run build-www
-
-  unit:
-    if: github.repository_owner == 'facebook'
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [18.18.0]
-        react-override: ['', 'beta']
-    env:
-      CI: true
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: npm
-      - name: Install dependencies
-        run: npm ci
-      - name: Override React ${{ matrix.react-override }}
-        if: matrix.react-override != ''
-        # This should be safe since we are caching ~/.npm and not node_modules
-        run: npm i --no-save react@${{ matrix.react-override }} react-dom@${{ matrix.react-override }}
-      - run: npm run test-unit
-
-  integration:
-    if: github.repository_owner == 'facebook'
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [18.18.0]
-    env:
-      CI: true
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: npm
-      - name: Install dependencies
-        run: npm ci
-      - run: npm run test-integration
-
-  e2e-mac:
-    if: github.repository_owner == 'facebook'
+  mac:
     strategy:
       matrix:
         node-version: [18.18.0]
         browser: ['chromium', 'firefox', 'webkit']
         editor-mode: ['rich-text', 'plain-text']
         events-mode: ['legacy-events', 'modern-events']
-    uses: ./.github/workflows/e2e-test.yml
+    uses: ./.github/workflows/call-e2e-test.yml
     with:
       os: 'macos-latest'
       node-version: ${{ matrix.node-version }}
@@ -97,15 +19,14 @@ jobs:
       editor-mode: ${{ matrix.editor-mode }}
       events-mode: ${{ matrix.events-mode }}
 
-  e2e-linux:
-    if: github.repository_owner == 'facebook'
+  linux:
     strategy:
       matrix:
         node-version: [18.18.0]
         browser: ['chromium', 'firefox']
         editor-mode: ['rich-text', 'plain-text']
         events-mode: ['legacy-events', 'modern-events']
-    uses: ./.github/workflows/e2e-test.yml
+    uses: ./.github/workflows/call-e2e-test.yml
     with:
       os: 'ubuntu-latest'
       node-version: ${{ matrix.node-version }}
@@ -113,15 +34,14 @@ jobs:
       editor-mode: ${{ matrix.editor-mode }}
       events-mode: ${{ matrix.events-mode }}
 
-  e2e-windows:
-    if: github.repository_owner == 'facebook'
+  windows:
     strategy:
       matrix:
         node-version: [18.18.0]
         browser: ['chromium', 'firefox']
         editor-mode: ['rich-text', 'plain-text']
         events-mode: ['legacy-events', 'modern-events']
-    uses: ./.github/workflows/e2e-test.yml
+    uses: ./.github/workflows/call-e2e-test.yml
     with:
       os: 'windows-latest'
       node-version: ${{ matrix.node-version }}
@@ -129,13 +49,12 @@ jobs:
       editor-mode: ${{ matrix.editor-mode }}
       events-mode: ${{ matrix.events-mode }}
 
-  e2e-collab-mac:
-    if: github.repository_owner == 'facebook'
+  collab-mac:
     strategy:
       matrix:
         node-version: [18.18.0]
         browser: ['chromium', 'firefox', 'webkit']
-    uses: ./.github/workflows/e2e-test.yml
+    uses: ./.github/workflows/call-e2e-test.yml
     with:
       os: 'macos-latest'
       node-version: ${{ matrix.node-version }}
@@ -143,13 +62,12 @@ jobs:
       editor-mode: 'rich-text-with-collab'
       events-mode: 'modern-events'
 
-  e2e-collab-linux:
-    if: github.repository_owner == 'facebook'
+  collab-linux:
     strategy:
       matrix:
         node-version: [18.18.0]
         browser: ['chromium', 'firefox']
-    uses: ./.github/workflows/e2e-test.yml
+    uses: ./.github/workflows/call-e2e-test.yml
     with:
       os: 'ubuntu-latest'
       node-version: ${{ matrix.node-version }}
@@ -157,13 +75,12 @@ jobs:
       editor-mode: 'rich-text-with-collab'
       events-mode: 'modern-events'
 
-  e2e-collab-windows:
-    if: github.repository_owner == 'facebook'
+  collab-windows:
     strategy:
       matrix:
         node-version: [18.18.0]
         browser: ['chromium', 'firefox']
-    uses: ./.github/workflows/e2e-test.yml
+    uses: ./.github/workflows/call-e2e-test.yml
     with:
       os: 'windows-latest'
       node-version: ${{ matrix.node-version }}
@@ -171,8 +88,7 @@ jobs:
       editor-mode: 'rich-text-with-collab'
       events-mode: 'modern-events'
 
-  e2e-prod:
-    if: github.repository_owner == 'facebook'
+  prod:
     strategy:
       matrix:
         os: ['macos-latest']
@@ -180,7 +96,7 @@ jobs:
         browser: ['chromium']
         editor-mode: ['rich-text']
         events-mode: ['modern-events']
-    uses: ./.github/workflows/e2e-test.yml
+    uses: ./.github/workflows/call-e2e-test.yml
     with:
       prod: true
       os: ${{ matrix.os }}
@@ -189,8 +105,7 @@ jobs:
       editor-mode: ${{ matrix.editor-mode }}
       events-mode: ${{ matrix.events-mode }}
 
-  e2e-collab-prod:
-    if: github.repository_owner == 'facebook'
+  collab-prod:
     strategy:
       matrix:
         os: ['macos-latest']
@@ -198,7 +113,7 @@ jobs:
         browser: ['chromium']
         editor-mode: ['rich-text-with-collab']
         events-mode: ['modern-events']
-    uses: ./.github/workflows/e2e-test.yml
+    uses: ./.github/workflows/call-e2e-test.yml
     with:
       prod: true
       os: ${{ matrix.os }}
@@ -206,3 +121,18 @@ jobs:
       browser: ${{ matrix.browser }}
       editor-mode: ${{ matrix.editor-mode }}
       events-mode: ${{ matrix.events-mode }}
+
+  react-beta:
+    strategy:
+      matrix:
+        editor-mode: ['rich-text', 'rich-text-with-collab']
+        prod: [false, true]
+    uses: ./.github/workflows/call-e2e-test.yml
+    with:
+      os: 'macos-latest'
+      browser: 'chromium'
+      node-version: 18.18.0
+      events-mode: 'modern-events'
+      editor-mode: ${{ matrix.editor-mode }}
+      prod: ${{ matrix.prod }}
+      react-override: beta
diff --git a/.github/workflows/call-e2e-test.yml b/.github/workflows/call-e2e-test.yml
index 48e14617237..84873a376cf 100644
--- a/.github/workflows/call-e2e-test.yml
+++ b/.github/workflows/call-e2e-test.yml
@@ -9,6 +9,7 @@ on:
       editor-mode: {required: true, type: string}
       events-mode: {required: true, type: string}
       prod: {required: false, type: boolean}
+      react-override: {required: false, type: string}
 
 jobs:
   e2e-test:
@@ -18,6 +19,7 @@ jobs:
       CI: true
       E2E_EDITOR_MODE: ${{ inputs.editor-mode }}
       E2E_EVENTS_MODE: ${{ inputs.events-mode }}
+      REACT_OVERRIDE: ${{ inputs.react-override }}
       cache_playwright_path: ${{ inputs.os == 'macos-latest' && '~/Library/Caches/ms-playwright' || inputs.os == 'windows-latest' && 'C:\Users\runneradmin\AppData\Local\ms-playwright' || '~/.cache/ms-playwright' }}
       test_results_path: ${{ inputs.os == 'windows-latest' && '~/.npm/_logs/' || 'test-results/' }}
       test_script: test-e2e-${{ inputs.editor-mode == 'rich-text-with-collab' && 'collab-' || '' }}${{ inputs.prod && 'prod-' || '' }}ci-${{ inputs.browser }}
@@ -35,6 +37,12 @@ jobs:
           sudo apt-get install xvfb
       - name: Install dependencies
         run: npm ci
+      - name: Override React ${{ inputs.react-override }}
+        if: inputs.react-override != ''
+        # This should be safe since we are caching ~/.npm and not node_modules
+        run: |
+          npm i --no-save react@${{ inputs.react-override }} react-dom@${{ inputs.react-override }}
+          grep version node_modules/{react,react-dom}/package.json
       - name: Restore playwright from cache
         uses: actions/cache/restore@v4
         id: playwright-cache
@@ -55,6 +63,6 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: Test Results ${{ inputs.os }}-${{ inputs.browser }}-${{ inputs.editor-mode }}-${{ inputs.events-mode }}-${{ inputs.prod && 'prod' || 'dev' }}-${{ inputs.node-version }}
+          name: Test Results ${{ inputs.os }}-${{ inputs.browser }}-${{ inputs.editor-mode }}-${{ inputs.events-mode }}-${{ inputs.prod && 'prod' || 'dev' }}-${{ inputs.node-version }}-${{ inputs.react-override }}
           path: ${{ env.test_results_path }}
           retention-days: 7

From 853dd2eca30a57d83faf0386c1d4dde9ef716754 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Tue, 7 May 2024 09:38:04 -0700
Subject: [PATCH 06/30] Slight changes to docs for React 19 conventions

---
 packages/lexical-website/docs/concepts/editor-state.md | 8 +++++---
 packages/shared/src/useLayoutEffect.ts                 | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/lexical-website/docs/concepts/editor-state.md b/packages/lexical-website/docs/concepts/editor-state.md
index 915eaf9783e..8ddd92bf098 100644
--- a/packages/lexical-website/docs/concepts/editor-state.md
+++ b/packages/lexical-website/docs/concepts/editor-state.md
@@ -87,17 +87,19 @@ const onSubmit = () => {
 }
 ```
 
-For React it could be something following:
+For React it could be something like the following:
 
 ```jsx
 const initialEditorState = await loadContent();
-const editorStateRef = useRef();
+const editorStateRef = useRef(undefined);
 
 <LexicalComposer initialConfig={{
   editorState: initialEditorState
 }}>
   <LexicalRichTextPlugin />
-  <LexicalOnChangePlugin onChange={editorState => editorStateRef.current = editorState} />
+  <LexicalOnChangePlugin onChange={(editorState) => {
+    editorStateRef.current = editorState;
+  }} />
   <Button label="Save" onPress={() => {
     if (editorStateRef.current) {
       saveContent(JSON.stringify(editorStateRef.current))
diff --git a/packages/shared/src/useLayoutEffect.ts b/packages/shared/src/useLayoutEffect.ts
index accaedc10b4..05787b43b8b 100644
--- a/packages/shared/src/useLayoutEffect.ts
+++ b/packages/shared/src/useLayoutEffect.ts
@@ -9,6 +9,9 @@
 import {useEffect, useLayoutEffect} from 'react';
 import {CAN_USE_DOM} from 'shared/canUseDOM';
 
+// This workaround is no longer necessary in React 19,
+// but we currently support React >=17.x
+// https://github.com/facebook/react/pull/26395
 const useLayoutEffectImpl: typeof useLayoutEffect = CAN_USE_DOM
   ? useLayoutEffect
   : useEffect;

From 17d27e6e3ac7c82d3ed6e7ead648d16e44729537 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Tue, 7 May 2024 11:14:09 -0700
Subject: [PATCH 07/30] validate React 19 installation expectations

---
 .../src/__tests__/unit/React19.test.tsx       | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 packages/lexical-react/src/__tests__/unit/React19.test.tsx

diff --git a/packages/lexical-react/src/__tests__/unit/React19.test.tsx b/packages/lexical-react/src/__tests__/unit/React19.test.tsx
new file mode 100644
index 00000000000..1360acaf651
--- /dev/null
+++ b/packages/lexical-react/src/__tests__/unit/React19.test.tsx
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import * as React from 'react';
+import {createRoot, Root} from 'react-dom/client';
+import * as ReactTestUtils from 'shared/react-test-utils';
+
+const IS_REACT_19 = parseInt(React.version.split('.')[0], 10) >= 19;
+const REACT_OVERRIDE = process.env.REACT_OVERRIDE ?? '';
+
+describe(`React expectations (${React.version}) REACT_OVERRIDE=${REACT_OVERRIDE}`, () => {
+  let container: HTMLDivElement;
+  let reactRoot: Root;
+  beforeEach(() => {
+    container = document.createElement('div');
+    reactRoot = createRoot(container);
+    document.body.appendChild(container);
+  });
+  // This checks our assumption that we are testing against the correct version of React
+  if (REACT_OVERRIDE) {
+    test(`Expecting React >= 19`, () => {
+      expect(IS_REACT_19).toBe(true);
+    });
+  }
+  const cacheExpect = IS_REACT_19 ? 'cached' : 'not cached';
+  test(`StrictMode useMemo is ${cacheExpect}`, () => {
+    const memoFun = jest
+      .fn()
+      .mockReturnValueOnce('cached')
+      .mockReturnValue('not cached');
+    function MemoComponent() {
+      return React.useMemo(memoFun, []);
+    }
+    ReactTestUtils.act(() => {
+      reactRoot.render(
+        <React.StrictMode>
+          <MemoComponent />
+        </React.StrictMode>,
+      );
+    });
+    expect(container.textContent).toBe(cacheExpect);
+    expect(memoFun).toBeCalledTimes(2);
+  });
+});

From e41306e75e67d8c08085b21848b2c8fd5d2e1d60 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Tue, 7 May 2024 14:45:05 -0700
Subject: [PATCH 08/30] Resolve warnings in LexicalNormalization.test.tsx

---
 .../src/__tests__/unit/LexicalNormalization.test.tsx      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/lexical/src/__tests__/unit/LexicalNormalization.test.tsx b/packages/lexical/src/__tests__/unit/LexicalNormalization.test.tsx
index c9227657539..ecfbe6bf77f 100644
--- a/packages/lexical/src/__tests__/unit/LexicalNormalization.test.tsx
+++ b/packages/lexical/src/__tests__/unit/LexicalNormalization.test.tsx
@@ -125,7 +125,7 @@ describe('LexicalNormalization tests', () => {
 
             const selection = paragraph.select();
             getAnchor(selection).set(text1.__key, 0, 'text');
-            getFocus(selection).set(text2.__key, 2, 'text');
+            getFocus(selection).set(text2.__key, 1, 'text');
 
             const normalizedSelection = $normalizeSelection(selection);
             expect(getAnchor(normalizedSelection).type).toBe('text');
@@ -137,7 +137,7 @@ describe('LexicalNormalization tests', () => {
             expect(getFocus(normalizedSelection).getNode().__key).toBe(
               text2.__key,
             );
-            expect(getFocus(normalizedSelection).offset).toBe(2);
+            expect(getFocus(normalizedSelection).offset).toBe(1);
           });
         });
 
@@ -155,7 +155,7 @@ describe('LexicalNormalization tests', () => {
 
             const selection = paragraph.select();
             getAnchor(selection).set(text1.__key, 0, 'text');
-            getFocus(selection).set(text2.__key, 2, 'text');
+            getFocus(selection).set(text2.__key, 1, 'text');
 
             const normalizedSelection = $normalizeSelection(selection);
             expect(getAnchor(normalizedSelection).type).toBe('text');
@@ -167,7 +167,7 @@ describe('LexicalNormalization tests', () => {
             expect(getFocus(normalizedSelection).getNode().__key).toBe(
               text2.__key,
             );
-            expect(getFocus(normalizedSelection).offset).toBe(2);
+            expect(getFocus(normalizedSelection).offset).toBe(1);
           });
         });
       }

From ef7ac8f4a82207f75b0f80c11e93507d3b5a93b3 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Tue, 7 May 2024 14:45:22 -0700
Subject: [PATCH 09/30] Update React19 test comments

---
 packages/lexical-react/src/__tests__/unit/React19.test.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/lexical-react/src/__tests__/unit/React19.test.tsx b/packages/lexical-react/src/__tests__/unit/React19.test.tsx
index 1360acaf651..2001ab2e4a8 100644
--- a/packages/lexical-react/src/__tests__/unit/React19.test.tsx
+++ b/packages/lexical-react/src/__tests__/unit/React19.test.tsx
@@ -22,6 +22,8 @@ describe(`React expectations (${React.version}) REACT_OVERRIDE=${REACT_OVERRIDE}
     document.body.appendChild(container);
   });
   // This checks our assumption that we are testing against the correct version of React
+  // The inverse is not checked so the test doesn't fail when our dependencies
+  // are upgraded.
   if (REACT_OVERRIDE) {
     test(`Expecting React >= 19`, () => {
       expect(IS_REACT_19).toBe(true);

From f124a247afdee280ec2bb657a440e7d5862c881c Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Wed, 8 May 2024 07:20:49 -0700
Subject: [PATCH 10/30] Fix Placeholder warnings in LexicalEditor test

---
 .../src/__tests__/unit/LexicalEditor.test.tsx | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx b/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx
index 94197ff270e..6d7d1fb7251 100644
--- a/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx
+++ b/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx
@@ -913,6 +913,14 @@ describe('LexicalEditor tests', () => {
       return decoratedPortals;
     }
 
+    afterEach(async () => {
+      // Clean up so we are not calling setState outside of act
+      await ReactTestUtils.act(async () => {
+        reactRoot.render(null);
+        await Promise.resolve().then();
+      });
+    });
+
     it('Should correctly render React component into Lexical node #1', async () => {
       const listener = jest.fn();
 
@@ -987,20 +995,21 @@ describe('LexicalEditor tests', () => {
         );
       }
 
-      ReactTestUtils.act(() => {
+      await ReactTestUtils.act(async () => {
         reactRoot.render(<Test divKey={0} />);
+        // Wait for update to complete
+        await Promise.resolve().then();
       });
 
-      // Wait for update to complete
-      await Promise.resolve().then();
-
       expect(listener).toHaveBeenCalledTimes(1);
       expect(container.innerHTML).toBe(
         '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><br></p></div>',
       );
 
-      ReactTestUtils.act(() => {
+      await ReactTestUtils.act(async () => {
         reactRoot.render(<Test divKey={1} />);
+        // Wait for update to complete
+        await Promise.resolve().then();
       });
 
       expect(listener).toHaveBeenCalledTimes(3);

From f190a05851967525ad7e0a4f7f5b221deab1d3e3 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Wed, 8 May 2024 15:19:57 -0700
Subject: [PATCH 11/30] fix react-dom warnings in selection tests

---
 .../__tests__/unit/LexicalSelection.test.tsx  | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/packages/lexical-selection/src/__tests__/unit/LexicalSelection.test.tsx b/packages/lexical-selection/src/__tests__/unit/LexicalSelection.test.tsx
index d2acde40cfa..c9743f48bcb 100644
--- a/packages/lexical-selection/src/__tests__/unit/LexicalSelection.test.tsx
+++ b/packages/lexical-selection/src/__tests__/unit/LexicalSelection.test.tsx
@@ -47,7 +47,7 @@ import {
   invariant,
   TestComposer,
 } from 'lexical/src/__tests__/utils';
-import {createRoot} from 'react-dom/client';
+import {createRoot, Root} from 'react-dom/client';
 import * as ReactTestUtils from 'shared/react-test-utils';
 
 import {
@@ -113,24 +113,27 @@ Range.prototype.getBoundingClientRect = function (): DOMRect {
 };
 
 describe('LexicalSelection tests', () => {
-  let container: HTMLElement | null = null;
+  let container: HTMLElement;
+  let reactRoot: Root;
+  let editor: LexicalEditor | null = null;
 
   beforeEach(async () => {
     container = document.createElement('div');
     document.body.appendChild(container);
-
+    reactRoot = createRoot(container);
     await init();
   });
 
-  afterEach(() => {
-    if (container) {
-      document.body.removeChild(container);
-    }
-    container = null;
+  afterEach(async () => {
+    // Ensure we are clearing out any React state and running effects with
+    // act
+    await ReactTestUtils.act(async () => {
+      reactRoot.unmount();
+      await Promise.resolve().then();
+    });
+    document.body.removeChild(container);
   });
 
-  let editor: LexicalEditor | null = null;
-
   async function init() {
     function TestBase() {
       function TestPlugin() {
@@ -187,10 +190,10 @@ describe('LexicalSelection tests', () => {
       );
     }
 
-    ReactTestUtils.act(() => {
-      createRoot(container!).render(<TestBase />);
+    await ReactTestUtils.act(async () => {
+      reactRoot.render(<TestBase />);
+      await Promise.resolve().then();
     });
-
     editor!.getRootElement()!.focus();
 
     await Promise.resolve().then();
@@ -208,8 +211,6 @@ describe('LexicalSelection tests', () => {
     await ReactTestUtils.act(async () => {
       await editor!.update(fn);
     });
-
-    return Promise.resolve().then();
   }
 
   test('Expect initial output to be a block with no text.', () => {
@@ -1132,7 +1133,7 @@ describe('LexicalSelection tests', () => {
       await applySelectionInputs(testUnit.inputs, update, editor!);
 
       // Validate HTML matches
-      expect(container!.innerHTML).toBe(testUnit.expectedHTML);
+      expect(container.innerHTML).toBe(testUnit.expectedHTML);
 
       // Validate selection matches
       const rootElement = editor!.getRootElement()!;

From 9cf13698166c32d0aa22d9d417178b9e9a6dbabe Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Thu, 9 May 2024 09:51:36 -0700
Subject: [PATCH 12/30] Add typedoc-plugin-rename-defaults and start updating
 docs

---
 package-lock.json                             | 39 +++++++++++++++++++
 .../__tests__/unit/LexicalComposer.test.tsx   |  2 +
 .../lexical-react/src/useLexicalEditable.ts   |  8 ++++
 .../src/useLexicalSubscription.tsx            |  1 +
 packages/lexical-website/docusaurus.config.js |  1 +
 packages/lexical-website/package.json         |  1 +
 .../index.js                                  |  5 ++-
 7 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 260d3fb0377..3b878c390ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29739,6 +29739,28 @@
         "typedoc": ">=0.24.0"
       }
     },
+    "node_modules/typedoc-plugin-rename-defaults": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/typedoc-plugin-rename-defaults/-/typedoc-plugin-rename-defaults-0.7.0.tgz",
+      "integrity": "sha512-NudSQ1o/XLHNF9c4y7LzIZxfE9ltz09yCDklBPJpP5VMRvuBpYGIbQ0ZgmPz+EIV8vPx9Z/OyKwzp4HT2vDtfg==",
+      "dependencies": {
+        "camelcase": "^8.0.0"
+      },
+      "peerDependencies": {
+        "typedoc": "0.22.x || 0.23.x || 0.24.x || 0.25.x"
+      }
+    },
+    "node_modules/typedoc-plugin-rename-defaults/node_modules/camelcase": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-8.0.0.tgz",
+      "integrity": "sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/typedoc/node_modules/brace-expansion": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
@@ -32956,6 +32978,7 @@
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "typedoc-plugin-markdown": "^3.17.1",
+        "typedoc-plugin-rename-defaults": "^0.7.0",
         "unist-util-visit": "^5.0.0"
       },
       "devDependencies": {
@@ -37598,6 +37621,7 @@
         "react-dom": "^18.2.0",
         "tailwindcss": "^3.3.3",
         "typedoc-plugin-markdown": "^3.17.1",
+        "typedoc-plugin-rename-defaults": "^0.7.0",
         "unist-util-visit": "^5.0.0",
         "webpack": "^5.76.0"
       }
@@ -54281,6 +54305,21 @@
         "handlebars": "^4.7.7"
       }
     },
+    "typedoc-plugin-rename-defaults": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/typedoc-plugin-rename-defaults/-/typedoc-plugin-rename-defaults-0.7.0.tgz",
+      "integrity": "sha512-NudSQ1o/XLHNF9c4y7LzIZxfE9ltz09yCDklBPJpP5VMRvuBpYGIbQ0ZgmPz+EIV8vPx9Z/OyKwzp4HT2vDtfg==",
+      "requires": {
+        "camelcase": "^8.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-8.0.0.tgz",
+          "integrity": "sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA=="
+        }
+      }
+    },
     "typescript": {
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
diff --git a/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx b/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx
index ae9da26b1e8..6896bd0ce48 100644
--- a/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx
+++ b/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx
@@ -106,6 +106,8 @@ describe('LexicalComposer tests', () => {
         });
         expect(editors.size).toBe(size);
         [...editors].forEach((editor, i) => {
+          // This confirms that editorState() was only called once per editor,
+          // otherwise you could see 'initial stateinitial state'.
           expect([
             i,
             editor.getEditorState().read(() => $getRoot().getTextContent()),
diff --git a/packages/lexical-react/src/useLexicalEditable.ts b/packages/lexical-react/src/useLexicalEditable.ts
index d3304616c47..cd799f0c72a 100644
--- a/packages/lexical-react/src/useLexicalEditable.ts
+++ b/packages/lexical-react/src/useLexicalEditable.ts
@@ -20,6 +20,14 @@ function subscription(editor: LexicalEditor): LexicalSubscription<boolean> {
   };
 }
 
+/**
+ * Get the current value for {@link LexicalEditor.isEditable}
+ * using {@link useLexicalSubscription}.
+ * You should prefer this over manually observing the value with
+ * {@link LexicalEditor.registerEditableListener},
+ * which is a bit tricky to do correctly, particularly when using
+ * React StrictMode (the default for development) or concurrency.
+ */
 export default function useLexicalEditable(): boolean {
   return useLexicalSubscription(subscription);
 }
diff --git a/packages/lexical-react/src/useLexicalSubscription.tsx b/packages/lexical-react/src/useLexicalSubscription.tsx
index c2d88d7b016..e215f0a8f82 100644
--- a/packages/lexical-react/src/useLexicalSubscription.tsx
+++ b/packages/lexical-react/src/useLexicalSubscription.tsx
@@ -19,6 +19,7 @@ export type LexicalSubscription<T> = {
 
 /**
  * Shortcut to Lexical subscriptions when values are used for render.
+ * @param subscription - The function to create the {@link LexicalSubscription}. This function's identity must be stable (e.g. defined at module scope or with useCallback).
  */
 export default function useLexicalSubscription<T>(
   subscription: (editor: LexicalEditor) => LexicalSubscription<T>,
diff --git a/packages/lexical-website/docusaurus.config.js b/packages/lexical-website/docusaurus.config.js
index 749b637070b..857cdabf37c 100644
--- a/packages/lexical-website/docusaurus.config.js
+++ b/packages/lexical-website/docusaurus.config.js
@@ -183,6 +183,7 @@ const docusaurusPluginTypedocConfig = {
   plugin: [
     './src/plugins/lexical-typedoc-plugin-no-inherit',
     './src/plugins/lexical-typedoc-plugin-module-name',
+    'typedoc-plugin-rename-defaults',
   ],
   sidebar: {
     autoConfiguration: false,
diff --git a/packages/lexical-website/package.json b/packages/lexical-website/package.json
index 01e67223fc4..511b3684ce4 100644
--- a/packages/lexical-website/package.json
+++ b/packages/lexical-website/package.json
@@ -26,6 +26,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typedoc-plugin-markdown": "^3.17.1",
+    "typedoc-plugin-rename-defaults": "^0.7.0",
     "unist-util-visit": "^5.0.0"
   },
   "devDependencies": {
diff --git a/packages/lexical-website/src/plugins/lexical-typedoc-plugin-module-name/index.js b/packages/lexical-website/src/plugins/lexical-typedoc-plugin-module-name/index.js
index 244c5f24b19..199161b2d93 100644
--- a/packages/lexical-website/src/plugins/lexical-typedoc-plugin-module-name/index.js
+++ b/packages/lexical-website/src/plugins/lexical-typedoc-plugin-module-name/index.js
@@ -5,12 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
+// @ts-check
 const typedoc = require('typedoc');
 
-exports.load = function (/** @type typedoc.Application */ app) {
+exports.load = function (/** @type {import('typedoc').Application} */ app) {
   app.converter.on(
     typedoc.Converter.EVENT_RESOLVE_BEGIN,
-    (/** @type typedoc.Context */ context) => {
+    (/** @type {import('typedoc').Context} */ context) => {
       context.project
         .getReflectionsByKind(typedoc.ReflectionKind.Module)
         .forEach((reflection) => {

From 89bde939ee99c4001bf66e8dc347199b8eeec510 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Fri, 10 May 2024 14:24:00 -0700
Subject: [PATCH 13/30] start on React FAQ

---
 packages/lexical-website/docs/react/faq.md   | 62 ++++++++++++++++++++
 packages/lexical-website/docs/react/index.md |  2 +-
 packages/lexical-website/sidebars.js         |  2 +-
 3 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 packages/lexical-website/docs/react/faq.md

diff --git a/packages/lexical-website/docs/react/faq.md b/packages/lexical-website/docs/react/faq.md
new file mode 100644
index 00000000000..ef676dece81
--- /dev/null
+++ b/packages/lexical-website/docs/react/faq.md
@@ -0,0 +1,62 @@
+---
+---
+
+# React FAQ
+
+## My app does not work in dev when using StrictMode, help!?
+
+When hooks are used correctly, there are no known issues with React StrictMode
+and Lexical. The first thing you should do is go through React's documentation
+to make sure that your use of `useEffect` or other hooks is generally correct.
+This is a great place to start:
+[My Effect runs twice when the component mounts](https://react.dev/reference/react/useEffect#my-effect-runs-twice-when-the-component-mounts)
+
+Some Lexical-specific concerns (which are consequences of React's
+concurrent and StrictMode semantics, not due to anything unusual in Lexical):
+
+* In React 19, `useMemo` calls are cached across StrictMode re-renders, so
+  only one editor will be used for both renders. If you have a `useEffect`
+  call with side-effects (such as updating the document when a plug-in
+  initializes), then you should first check to make sure that this effect
+  has not already occurred (e.g. by checking the state of the document or
+  undoing the change as a cleanup function returned by the effect)
+* `LexicalComposer`'s initialConfig prop is only considered once during
+  the first render (`useMemo` is used to create the `LexicalComposerContext`
+  which includes the editor and theme)
+* If you are using an `editorState` argument in the config when creating the
+  editor, it will only be called once when the editor is created.
+* You should generally prefer to use hooks that return state such as
+  `useLexicalEditable` (`useLexicalSubscription` is a generalization of this
+  style) rather than manually registering the listeners and expecting a
+  particular sequence of triggers to be called, especially
+  when their source is an effect. Listeners are only called when state
+  changes, and in StrictMode the state may have changed during the initial
+  render. The listeners registered from your second render will not be called
+  if the change was triggered by the first render, and you will likely not
+  see the listeners triggered during the first render because those effects
+  were immediately cleaned up before the change effect occurred.
+
+## LexicalComposerContext.useLexicalComposerContext: cannot find a LexicalComposerContext
+
+This error happens for one reason: the `useLexicalComposerContext()` hook
+was called from a component that is not a child of a `LexicalComposer`,
+`LexicalNestedComposer`, or `LexicalComposerContext.Provider` from the same
+build of Lexical that the hook was imported from.
+
+The most common root causes of this issue are:
+
+* You are trying to use `useLexicalComposerContext()` in a component that is
+  not a child of the `LexicalComposer`. If you need to do that, you need to
+  pass the context or editor up the tree with something like `EditorRefPlugin`.
+* You have multiple builds of Lexical in your project. This could be because
+  you have a dependency that has a direct dependency on some other version
+  of Lexical (these packages should have Lexical as `peerDependencies`, but
+  not all do), or because your project mixes import and require statements
+  to import Lexical (including both the esm and cjs builds of the same
+  version of Lexical). Resolving this generally requires overriding what
+  your package manager does in `package.json`, and/or what the bundler does in
+  some configuration file for your framework or bundler. There are a lot of
+  combinations of tools in the ecosystem (npm, pnpm, yarn, webpack, vite,
+  next.js, etc.), so the syntax of that workaround is quite dependent on
+  precisely which tools (and even versions of those tools) that your project
+  is using.
diff --git a/packages/lexical-website/docs/react/index.md b/packages/lexical-website/docs/react/index.md
index 51948c8207e..2462763c9a1 100644
--- a/packages/lexical-website/docs/react/index.md
+++ b/packages/lexical-website/docs/react/index.md
@@ -18,4 +18,4 @@ To make it easier for React users to implement rich-text editors, Lexical expose
 
 ## Supported Versions
 
-React 17+
+React 17+ (tested with React 18 and React 19 beta)
diff --git a/packages/lexical-website/sidebars.js b/packages/lexical-website/sidebars.js
index 08a7c9c36f3..351fccafbad 100644
--- a/packages/lexical-website/sidebars.js
+++ b/packages/lexical-website/sidebars.js
@@ -63,7 +63,7 @@ const sidebars = {
       type: 'category',
     },
     {
-      items: ['react/plugins', 'react/create_plugin'],
+      items: [{dirName: 'react', type: 'autogenerated'}],
       label: 'React',
       link: {
         id: 'react/index',

From e1140be778bd704838e80eea07e964fd9ee64fc6 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Sat, 11 May 2024 00:09:45 -0700
Subject: [PATCH 14/30] HMR notes

---
 packages/lexical-website/docs/react/faq.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/lexical-website/docs/react/faq.md b/packages/lexical-website/docs/react/faq.md
index ef676dece81..c98dce9be91 100644
--- a/packages/lexical-website/docs/react/faq.md
+++ b/packages/lexical-website/docs/react/faq.md
@@ -7,8 +7,8 @@
 
 When hooks are used correctly, there are no known issues with React StrictMode
 and Lexical. The first thing you should do is go through React's documentation
-to make sure that your use of `useEffect` or other hooks is generally correct.
-This is a great place to start:
+to make sure that your usage of `useEffect` and other hooks follow React's
+conventions and guidelines. This is a great place to start:
 [My Effect runs twice when the component mounts](https://react.dev/reference/react/useEffect#my-effect-runs-twice-when-the-component-mounts)
 
 Some Lexical-specific concerns (which are consequences of React's
@@ -60,3 +60,14 @@ The most common root causes of this issue are:
   next.js, etc.), so the syntax of that workaround is quite dependent on
   precisely which tools (and even versions of those tools) that your project
   is using.
+
+## Other complications when using dev mode with fast refresh (aka hot module replacement)
+
+Depending on precisely how the fast refresh implementation you're
+using works, you may need to mark the files that create your editor or the
+implementation of your LexicalNode subclasses as needing a full refresh.
+When things seem broken in dev mode after changing a file, try refreshing the
+page first. If that fixes the problem, then mark the file you're working on as
+needing a full refresh. For example
+[Next.js fast refresh](https://nextjs.org/docs/architecture/fast-refresh#tips)
+has a `// @refresh reset` comment that can be used.

From 9a2da54af7bd78b0e3832911ec48eca3e9f38eb5 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Sat, 11 May 2024 06:57:31 -0700
Subject: [PATCH 15/30] Confirm useLexicalComposerContext behavior

---
 examples/react-rich-collab/package-lock.json  | 70 +++++--------------
 examples/react-rich-collab/package.json       |  2 +-
 .../__tests__/unit/LexicalComposer.test.tsx   | 14 +++-
 3 files changed, 31 insertions(+), 55 deletions(-)

diff --git a/examples/react-rich-collab/package-lock.json b/examples/react-rich-collab/package-lock.json
index 77c166f1d23..18f7a887890 100644
--- a/examples/react-rich-collab/package-lock.json
+++ b/examples/react-rich-collab/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "@lexical/react-rich-example",
+  "name": "@lexical/react-rich-collab-example",
   "version": "0.14.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "@lexical/react-rich-example",
+      "name": "@lexical/react-rich-collab-example",
       "version": "0.14.5",
       "dependencies": {
         "@lexical/react": "0.14.5",
@@ -13,6 +13,7 @@
         "lexical": "0.14.5",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
+        "y-webrtc": "^10.3.0",
         "y-websocket": "^2.0.2",
         "yjs": "^13.6.15"
       },
@@ -23,8 +24,7 @@
         "concurrently": "^8.2.2",
         "cross-env": "^7.0.3",
         "typescript": "^5.2.2",
-        "vite": "^5.1.4",
-        "y-webrtc": "^10.3.0"
+        "vite": "^5.1.4"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -1341,7 +1341,6 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -1652,7 +1651,6 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -1708,8 +1706,7 @@
     "node_modules/err-code": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/err-code/-/err-code-3.0.1.tgz",
-      "integrity": "sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA==",
-      "dev": true
+      "integrity": "sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA=="
     },
     "node_modules/errno": {
       "version": "0.1.8",
@@ -1805,8 +1802,7 @@
     "node_modules/get-browser-rtc": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/get-browser-rtc/-/get-browser-rtc-1.1.0.tgz",
-      "integrity": "sha512-MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ==",
-      "dev": true
+      "integrity": "sha512-MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ=="
     },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
@@ -1839,7 +1835,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -1864,8 +1859,7 @@
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "devOptional": true
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
@@ -2118,8 +2112,7 @@
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/nanoid": {
       "version": "3.3.7",
@@ -2223,7 +2216,6 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -2243,7 +2235,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -2299,7 +2290,6 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "devOptional": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -2368,7 +2358,6 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -2435,7 +2424,6 @@
       "version": "9.11.1",
       "resolved": "https://registry.npmjs.org/simple-peer/-/simple-peer-9.11.1.tgz",
       "integrity": "sha512-D1SaWpOW8afq1CZGWB8xTfrT3FekjQmPValrqncJMX7QFl8YwhrPTZvMCANLtgBwwdS+7zURyqxDDEmY558tTw==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -2464,7 +2452,6 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
       "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -2503,7 +2490,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "devOptional": true,
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
@@ -2616,8 +2602,7 @@
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "devOptional": true
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/vite": {
       "version": "5.1.4",
@@ -2797,7 +2782,6 @@
       "version": "10.3.0",
       "resolved": "https://registry.npmjs.org/y-webrtc/-/y-webrtc-10.3.0.tgz",
       "integrity": "sha512-KalJr7dCgUgyVFxoG3CQYbpS0O2qybegD0vI4bYnYHI0MOwoVbucED3RZ5f2o1a5HZb1qEssUKS0H/Upc6p1lA==",
-      "dev": true,
       "dependencies": {
         "lib0": "^0.2.42",
         "simple-peer": "^9.11.0",
@@ -2824,7 +2808,6 @@
       "version": "8.17.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
       "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
-      "dev": true,
       "optional": true,
       "engines": {
         "node": ">=10.0.0"
@@ -3830,8 +3813,7 @@
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "devOptional": true
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "browserslist": {
       "version": "4.23.0",
@@ -4022,7 +4004,6 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
@@ -4064,8 +4045,7 @@
     "err-code": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/err-code/-/err-code-3.0.1.tgz",
-      "integrity": "sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA==",
-      "dev": true
+      "integrity": "sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA=="
     },
     "errno": {
       "version": "0.1.8",
@@ -4135,8 +4115,7 @@
     "get-browser-rtc": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/get-browser-rtc/-/get-browser-rtc-1.1.0.tgz",
-      "integrity": "sha512-MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ==",
-      "dev": true
+      "integrity": "sha512-MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ=="
     },
     "get-caller-file": {
       "version": "2.0.5",
@@ -4159,8 +4138,7 @@
     "ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "devOptional": true
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
     },
     "immediate": {
       "version": "3.3.0",
@@ -4171,8 +4149,7 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "devOptional": true
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
@@ -4359,8 +4336,7 @@
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "nanoid": {
       "version": "3.3.7",
@@ -4423,14 +4399,12 @@
     "queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
     },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
       "requires": {
         "safe-buffer": "^5.1.0"
       }
@@ -4470,7 +4444,6 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "devOptional": true,
       "requires": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -4523,8 +4496,7 @@
     "safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "devOptional": true
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
     },
     "scheduler": {
       "version": "0.23.0",
@@ -4565,7 +4537,6 @@
       "version": "9.11.1",
       "resolved": "https://registry.npmjs.org/simple-peer/-/simple-peer-9.11.1.tgz",
       "integrity": "sha512-D1SaWpOW8afq1CZGWB8xTfrT3FekjQmPValrqncJMX7QFl8YwhrPTZvMCANLtgBwwdS+7zURyqxDDEmY558tTw==",
-      "dev": true,
       "requires": {
         "buffer": "^6.0.3",
         "debug": "^4.3.2",
@@ -4580,7 +4551,6 @@
           "version": "6.0.3",
           "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
           "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-          "dev": true,
           "requires": {
             "base64-js": "^1.3.1",
             "ieee754": "^1.2.1"
@@ -4604,7 +4574,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "devOptional": true,
       "requires": {
         "safe-buffer": "~5.2.0"
       }
@@ -4675,8 +4644,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "devOptional": true
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "vite": {
       "version": "5.1.4",
@@ -4773,7 +4741,6 @@
       "version": "10.3.0",
       "resolved": "https://registry.npmjs.org/y-webrtc/-/y-webrtc-10.3.0.tgz",
       "integrity": "sha512-KalJr7dCgUgyVFxoG3CQYbpS0O2qybegD0vI4bYnYHI0MOwoVbucED3RZ5f2o1a5HZb1qEssUKS0H/Upc6p1lA==",
-      "dev": true,
       "requires": {
         "lib0": "^0.2.42",
         "simple-peer": "^9.11.0",
@@ -4785,7 +4752,6 @@
           "version": "8.17.0",
           "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
           "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
-          "dev": true,
           "optional": true,
           "requires": {}
         }
diff --git a/examples/react-rich-collab/package.json b/examples/react-rich-collab/package.json
index 57c28b58a0f..96bd2a75917 100644
--- a/examples/react-rich-collab/package.json
+++ b/examples/react-rich-collab/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@lexical/react-rich-example",
+  "name": "@lexical/react-rich-collab-example",
   "private": true,
   "version": "0.15.0",
   "type": "module",
diff --git a/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx b/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx
index 6896bd0ce48..0b8d3d2b38c 100644
--- a/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx
+++ b/packages/lexical-react/src/__tests__/unit/LexicalComposer.test.tsx
@@ -75,6 +75,11 @@ describe('LexicalComposer tests', () => {
     ).forEach(({name, size}) => {
       const Wrapper = React[name];
       const editors = new Set<LexicalEditor>();
+      const pluginEditors = new Set<LexicalEditor>();
+      function Plugin() {
+        pluginEditors.add(useLexicalComposerContext()[0]);
+        return null;
+      }
       function App() {
         return (
           <LexicalComposer
@@ -92,8 +97,9 @@ describe('LexicalComposer tests', () => {
               onError: () => {
                 throw Error();
               },
-            }}
-          />
+            }}>
+            <Plugin />
+          </LexicalComposer>
         );
       }
       it(`renders ${size} editors under ${name}`, async () => {
@@ -104,6 +110,8 @@ describe('LexicalComposer tests', () => {
             </Wrapper>,
           );
         });
+        // 2 editors may be created since useMemo is still called twice,
+        // but only one result is used!
         expect(editors.size).toBe(size);
         [...editors].forEach((editor, i) => {
           // This confirms that editorState() was only called once per editor,
@@ -113,6 +121,8 @@ describe('LexicalComposer tests', () => {
             editor.getEditorState().read(() => $getRoot().getTextContent()),
           ]).toEqual([i, 'initial state']);
         });
+        // Only one context is created in both cases though!
+        expect(pluginEditors.size).toBe(1);
       });
     });
   });

From 2d25a16c55ef53917fa684d843309e75d539c1ad Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Sun, 12 May 2024 15:16:22 -0700
Subject: [PATCH 16/30] Comment IS_REACT_ACT_ENVIRONMENT usage and remove
 inadvertent console.log in test

---
 jest.config.js                                                | 1 +
 packages/lexical/src/LexicalUtils.ts                          | 2 +-
 packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx    | 4 ----
 .../__tests__/unit/transform-error-messages.test.js           | 2 --
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index b5502828557..630ceba07aa 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -33,6 +33,7 @@ module.exports = {
       ...common,
       displayName: 'unit',
       globals: {
+        // https://react.dev/blog/2022/03/08/react-18-upgrade-guide#configuring-your-testing-environment
         IS_REACT_ACT_ENVIRONMENT: true,
         __DEV__: true,
       },
diff --git a/packages/lexical/src/LexicalUtils.ts b/packages/lexical/src/LexicalUtils.ts
index 7fb995868f7..ac87bff78fa 100644
--- a/packages/lexical/src/LexicalUtils.ts
+++ b/packages/lexical/src/LexicalUtils.ts
@@ -122,7 +122,7 @@ export function isSelectionCapturedInDecoratorInput(anchorDOM: Node): boolean {
     (nodeName === 'INPUT' ||
       nodeName === 'TEXTAREA' ||
       (activeElement.contentEditable === 'true' &&
-        // @ts-ignore iternal field
+        // @ts-ignore internal field
         activeElement.__lexicalEditor == null))
   );
 }
diff --git a/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx b/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx
index 6d7d1fb7251..9fabc9a7ac3 100644
--- a/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx
+++ b/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx
@@ -60,10 +60,6 @@ import {
   TestComposer,
   TestTextNode,
 } from '../utils';
-// No idea why we suddenly need to do this, but it fixes the tests
-// with latest experimental React version.
-// @ts-ignore
-global.IS_REACT_ACT_ENVIRONMENT = true;
 
 describe('LexicalEditor tests', () => {
   let container: HTMLElement;
diff --git a/scripts/error-codes/__tests__/unit/transform-error-messages.test.js b/scripts/error-codes/__tests__/unit/transform-error-messages.test.js
index 7611e67bf87..36c525e5098 100644
--- a/scripts/error-codes/__tests__/unit/transform-error-messages.test.js
+++ b/scripts/error-codes/__tests__/unit/transform-error-messages.test.js
@@ -92,8 +92,6 @@ async function expectTransform(opts) {
       const {code} = babel.transform(fmt`${opts.codeBefore}`, {
         plugins: [[transformErrorMessages, {errorCodesPath, ...opts.opts}]],
       });
-      const afterCode = fmt`${code}`;
-      console.log({afterCode, code});
       expect(fmt`${code}`).toEqual(fmt`${opts.codeExpect}`);
     },
   );

From efb66b9cd38b8af0f1e574ce08aef797a644ad4a Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Sun, 12 May 2024 13:42:34 -0700
Subject: [PATCH 17/30] [lexical] Chore: Update TestTextNode related tests

I was looking to see how well TextNode replacement was tested per
`// @ts-ignore` and an irrelevant mistake (not covered in tests)
that tsc would've caught
---
 packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx | 5 -----
 packages/lexical/src/__tests__/utils/index.tsx             | 4 +---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx b/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx
index 9fabc9a7ac3..2478ff0a348 100644
--- a/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx
+++ b/packages/lexical/src/__tests__/unit/LexicalEditor.test.tsx
@@ -2029,7 +2029,6 @@ describe('LexicalEditor tests', () => {
           TestTextNode,
           {
             replace: TextNode,
-            // @ts-ignore
             with: (node: TextNode) => new TestTextNode(node.getTextContent()),
           },
         ],
@@ -2066,7 +2065,6 @@ describe('LexicalEditor tests', () => {
           TestTextNode,
           {
             replace: TextNode,
-            // @ts-ignore
             with: (node: TextNode) =>
               new TestTextNode(node.getTextContent(), node.getKey()),
           },
@@ -2104,7 +2102,6 @@ describe('LexicalEditor tests', () => {
           TestTextNode,
           {
             replace: TextNode,
-            // @ts-ignore
             with: (node: TextNode) => new TestTextNode(node.getTextContent()),
           },
         ],
@@ -2152,9 +2149,7 @@ describe('LexicalEditor tests', () => {
           TestTextNode,
           {
             replace: TextNode,
-            // @ts-ignore
             with: (node: TextNode) => new TestTextNode(node.getTextContent()),
-
             withKlass: TestTextNode,
           },
         ],
diff --git a/packages/lexical/src/__tests__/utils/index.tsx b/packages/lexical/src/__tests__/utils/index.tsx
index 3861e8c7f6e..13c3f83d74a 100644
--- a/packages/lexical/src/__tests__/utils/index.tsx
+++ b/packages/lexical/src/__tests__/utils/index.tsx
@@ -201,13 +201,11 @@ export class TestTextNode extends TextNode {
   }
 
   static clone(node: TestTextNode): TestTextNode {
-    // @ts-ignore
     return new TestTextNode(node.__text, node.__key);
   }
 
   static importJSON(serializedNode: SerializedTestTextNode): TestTextNode {
-    // @ts-ignore
-    return new TestTextNode(serializedNode.__text);
+    return new TestTextNode(serializedNode.text);
   }
 
   exportJSON(): SerializedTestTextNode {

From f68725655913c879d1277948769627eb5e9d357e Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Sun, 12 May 2024 15:41:55 -0700
Subject: [PATCH 18/30] Audit @ts-ignore usage and fix possible
 `window.queueMicrotask = undefined` test side-effect leak

---
 .../src/shared/useCharacterLimit.ts           |  1 -
 .../__tests__/unit/LexicalHeadingNode.test.ts |  3 +--
 .../__tests__/unit/LexicalSelection.test.tsx  |  3 +--
 .../src/__tests__/utils/index.ts              |  2 --
 .../__tests__/unit/LexicalListPlugin.test.tsx |  1 -
 .../src/__tests__/unit/LexicalUtils.test.ts   | 24 ++++++++++---------
 .../lexical/src/__tests__/utils/index.tsx     |  1 -
 7 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/packages/lexical-react/src/shared/useCharacterLimit.ts b/packages/lexical-react/src/shared/useCharacterLimit.ts
index 6d0c0782da8..a365bea22b9 100644
--- a/packages/lexical-react/src/shared/useCharacterLimit.ts
+++ b/packages/lexical-react/src/shared/useCharacterLimit.ts
@@ -101,7 +101,6 @@ function findOffset(
   maxCharacters: number,
   strlen: (input: string) => number,
 ): number {
-  // @ts-ignore This is due to be added in a later version of TS
   const Segmenter = Intl.Segmenter;
   let offsetUtf16 = 0;
   let offset = 0;
diff --git a/packages/lexical-rich-text/src/__tests__/unit/LexicalHeadingNode.test.ts b/packages/lexical-rich-text/src/__tests__/unit/LexicalHeadingNode.test.ts
index a58f759e0ea..39b10047c4a 100644
--- a/packages/lexical-rich-text/src/__tests__/unit/LexicalHeadingNode.test.ts
+++ b/packages/lexical-rich-text/src/__tests__/unit/LexicalHeadingNode.test.ts
@@ -44,8 +44,7 @@ describe('LexicalHeadingNode tests', () => {
         expect(headingNode.getTag()).toBe('h1');
         expect(headingNode.getTextContent()).toBe('');
       });
-      // @ts-ignore
-      expect(() => new HeadingNode()).toThrow();
+      expect(() => new HeadingNode('h1')).toThrow();
     });
 
     test('HeadingNode.createDOM()', async () => {
diff --git a/packages/lexical-selection/src/__tests__/unit/LexicalSelection.test.tsx b/packages/lexical-selection/src/__tests__/unit/LexicalSelection.test.tsx
index c9743f48bcb..1a7b87896a8 100644
--- a/packages/lexical-selection/src/__tests__/unit/LexicalSelection.test.tsx
+++ b/packages/lexical-selection/src/__tests__/unit/LexicalSelection.test.tsx
@@ -36,6 +36,7 @@ import {
   LexicalNode,
   ParagraphNode,
   PointType,
+  type RangeSelection,
   TextNode,
 } from 'lexical';
 import {
@@ -2654,7 +2655,6 @@ describe('LexicalSelection tests', () => {
           offset: text.__text.length,
           type: 'text',
         });
-        // @ts-ignore
         const selection = $getSelection() as RangeSelection;
 
         const columnChildrenPrev = column.getChildren();
@@ -2722,7 +2722,6 @@ describe('LexicalSelection tests', () => {
           offset: 0,
           type: 'element',
         });
-        // @ts-ignore
         const selection = $getSelection() as RangeSelection;
 
         $setBlocksType(selection, () => {
diff --git a/packages/lexical-selection/src/__tests__/utils/index.ts b/packages/lexical-selection/src/__tests__/utils/index.ts
index 648c533c09a..5647cb3ba08 100644
--- a/packages/lexical-selection/src/__tests__/utils/index.ts
+++ b/packages/lexical-selection/src/__tests__/utils/index.ts
@@ -32,7 +32,6 @@ type Segment = {
   segment: string;
 };
 
-// @ts-ignore
 if (!Selection.prototype.modify) {
   const wordBreakPolyfillRegex =
     /[\s.,\\/#!$%^&*;:{}=\-`~()\uD800-\uDBFF\uDC00-\uDFFF\u3000-\u303F]/u;
@@ -87,7 +86,6 @@ if (!Selection.prototype.modify) {
     return segments;
   };
 
-  // @ts-ignore
   Selection.prototype.modify = function (alter, direction, granularity) {
     // This is not a thorough implementation, it was more to get tests working
     // given the refactor to use this selection method.
diff --git a/packages/lexical/src/__tests__/unit/LexicalListPlugin.test.tsx b/packages/lexical/src/__tests__/unit/LexicalListPlugin.test.tsx
index dcd9c3b6bba..7b24ec7397f 100644
--- a/packages/lexical/src/__tests__/unit/LexicalListPlugin.test.tsx
+++ b/packages/lexical/src/__tests__/unit/LexicalListPlugin.test.tsx
@@ -58,7 +58,6 @@ describe('@lexical/list tests', () => {
     }
 
     return (
-      //@ts-ignore-next-line
       <TestComposer config={{nodes: [ListNode, ListItemNode], theme: {}}}>
         <RichTextPlugin
           contentEditable={<ContentEditable />}
diff --git a/packages/lexical/src/__tests__/unit/LexicalUtils.test.ts b/packages/lexical/src/__tests__/unit/LexicalUtils.test.ts
index abc6ec06924..b495d174322 100644
--- a/packages/lexical/src/__tests__/unit/LexicalUtils.test.ts
+++ b/packages/lexical/src/__tests__/unit/LexicalUtils.test.ts
@@ -46,20 +46,22 @@ describe('LexicalUtils tests', () => {
 
     test('scheduleMicroTask(): promise', async () => {
       jest.resetModules();
-      // @ts-ignore
-      window.queueMicrotask = undefined;
-
-      let flag = false;
-
-      scheduleMicroTask(() => {
-        flag = true;
-      });
-
-      expect(flag).toBe(false);
+      const nativeQueueMicrotask = window.queueMicrotask;
+      const fn = jest.fn();
+      try {
+        // @ts-ignore
+        window.queueMicrotask = undefined;
+        scheduleMicroTask(fn);
+      } finally {
+        // Reset it before yielding control
+        window.queueMicrotask = nativeQueueMicrotask;
+      }
+
+      expect(fn).toHaveBeenCalledTimes(0);
 
       await null;
 
-      expect(flag).toBe(true);
+      expect(fn).toHaveBeenCalledTimes(1);
     });
 
     test('emptyFunction()', () => {
diff --git a/packages/lexical/src/__tests__/utils/index.tsx b/packages/lexical/src/__tests__/utils/index.tsx
index 13c3f83d74a..18a814b3669 100644
--- a/packages/lexical/src/__tests__/utils/index.tsx
+++ b/packages/lexical/src/__tests__/utils/index.tsx
@@ -524,7 +524,6 @@ export function createTestEditor(
       throw e;
     },
     ...config,
-    // @ts-ignore
     nodes: DEFAULT_NODES.concat(customNodes),
   });
   return editor;

From 3628979240cdb2056c2871274693050ca6e21f52 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Sat, 11 May 2024 10:10:36 -0700
Subject: [PATCH 19/30] Use React 17+ jsx transform

---
 babel.config.js                                 | 2 +-
 packages/lexical-devtools/wxt.config.ts         | 2 +-
 packages/lexical-playground/vite.config.ts      | 2 +-
 packages/lexical-playground/vite.prod.config.ts | 2 +-
 scripts/build.js                                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index ff972262b49..7ef7f39d372 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -24,7 +24,7 @@ module.exports = {
         },
       },
     ],
-    '@babel/preset-react',
+    ['@babel/preset-react', {runtime: 'automatic'}],
     '@babel/preset-flow',
   ],
 };
diff --git a/packages/lexical-devtools/wxt.config.ts b/packages/lexical-devtools/wxt.config.ts
index e7e1ad145f1..37d65f4e677 100644
--- a/packages/lexical-devtools/wxt.config.ts
+++ b/packages/lexical-devtools/wxt.config.ts
@@ -112,7 +112,7 @@ export default defineConfig({
             },
           ],
         ],
-        presets: ['@babel/preset-react'],
+        presets: [['@babel/preset-react', {runtime: 'automatic'}]],
       }),
       react(),
     ],
diff --git a/packages/lexical-playground/vite.config.ts b/packages/lexical-playground/vite.config.ts
index da1900251a5..bbfcd2cc45a 100644
--- a/packages/lexical-playground/vite.config.ts
+++ b/packages/lexical-playground/vite.config.ts
@@ -69,7 +69,7 @@ export default defineConfig(({command}) => {
             },
           ],
         ],
-        presets: ['@babel/preset-react'],
+        presets: [['@babel/preset-react', {runtime: 'automatic'}]],
       }),
       react(),
       viteCopyEsm(),
diff --git a/packages/lexical-playground/vite.prod.config.ts b/packages/lexical-playground/vite.prod.config.ts
index a765476d410..ad4b3499cec 100644
--- a/packages/lexical-playground/vite.prod.config.ts
+++ b/packages/lexical-playground/vite.prod.config.ts
@@ -62,7 +62,7 @@ export default defineConfig({
       exclude: '/**/node_modules/**',
       extensions: ['jsx', 'js', 'ts', 'tsx', 'mjs'],
       plugins: ['@babel/plugin-transform-flow-strip-types'],
-      presets: ['@babel/preset-react'],
+      presets: [['@babel/preset-react', {runtime: 'automatic'}]],
     }),
     react(),
     viteCopyEsm(),
diff --git a/scripts/build.js b/scripts/build.js
index fd10639a0f4..86ac404e090 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -191,7 +191,7 @@ async function build(name, inputFile, outputPath, outputFile, isProd, format) {
               tsconfig: path.resolve('./tsconfig.build.json'),
             },
           ],
-          '@babel/preset-react',
+          ['@babel/preset-react', {runtime: 'automatic'}],
         ],
       }),
       {

From 97564a5e22355e97e86a3bee172f68b716b2c18e Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Mon, 13 May 2024 12:29:44 -0700
Subject: [PATCH 20/30] Suggested renames

---
 .github/workflows/call-core-tests.yml                |  8 ++++----
 .github/workflows/call-e2e-all-tests.yml             |  2 +-
 .github/workflows/call-e2e-test.yml                  | 12 ++++++------
 .../src/__tests__/unit/React19.test.tsx              |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/call-core-tests.yml b/.github/workflows/call-core-tests.yml
index 586dcca2323..df176698146 100644
--- a/.github/workflows/call-core-tests.yml
+++ b/.github/workflows/call-core-tests.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         node-version: [18.18.0]
-        react-override: ['', 'beta']
+        override-react-version: ['', 'beta']
     env:
       CI: true
     steps:
@@ -42,10 +42,10 @@ jobs:
           cache: npm
       - name: Install dependencies
         run: npm ci
-      - name: Override React ${{ matrix.react-override }}
-        if: matrix.react-override != ''
+      - name: Install React ${{ matrix.override-react-version }}
+        if: matrix.override-react-version != ''
         # This should be safe since we are caching ~/.npm and not node_modules
-        run: npm i --no-save react@${{ matrix.react-override }} react-dom@${{ matrix.react-override }}
+        run: npm i --no-save react@${{ matrix.override-react-version }} react-dom@${{ matrix.override-react-version }}
       - run: npm run test-unit
 
   integration:
diff --git a/.github/workflows/call-e2e-all-tests.yml b/.github/workflows/call-e2e-all-tests.yml
index cdf48c23605..5d6e373d6d0 100644
--- a/.github/workflows/call-e2e-all-tests.yml
+++ b/.github/workflows/call-e2e-all-tests.yml
@@ -135,4 +135,4 @@ jobs:
       events-mode: 'modern-events'
       editor-mode: ${{ matrix.editor-mode }}
       prod: ${{ matrix.prod }}
-      react-override: beta
+      override-react-version: beta
diff --git a/.github/workflows/call-e2e-test.yml b/.github/workflows/call-e2e-test.yml
index 84873a376cf..bbd67bfe68e 100644
--- a/.github/workflows/call-e2e-test.yml
+++ b/.github/workflows/call-e2e-test.yml
@@ -9,7 +9,7 @@ on:
       editor-mode: {required: true, type: string}
       events-mode: {required: true, type: string}
       prod: {required: false, type: boolean}
-      react-override: {required: false, type: string}
+      override-react-version: {required: false, type: string}
 
 jobs:
   e2e-test:
@@ -19,7 +19,7 @@ jobs:
       CI: true
       E2E_EDITOR_MODE: ${{ inputs.editor-mode }}
       E2E_EVENTS_MODE: ${{ inputs.events-mode }}
-      REACT_OVERRIDE: ${{ inputs.react-override }}
+      OVERRIDE_REACT_VERSION: ${{ inputs.override-react-version }}
       cache_playwright_path: ${{ inputs.os == 'macos-latest' && '~/Library/Caches/ms-playwright' || inputs.os == 'windows-latest' && 'C:\Users\runneradmin\AppData\Local\ms-playwright' || '~/.cache/ms-playwright' }}
       test_results_path: ${{ inputs.os == 'windows-latest' && '~/.npm/_logs/' || 'test-results/' }}
       test_script: test-e2e-${{ inputs.editor-mode == 'rich-text-with-collab' && 'collab-' || '' }}${{ inputs.prod && 'prod-' || '' }}ci-${{ inputs.browser }}
@@ -37,11 +37,11 @@ jobs:
           sudo apt-get install xvfb
       - name: Install dependencies
         run: npm ci
-      - name: Override React ${{ inputs.react-override }}
-        if: inputs.react-override != ''
+      - name: Install React ${{ inputs.override-react-version }}
+        if: inputs.override-react-version != ''
         # This should be safe since we are caching ~/.npm and not node_modules
         run: |
-          npm i --no-save react@${{ inputs.react-override }} react-dom@${{ inputs.react-override }}
+          npm i --no-save react@${{ inputs.override-react-version }} react-dom@${{ inputs.override-react-version }}
           grep version node_modules/{react,react-dom}/package.json
       - name: Restore playwright from cache
         uses: actions/cache/restore@v4
@@ -63,6 +63,6 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: Test Results ${{ inputs.os }}-${{ inputs.browser }}-${{ inputs.editor-mode }}-${{ inputs.events-mode }}-${{ inputs.prod && 'prod' || 'dev' }}-${{ inputs.node-version }}-${{ inputs.react-override }}
+          name: Test Results ${{ inputs.os }}-${{ inputs.browser }}-${{ inputs.editor-mode }}-${{ inputs.events-mode }}-${{ inputs.prod && 'prod' || 'dev' }}-${{ inputs.node-version }}-${{ inputs.override-react-version }}
           path: ${{ env.test_results_path }}
           retention-days: 7
diff --git a/packages/lexical-react/src/__tests__/unit/React19.test.tsx b/packages/lexical-react/src/__tests__/unit/React19.test.tsx
index 2001ab2e4a8..a59eaeb181b 100644
--- a/packages/lexical-react/src/__tests__/unit/React19.test.tsx
+++ b/packages/lexical-react/src/__tests__/unit/React19.test.tsx
@@ -11,9 +11,9 @@ import {createRoot, Root} from 'react-dom/client';
 import * as ReactTestUtils from 'shared/react-test-utils';
 
 const IS_REACT_19 = parseInt(React.version.split('.')[0], 10) >= 19;
-const REACT_OVERRIDE = process.env.REACT_OVERRIDE ?? '';
+const OVERRIDE_REACT_VERSION = process.env.OVERRIDE_REACT_VERSION ?? '';
 
-describe(`React expectations (${React.version}) REACT_OVERRIDE=${REACT_OVERRIDE}`, () => {
+describe(`React expectations (${React.version}) OVERRIDE_REACT_VERSION=${OVERRIDE_REACT_VERSION}`, () => {
   let container: HTMLDivElement;
   let reactRoot: Root;
   beforeEach(() => {
@@ -24,7 +24,7 @@ describe(`React expectations (${React.version}) REACT_OVERRIDE=${REACT_OVERRIDE}
   // This checks our assumption that we are testing against the correct version of React
   // The inverse is not checked so the test doesn't fail when our dependencies
   // are upgraded.
-  if (REACT_OVERRIDE) {
+  if (OVERRIDE_REACT_VERSION) {
     test(`Expecting React >= 19`, () => {
       expect(IS_REACT_19).toBe(true);
     });

From 1a2b722a49951b31be53948c293ebda3abb94778 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Mon, 13 May 2024 12:36:20 -0700
Subject: [PATCH 21/30] reduce react-beta e2e matrix outputs from 4 to 1

---
 .github/workflows/call-e2e-all-tests.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/call-e2e-all-tests.yml b/.github/workflows/call-e2e-all-tests.yml
index 5d6e373d6d0..224fec288fc 100644
--- a/.github/workflows/call-e2e-all-tests.yml
+++ b/.github/workflows/call-e2e-all-tests.yml
@@ -125,8 +125,10 @@ jobs:
   react-beta:
     strategy:
       matrix:
-        editor-mode: ['rich-text', 'rich-text-with-collab']
-        prod: [false, true]
+        # Currently using a single combination for every-patch e2e tests of
+        # react beta to reduce cost impact
+        editor-mode: ['rich-text']
+        prod: [false]
     uses: ./.github/workflows/call-e2e-test.yml
     with:
       os: 'macos-latest'

From 3319e2b66a6525a15dd70bf7972dd6f9b0087e53 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Thu, 16 May 2024 14:50:28 -0700
Subject: [PATCH 22/30] Add useLexicalEditable docstring back that got lost in
 the merge

---
 packages/lexical-react/src/useLexicalEditable.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/lexical-react/src/useLexicalEditable.ts b/packages/lexical-react/src/useLexicalEditable.ts
index f57b67ccc5e..a561f156d46 100644
--- a/packages/lexical-react/src/useLexicalEditable.ts
+++ b/packages/lexical-react/src/useLexicalEditable.ts
@@ -20,6 +20,14 @@ function subscription(editor: LexicalEditor): LexicalSubscription<boolean> {
   };
 }
 
+/**
+ * Get the current value for {@link LexicalEditor.isEditable}
+ * using {@link useLexicalSubscription}.
+ * You should prefer this over manually observing the value with
+ * {@link LexicalEditor.registerEditableListener},
+ * which is a bit tricky to do correctly, particularly when using
+ * React StrictMode (the default for development) or concurrency.
+ */
 export function useLexicalEditable(): boolean {
   return useLexicalSubscription(subscription);
 }

From 774a2979da8969ec064d11f336ac9f35e68adfba Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Fri, 17 May 2024 06:42:42 -0700
Subject: [PATCH 23/30] Disable react beta e2e, handle in follow-up #6126

---
 .github/workflows/call-e2e-all-tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/call-e2e-all-tests.yml b/.github/workflows/call-e2e-all-tests.yml
index 224fec288fc..1591f858849 100644
--- a/.github/workflows/call-e2e-all-tests.yml
+++ b/.github/workflows/call-e2e-all-tests.yml
@@ -129,6 +129,8 @@ jobs:
         # react beta to reduce cost impact
         editor-mode: ['rich-text']
         prod: [false]
+    # TODO: https://github.com/facebook/lexical/issues/6126
+    if: false
     uses: ./.github/workflows/call-e2e-test.yml
     with:
       os: 'macos-latest'

From 75f5c9894dcab0214a7d779386a06bab2a642a53 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Thu, 16 May 2024 16:37:50 -0700
Subject: [PATCH 24/30] Update typescript because we were installing two
 versions of it

---
 package-lock.json                             | 39 +++++--------------
 package.json                                  |  2 +-
 packages/lexical-devtools/package.json        |  2 +-
 .../src/rules/rules-of-lexical.js             |  4 +-
 4 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3b878c390ed..2e9ce84f1b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -89,7 +89,7 @@
         "ts-jest": "^29.1.2",
         "ts-node": "^10.9.1",
         "typedoc": "^0.25.12",
-        "typescript": "5.1.6",
+        "typescript": "^5.4.5",
         "vite": "^5.2.11"
       },
       "engines": {
@@ -29786,9 +29786,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
-      "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -32681,7 +32681,7 @@
         "@types/react-dom": "^18.2.18",
         "@vitejs/plugin-react": "^4.2.1",
         "lexical": "0.15.0",
-        "typescript": "^5.3.3",
+        "typescript": "^5.4.5",
         "vite": "^5.2.2",
         "wxt": "^0.17.0"
       }
@@ -32703,19 +32703,6 @@
         "react-dom": ">=17.x"
       }
     },
-    "packages/lexical-devtools/node_modules/typescript": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz",
-      "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
     "packages/lexical-dragon": {
       "name": "@lexical/dragon",
       "version": "0.15.0",
@@ -37416,18 +37403,10 @@
         "lexical": "0.15.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
-        "typescript": "^5.3.3",
+        "typescript": "^5.4.5",
         "vite": "^5.2.2",
         "wxt": "^0.17.0",
         "zustand": "^4.5.1"
-      },
-      "dependencies": {
-        "typescript": {
-          "version": "5.4.3",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz",
-          "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==",
-          "dev": true
-        }
       }
     },
     "@lexical/devtools-core": {
@@ -54321,9 +54300,9 @@
       }
     },
     "typescript": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
-      "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
       "dev": true
     },
     "ufo": {
diff --git a/package.json b/package.json
index 075e6c3445d..be73460e4c8 100644
--- a/package.json
+++ b/package.json
@@ -184,7 +184,7 @@
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.1",
     "typedoc": "^0.25.12",
-    "typescript": "5.1.6",
+    "typescript": "^5.4.5",
     "vite": "^5.2.11"
   },
   "dependencies": {
diff --git a/packages/lexical-devtools/package.json b/packages/lexical-devtools/package.json
index 7f40106fb86..876ef7083bd 100644
--- a/packages/lexical-devtools/package.json
+++ b/packages/lexical-devtools/package.json
@@ -42,7 +42,7 @@
     "@types/react-dom": "^18.2.18",
     "@vitejs/plugin-react": "^4.2.1",
     "lexical": "0.15.0",
-    "typescript": "^5.3.3",
+    "typescript": "^5.4.5",
     "vite": "^5.2.2",
     "wxt": "^0.17.0"
   },
diff --git a/packages/lexical-eslint-plugin/src/rules/rules-of-lexical.js b/packages/lexical-eslint-plugin/src/rules/rules-of-lexical.js
index 494adecc0d8..b24e2dc3e6e 100644
--- a/packages/lexical-eslint-plugin/src/rules/rules-of-lexical.js
+++ b/packages/lexical-eslint-plugin/src/rules/rules-of-lexical.js
@@ -285,7 +285,9 @@ module.exports.rulesOfLexical = {
     const pushIgnoredNode = (/** @type {Node} */ node) => ignoreSet.add(node);
     const popIgnoredNode = (/** @type {Node} */ node) => ignoreSet.delete(node);
     const pushFunction = (/** @type {Node} */ node) => {
-      const name = getFunctionNameIdentifier(getLexicalFunctionName(node));
+      const name = getFunctionNameIdentifier(
+        /** @type {Node | undefined} */ (getLexicalFunctionName(node)),
+      );
       funStack.push({name, node});
       if (
         matchers.isDollarFunction(name) ||

From 90a98b1e4106e4cb14342906eb05d9544fceb4e3 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Thu, 16 May 2024 17:35:31 -0700
Subject: [PATCH 25/30] Use more correct react override strategy

---
 .github/workflows/call-core-tests.yml        | 22 ++-------
 .github/workflows/call-e2e-test.yml          |  2 +-
 .github/workflows/call-integration-tests.yml | 23 +++++++++
 .github/workflows/tests-extended.yml         |  7 ++-
 scripts/override-react.js                    | 52 ++++++++++++++++++++
 5 files changed, 85 insertions(+), 21 deletions(-)
 create mode 100644 .github/workflows/call-integration-tests.yml
 create mode 100644 scripts/override-react.js

diff --git a/.github/workflows/call-core-tests.yml b/.github/workflows/call-core-tests.yml
index df176698146..bb38f9e9a07 100644
--- a/.github/workflows/call-core-tests.yml
+++ b/.github/workflows/call-core-tests.yml
@@ -45,23 +45,7 @@ jobs:
       - name: Install React ${{ matrix.override-react-version }}
         if: matrix.override-react-version != ''
         # This should be safe since we are caching ~/.npm and not node_modules
-        run: npm i --no-save react@${{ matrix.override-react-version }} react-dom@${{ matrix.override-react-version }}
+        run: |
+          node ./scripts/override-react.js --version=${{ matrix.override-react-version }}
+          grep version node_modules/{react,react-dom}/package.json
       - run: npm run test-unit
-
-  integration:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [18.18.0]
-    env:
-      CI: true
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: npm
-      - name: Install dependencies
-        run: npm ci
-      - run: npm run test-integration
diff --git a/.github/workflows/call-e2e-test.yml b/.github/workflows/call-e2e-test.yml
index bbd67bfe68e..a7ab4e4d4c7 100644
--- a/.github/workflows/call-e2e-test.yml
+++ b/.github/workflows/call-e2e-test.yml
@@ -41,7 +41,7 @@ jobs:
         if: inputs.override-react-version != ''
         # This should be safe since we are caching ~/.npm and not node_modules
         run: |
-          npm i --no-save react@${{ inputs.override-react-version }} react-dom@${{ inputs.override-react-version }}
+          node ./scripts/override-react.js --version=${{ inputs.override-react-version }}
           grep version node_modules/{react,react-dom}/package.json
       - name: Restore playwright from cache
         uses: actions/cache/restore@v4
diff --git a/.github/workflows/call-integration-tests.yml b/.github/workflows/call-integration-tests.yml
new file mode 100644
index 00000000000..9cc38f3d41a
--- /dev/null
+++ b/.github/workflows/call-integration-tests.yml
@@ -0,0 +1,23 @@
+name: Lexical Integration Tests
+
+on:
+  workflow_call:
+
+jobs:
+  integration:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.18.0]
+    env:
+      CI: true
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: npm
+      - name: Install dependencies
+        run: npm ci
+      - run: npm run test-integration
diff --git a/.github/workflows/tests-extended.yml b/.github/workflows/tests-extended.yml
index 9c9ff869f4c..fbb522084a8 100644
--- a/.github/workflows/tests-extended.yml
+++ b/.github/workflows/tests-extended.yml
@@ -2,9 +2,10 @@ name: Lexical Tests (Extended)
 
 on:
   pull_request:
-    types: [labeled, synchronize]
+    types: [labeled, synchronize, reopened]
     paths-ignore:
       - 'packages/lexical-website/**'
+      - 'packages/*/README.md'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -14,3 +15,7 @@ jobs:
   e2e-tests:
     if: github.repository_owner == 'facebook' && contains(github.event.pull_request.labels.*.name, 'extended-tests')
     uses: ./.github/workflows/call-e2e-all-tests.yml
+
+  integration-tests:
+    if: github.repository_owner == 'facebook' && contains(github.event.pull_request.labels.*.name, 'extended-tests')
+    uses: ./.github/workflows/call-integration-tests.yml
diff --git a/scripts/override-react.js b/scripts/override-react.js
new file mode 100644
index 00000000000..6f9f0e9cb77
--- /dev/null
+++ b/scripts/override-react.js
@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+// @ts-check
+'use strict';
+
+const glob = require('glob');
+const fs = require('fs-extra');
+const argv = require('minimist')(process.argv.slice(2));
+const {exec} = require('child-process-promise');
+
+async function main() {
+  const {version} = argv;
+  if (!version) {
+    throw new Error('USAGE: node ./scripts/override-react --version=beta');
+  }
+  const packages = ['react', 'react-dom'];
+  ['package.json', ...glob.sync('./packages/*/package.json')].forEach((fn) => {
+    const json = fs.readJsonSync(fn);
+    const isRoot = fn === 'package.json';
+    let didUpdate = isRoot;
+    if (isRoot) {
+      json.overrides ||= {};
+      Object.assign(
+        json.overrides,
+        Object.fromEntries(packages.map((pkg) => [pkg, '$' + pkg])),
+      );
+    } else if (json.dependencies) {
+      for (const k of packages) {
+        if (json.dependencies[k]) {
+          json.dependencies[k] = '*';
+          didUpdate = true;
+        }
+      }
+    }
+    if (didUpdate) {
+      fs.writeJsonSync(fn, json, {spaces: 2});
+    }
+  });
+  const cmd = `npm i ${packages.map((pkg) => `${pkg}@${version}`).join(' ')}`;
+  console.log(cmd);
+  await exec(cmd);
+  await exec(
+    `git checkout package-lock.json package.json packages/*/package.json`,
+  );
+}
+
+main();

From 5b810917485fbdf123c8bbc01b7b01a7948f228b Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Fri, 17 May 2024 06:36:08 -0700
Subject: [PATCH 26/30] Workaround for rollup

---
 packages/lexical-playground/vite.config.ts      | 6 +++++-
 packages/lexical-playground/vite.prod.config.ts | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/lexical-playground/vite.config.ts b/packages/lexical-playground/vite.config.ts
index bbfcd2cc45a..d7d0d3b5c48 100644
--- a/packages/lexical-playground/vite.config.ts
+++ b/packages/lexical-playground/vite.config.ts
@@ -73,7 +73,11 @@ export default defineConfig(({command}) => {
       }),
       react(),
       viteCopyEsm(),
-      commonjs(),
+      commonjs({
+        // This is required for React 19 (at least 19.0.0-beta-26f2496093-20240514)
+        // because @rollup/plugin-commonjs does not analyze it correctly
+        strictRequires: [/\/node_modules\/(react-dom|react)\/[^/]\.js$/],
+      }),
     ],
     resolve: {
       alias: moduleResolution(command === 'serve' ? 'source' : 'development'),
diff --git a/packages/lexical-playground/vite.prod.config.ts b/packages/lexical-playground/vite.prod.config.ts
index ad4b3499cec..083f4697032 100644
--- a/packages/lexical-playground/vite.prod.config.ts
+++ b/packages/lexical-playground/vite.prod.config.ts
@@ -66,7 +66,11 @@ export default defineConfig({
     }),
     react(),
     viteCopyEsm(),
-    commonjs(),
+    commonjs({
+      // This is required for React 19 (at least 19.0.0-beta-26f2496093-20240514)
+      // because @rollup/plugin-commonjs does not analyze it correctly
+      strictRequires: [/\/node_modules\/(react-dom|react)\/[^/]\.js$/],
+    }),
   ],
   resolve: {
     alias: moduleResolution('production'),

From d378edb5859bed246dc6d65bae890a7f20e8fe5e Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Fri, 17 May 2024 07:25:50 -0700
Subject: [PATCH 27/30] Add react beta e2e to tests.yml for testing

---
 .github/workflows/tests.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 04abdc12933..9417aa94a09 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,3 +22,14 @@ jobs:
   e2e-tests:
     if: github.repository_owner == 'facebook'
     uses: ./.github/workflows/call-e2e-canary-tests.yml
+
+  react-beta-REMOVE-THIS-BEFORE-MERGE:
+    uses: ./.github/workflows/call-e2e-test.yml
+    with:
+      os: 'macos-latest'
+      browser: 'chromium'
+      node-version: 18.18.0
+      events-mode: 'modern-events'
+      editor-mode: 'rich-text'
+      prod: false
+      override-react-version: beta

From b21494ee77ca7511e16eadb542b928068fcdfe17 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Fri, 17 May 2024 09:25:47 -0700
Subject: [PATCH 28/30] Change ArtificialNode workaround to be resilient to
 renaming

---
 packages/lexical/src/LexicalEditor.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/lexical/src/LexicalEditor.ts b/packages/lexical/src/LexicalEditor.ts
index 6b1d1c7e8d3..3c9886366ff 100644
--- a/packages/lexical/src/LexicalEditor.ts
+++ b/packages/lexical/src/LexicalEditor.ts
@@ -446,8 +446,16 @@ export function createEditor(editorConfig?: CreateEditorArgs): LexicalEditor {
       }
       // Ensure custom nodes implement required methods.
       if (__DEV__) {
+        // ArtificialNode__DO_NOT_USE can get renamed, so we use the type
+        const nodeType =
+          Object.prototype.hasOwnProperty.call(klass, 'getType') &&
+          klass.getType();
         const name = klass.name;
-        if (name !== 'RootNode' && name !== 'ArtificialNode__DO_NOT_USE') {
+        if (
+          name !== 'RootNode' &&
+          nodeType !== 'root' &&
+          nodeType !== 'artificial'
+        ) {
           const proto = klass.prototype;
           ['getType', 'clone'].forEach((method) => {
             // eslint-disable-next-line no-prototype-builtins

From a48687c64ada807ef015569e47105072e924ba10 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Fri, 17 May 2024 09:32:23 -0700
Subject: [PATCH 29/30] Remove canary react-beta e2e test before approval

---
 .github/workflows/call-e2e-all-tests.yml |  2 --
 .github/workflows/tests.yml              | 11 -----------
 2 files changed, 13 deletions(-)

diff --git a/.github/workflows/call-e2e-all-tests.yml b/.github/workflows/call-e2e-all-tests.yml
index 1591f858849..224fec288fc 100644
--- a/.github/workflows/call-e2e-all-tests.yml
+++ b/.github/workflows/call-e2e-all-tests.yml
@@ -129,8 +129,6 @@ jobs:
         # react beta to reduce cost impact
         editor-mode: ['rich-text']
         prod: [false]
-    # TODO: https://github.com/facebook/lexical/issues/6126
-    if: false
     uses: ./.github/workflows/call-e2e-test.yml
     with:
       os: 'macos-latest'
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9417aa94a09..04abdc12933 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,14 +22,3 @@ jobs:
   e2e-tests:
     if: github.repository_owner == 'facebook'
     uses: ./.github/workflows/call-e2e-canary-tests.yml
-
-  react-beta-REMOVE-THIS-BEFORE-MERGE:
-    uses: ./.github/workflows/call-e2e-test.yml
-    with:
-      os: 'macos-latest'
-      browser: 'chromium'
-      node-version: 18.18.0
-      events-mode: 'modern-events'
-      editor-mode: 'rich-text'
-      prod: false
-      override-react-version: beta

From 492816e0e9512f59976965be93190bc61bb28d08 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Fri, 17 May 2024 12:18:38 -0700
Subject: [PATCH 30/30] Fix #6132 react build size regression from #6088

---
 scripts/build.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/build.js b/scripts/build.js
index 18a8c5681c9..41b8d0ffed6 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -94,13 +94,11 @@ function resolveExternalEsm(id) {
  * party dependencies or peerDependencies that we do not want to include
  * in the bundles.
  */
-const externals = [
-  ...Object.entries(wwwMappings).flat(),
-  'react-dom',
-  'react',
-  'yjs',
-  'y-websocket',
-].sort();
+const monorepoExternalsSet = new Set(Object.entries(wwwMappings).flat());
+const thirdPartyExternals = ['react', 'react-dom', 'yjs', 'y-websocket'];
+const thirdPartyExternalsRegExp = new RegExp(
+  `^(${thirdPartyExternals.join('|')})(\\/|$)`,
+);
 
 const strictWWWMappings = {};
 
@@ -131,7 +129,10 @@ async function build(name, inputFile, outputPath, outputFile, isProd, format) {
   const extensions = ['.js', '.jsx', '.ts', '.tsx'];
   const inputOptions = {
     external(modulePath, src) {
-      return externals.includes(modulePath);
+      return (
+        monorepoExternalsSet.has(modulePath) ||
+        thirdPartyExternalsRegExp.test(modulePath)
+      );
     },
     input: inputFile,
     onwarn(warning) {