Skip to content

Commit 6f6364a

Browse files
justin808claude
andcommitted
Merge origin/master into shakapacker-9.3.0 branch
Resolved conflicts: - lib/react_on_rails/engine.rb: Kept our enhanced validation skip logic - Fixed ESLint errors in RSC files by adding React import for JSX 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
2 parents 9dedf3a + 777bee2 commit 6f6364a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

packages/react-on-rails-pro/src/RSCProvider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
'use client';
1616

17-
import { createContext, useContext, type ReactNode } from 'react';
17+
import React, { createContext, useContext, type ReactNode } from 'react';
1818
import type { ClientGetReactServerComponentProps } from './getReactServerComponent.client.ts';
1919
import { createRSCPayloadKey } from './utils.ts';
2020

packages/react-on-rails-pro/src/RSCRoute.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
'use client';
1818

19-
import { Component, use, type ReactNode } from 'react';
19+
import React, { Component, use, type ReactNode } from 'react';
2020
import { useRSC } from './RSCProvider.tsx';
2121
import { ServerComponentFetchError } from './ServerComponentFetchError.ts';
2222

0 commit comments

Comments
 (0)