Skip to content

fix[compiler] remove duplicate parsePluginOptions from the compilePro… #29831

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 1 commit into from
Jun 10, 2024
Merged

fix[compiler] remove duplicate parsePluginOptions from the compilePro… #29831

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 21 additions & 22 deletions compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { isHookDeclaration } from "../Utils/HookDeclaration";
import { assertExhaustive } from "../Utils/utils";
import { insertGatedFunctionDeclaration } from "./Gating";
import { addImportsToProgram, updateMemoCacheFunctionImport } from "./Imports";
import { PluginOptions, parsePluginOptions } from "./Options";
import { PluginOptions } from "./Options";
import { compileFn } from "./Pipeline";
import {
filterSuppressionsThatAffectFunction,
Expand Down Expand Up @@ -217,9 +217,7 @@ export function compileProgram(
program: NodePath<t.Program>,
pass: CompilerPass
): void {
const options = parsePluginOptions(pass.opts);

if (options.sources) {
if (pass.opts.sources) {
if (pass.filename === null) {
const error = new CompilerError();
error.pushErrorDetail(
Expand All @@ -235,21 +233,22 @@ export function compileProgram(
return;
}

if (!isFilePartOfSources(options.sources, pass.filename)) {
if (!isFilePartOfSources(pass.opts.sources, pass.filename)) {
return;
}
}

// Top level "use no forget", skip this file entirely
if (
findDirectiveDisablingMemoization(program.node.directives, options) != null
findDirectiveDisablingMemoization(program.node.directives, pass.opts) !=
null
) {
return;
}

const environment = parseEnvironmentConfig(pass.opts.environment ?? {});
const useMemoCacheIdentifier = program.scope.generateUidIdentifier("c");
const moduleName = options.runtimeModule ?? "react/compiler-runtime";
const moduleName = pass.opts.runtimeModule ?? "react/compiler-runtime";
if (hasMemoCacheFunctionImport(program, moduleName)) {
return;
}
Expand All @@ -261,8 +260,8 @@ export function compileProgram(
*/
const suppressions = findProgramSuppressions(
pass.comments,
options.eslintSuppressionRules ?? DEFAULT_ESLINT_SUPPRESSIONS,
options.flowSuppressions
pass.opts.eslintSuppressionRules ?? DEFAULT_ESLINT_SUPPRESSIONS,
pass.opts.flowSuppressions
);
const lintError = suppressionsToCompilerError(suppressions);
let hasCriticalError = lintError != null;
Expand Down Expand Up @@ -319,11 +318,11 @@ export function compileProgram(
config,
fnType,
useMemoCacheIdentifier.name,
options.logger,
pass.opts.logger,
pass.filename,
pass.code
);
options.logger?.logEvent(pass.filename, {
pass.opts.logger?.logEvent(pass.filename, {
kind: "CompileSuccess",
fnLoc: fn.node.loc ?? null,
fnName: compiledFn.id?.name ?? null,
Expand Down Expand Up @@ -370,12 +369,12 @@ export function compileProgram(
},
{
...pass,
opts: { ...pass.opts, ...options },
opts: { ...pass.opts, ...pass.opts },
filename: pass.filename ?? null,
}
);

if (options.gating != null) {
if (pass.opts.gating != null) {
const error = checkFunctionReferencedBeforeDeclarationAtTopLevel(
program,
compiledFns.map(({ originalFn }) => originalFn)
Expand All @@ -390,13 +389,13 @@ export function compileProgram(
let gating: null | ExternalFunction = null;
try {
// TODO: check for duplicate import specifiers
if (options.gating != null) {
gating = tryParseExternalFunction(options.gating);
if (pass.opts.gating != null) {
gating = tryParseExternalFunction(pass.opts.gating);
externalFunctions.push(gating);
}

const enableEmitInstrumentForget =
options.environment?.enableEmitInstrumentForget;
pass.opts.environment?.enableEmitInstrumentForget;
if (enableEmitInstrumentForget != null) {
externalFunctions.push(
tryParseExternalFunction(enableEmitInstrumentForget.fn)
Expand All @@ -408,23 +407,23 @@ export function compileProgram(
}
}

if (options.environment?.enableEmitFreeze != null) {
if (pass.opts.environment?.enableEmitFreeze != null) {
const enableEmitFreeze = tryParseExternalFunction(
options.environment.enableEmitFreeze
pass.opts.environment.enableEmitFreeze
);
externalFunctions.push(enableEmitFreeze);
}

if (options.environment?.enableEmitHookGuards != null) {
if (pass.opts.environment?.enableEmitHookGuards != null) {
const enableEmitHookGuards = tryParseExternalFunction(
options.environment.enableEmitHookGuards
pass.opts.environment.enableEmitHookGuards
);
externalFunctions.push(enableEmitHookGuards);
}

if (options.environment?.enableChangeDetectionForDebugging != null) {
if (pass.opts.environment?.enableChangeDetectionForDebugging != null) {
const enableChangeDetectionForDebugging = tryParseExternalFunction(
options.environment.enableChangeDetectionForDebugging
pass.opts.environment.enableChangeDetectionForDebugging
);
externalFunctions.push(enableChangeDetectionForDebugging);
}
Expand Down