Skip to content

[pull] main from facebook:main #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 14, 2025
Merged

[pull] main from facebook:main #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6099351
Use internal `ReactCompilerRuntime` in `react/compiler-runtime` entry…
eps1lon Jan 13, 2025
b3a95ca
fix(eslint-plugin-react-compiler): support v9 context api (#32045)
michaelfaith Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions compiler/packages/eslint-plugin-react-compiler/src/rules/ReactCompilerRule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const rule: Rule.RuleModule = {
},
create(context: Rule.RuleContext) {
// Compat with older versions of eslint
const sourceCode = context.sourceCode?.text ?? context.getSourceCode().text;
const sourceCode = context.sourceCode ?? context.getSourceCode();
const filename = context.filename ?? context.getFilename();
const userOpts = context.options[0] ?? {};
if (
Expand Down Expand Up @@ -180,7 +180,7 @@ const rule: Rule.RuleModule = {
endLoc = {
line: event.fnLoc.start.line,
// Babel loc line numbers are 1-indexed
column: sourceCode.split(
column: sourceCode.text.split(
/\r?\n|\r|\n/g,
event.fnLoc.start.line,
)[event.fnLoc.start.line - 1].length,
Expand Down Expand Up @@ -234,7 +234,6 @@ const rule: Rule.RuleModule = {
nodeLoc: BabelSourceLocation,
suppression: string,
): boolean {
const sourceCode = context.getSourceCode();
const comments = sourceCode.getAllComments();
const flowSuppressionRegex = new RegExp(
'\\$FlowFixMe\\[' + suppression + '\\]',
Expand All @@ -254,7 +253,7 @@ const rule: Rule.RuleModule = {
if (filename.endsWith('.tsx') || filename.endsWith('.ts')) {
try {
const {parse: babelParse} = require('@babel/parser');
babelAST = babelParse(sourceCode, {
babelAST = babelParse(sourceCode.text, {
filename,
sourceType: 'unambiguous',
plugins: ['typescript', 'jsx'],
Expand All @@ -264,7 +263,7 @@ const rule: Rule.RuleModule = {
}
} else {
try {
babelAST = HermesParser.parse(sourceCode, {
babelAST = HermesParser.parse(sourceCode.text, {
babel: true,
enableExperimentalComponentSyntax: true,
sourceFilename: filename,
Expand All @@ -277,7 +276,7 @@ const rule: Rule.RuleModule = {

if (babelAST != null) {
try {
transformFromAstSync(babelAST, sourceCode, {
transformFromAstSync(babelAST, sourceCode.text, {
filename,
highlightCode: false,
retainLines: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/react/compiler-runtime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* @flow
*/

export {useMemoCache as c} from './src/ReactHooks';
export * from './src/ReactCompilerRuntime';
2 changes: 1 addition & 1 deletion packages/react/src/ReactClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ import ReactSharedInternals from './ReactSharedInternalsClient';
import {startTransition} from './ReactStartTransition';
import {act} from './ReactAct';
import {captureOwnerStack} from './ReactOwnerStack';
import ReactCompilerRuntime from './ReactCompilerRuntime';
import * as ReactCompilerRuntime from './ReactCompilerRuntime';
import {enableUseResourceEffectHook} from 'shared/ReactFeatureFlags';

const Children = {
Expand Down
6 changes: 1 addition & 5 deletions packages/react/src/ReactCompilerRuntime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,4 @@
* @flow
*/

import {useMemoCache} from './ReactHooks';

export default {
c: useMemoCache,
};
export {useMemoCache as c} from './ReactHooks';
Loading