diff --git a/compiler/packages/eslint-plugin-react-compiler/src/rules/ReactCompilerRule.ts b/compiler/packages/eslint-plugin-react-compiler/src/rules/ReactCompilerRule.ts index b9a1ffa440c49..3f778deee47b2 100644 --- a/compiler/packages/eslint-plugin-react-compiler/src/rules/ReactCompilerRule.ts +++ b/compiler/packages/eslint-plugin-react-compiler/src/rules/ReactCompilerRule.ts @@ -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 ( @@ -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, @@ -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 + '\\]', @@ -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'], @@ -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, @@ -277,7 +276,7 @@ const rule: Rule.RuleModule = { if (babelAST != null) { try { - transformFromAstSync(babelAST, sourceCode, { + transformFromAstSync(babelAST, sourceCode.text, { filename, highlightCode: false, retainLines: true, diff --git a/packages/react/compiler-runtime.js b/packages/react/compiler-runtime.js index 7ff68cd6fa023..6d82bd38538fb 100644 --- a/packages/react/compiler-runtime.js +++ b/packages/react/compiler-runtime.js @@ -7,4 +7,4 @@ * @flow */ -export {useMemoCache as c} from './src/ReactHooks'; +export * from './src/ReactCompilerRuntime'; diff --git a/packages/react/src/ReactClient.js b/packages/react/src/ReactClient.js index c209ae78cd62a..4027534f714ef 100644 --- a/packages/react/src/ReactClient.js +++ b/packages/react/src/ReactClient.js @@ -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 = { diff --git a/packages/react/src/ReactCompilerRuntime.js b/packages/react/src/ReactCompilerRuntime.js index a19d05596863e..250f2324cae3f 100644 --- a/packages/react/src/ReactCompilerRuntime.js +++ b/packages/react/src/ReactCompilerRuntime.js @@ -7,8 +7,4 @@ * @flow */ -import {useMemoCache} from './ReactHooks'; - -export default { - c: useMemoCache, -}; +export {useMemoCache as c} from './ReactHooks';