Skip to content

Commit 2ff8deb

Browse files
committed
[rcr] Remove runtimeModule compiler option
Now that the compiler always injects `react-compiler-runtime`, this option is unnecessary. ghstack-source-id: 788fd4f Pull Request resolved: #31055
1 parent d4e2987 commit 2ff8deb

File tree

7 files changed

+5
-135
lines changed

7 files changed

+5
-135
lines changed

compiler/apps/playground/babel.config.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@ module.exports = function (api) {
99
api.cache(true);
1010
return {
1111
presets: ['next/babel'],
12-
plugins: [
13-
[
14-
'babel-plugin-react-compiler',
15-
{
16-
runtimeModule: 'react-compiler-runtime',
17-
},
18-
],
19-
],
12+
plugins: [['babel-plugin-react-compiler']],
2013
};
2114
};

compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Options.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,6 @@ export type PluginOptions = {
8686
*/
8787
compilationMode: CompilationMode;
8888

89-
/*
90-
* If enabled, Forget will import `useMemoCache` from the given module
91-
* instead of `react/compiler-runtime`.
92-
*
93-
* ```
94-
* // If set to "react-compiler-runtime"
95-
* import {c as useMemoCache} from 'react-compiler-runtime';
96-
* ```
97-
*/
98-
runtimeModule?: string | null | undefined;
99-
10089
/**
10190
* By default React Compiler will skip compilation of code that suppresses the default
10291
* React ESLint rules, since this is a strong indication that the code may be breaking React rules
@@ -202,7 +191,6 @@ export const defaultOptions: PluginOptions = {
202191
logger: null,
203192
gating: null,
204193
noEmit: false,
205-
runtimeModule: null,
206194
eslintSuppressionRules: null,
207195
flowSuppressions: true,
208196
ignoreUseNoForget: false,

compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Program.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ export function compileProgram(
298298
return;
299299
}
300300
const useMemoCacheIdentifier = program.scope.generateUidIdentifier('c');
301-
const moduleName = pass.opts.runtimeModule ?? 'react-compiler-runtime';
302301

303302
/*
304303
* Record lint errors and critical errors as depending on Forget's config,
@@ -605,7 +604,7 @@ export function compileProgram(
605604
if (needsMemoCacheFunctionImport) {
606605
updateMemoCacheFunctionImport(
607606
program,
608-
moduleName,
607+
'react-compiler-runtime',
609608
useMemoCacheIdentifier.name,
610609
);
611610
}
@@ -638,8 +637,7 @@ function shouldSkipCompilation(
638637
}
639638
}
640639

641-
const moduleName = pass.opts.runtimeModule ?? 'react-compiler-runtime';
642-
if (hasMemoCacheFunctionImport(program, moduleName)) {
640+
if (hasMemoCacheFunctionImport(program, 'react-compiler-runtime')) {
643641
return true;
644642
}
645643
return false;

compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/userspace-use-memo-cache.expect.md

Lines changed: 0 additions & 80 deletions
This file was deleted.

compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/userspace-use-memo-cache.js

Lines changed: 0 additions & 24 deletions
This file was deleted.

compiler/packages/snap/src/compiler.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ function makePluginOptions(
4848
let enableEmitFreeze = null;
4949
let enableEmitHookGuards = null;
5050
let compilationMode: CompilationMode = 'all';
51-
let runtimeModule = null;
5251
let panicThreshold: PanicThresholdOptions = 'all_errors';
5352
let hookPattern: string | null = null;
5453
// TODO(@mofeiZ) rewrite snap fixtures to @validatePreserveExistingMemo:false
@@ -103,10 +102,7 @@ function makePluginOptions(
103102
importSpecifierName: '$dispatcherGuard',
104103
};
105104
}
106-
const runtimeModuleMatch = /@runtimeModule="([^"]+)"/.exec(firstLine);
107-
if (runtimeModuleMatch) {
108-
runtimeModule = runtimeModuleMatch[1];
109-
}
105+
110106
if (firstLine.includes('@panicThreshold(none)')) {
111107
panicThreshold = 'none';
112108
}
@@ -243,7 +239,6 @@ function makePluginOptions(
243239
gating,
244240
panicThreshold,
245241
noEmit: false,
246-
runtimeModule,
247242
eslintSuppressionRules,
248243
flowSuppressions,
249244
ignoreUseNoForget,

compiler/packages/snap/src/sprout/evaluator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ export function doEval(source: string): EvaluatorResult {
265265
} else {
266266
return {
267267
kind: "exception",
268-
value: e.stack,
268+
value: e.message,
269269
};
270270
}
271271
}

0 commit comments

Comments
 (0)