Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 2 additions & 18 deletions website/src/components/repl/Repl.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
runtimePolyfillConfig,
} from "./lib/pluginConfig";
import {
applyTargetsToEnvConfig,
envConfigToTargetsString,
replState,
pluginConfigArrayToStateMap,
Expand Down Expand Up @@ -243,24 +244,7 @@ class Repl extends React.Component<Props, State> {
envConfig.shippedProposals =
presetOptions.shippedProposals || false;

const targets = presetOptions.targets;
if (targets == null) {
envConfig.browsers = "";
envConfig.isElectronEnabled = envConfig.isNodeEnabled = false;
} else if (typeof targets === "string") {
envConfig.browsers = targets;
envConfig.isElectronEnabled = envConfig.isNodeEnabled = false;
} else if (typeof targets === "object") {
envConfig.browsers = targets.browsers || "";
if (targets.electron != null) {
envConfig.isElectronEnabled = true;
envConfig.electron = targets.electron;
}
if (targets.node != null) {
envConfig.isNodeEnabled = true;
envConfig.node = targets.node;
}
}
applyTargetsToEnvConfig(envConfig, presetOptions.targets);
}
return;
}
Expand Down
38 changes: 38 additions & 0 deletions website/src/components/repl/lib/replUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ export const persistedStateToEnvConfig = (
isLooseEnabled: !!persistedState.loose,
isBugfixesEnabled: !!persistedState.bugfixes,
node: envPresetDefaults.node.default,
otherTargets: {},
version: persistedState.version,
builtIns: persistedState.builtIns ?? envPresetDefaults.builtIns.default,
corejs: persistedState.corejs ?? envPresetDefaults.corejs.default,
Expand Down Expand Up @@ -210,6 +211,42 @@ export const persistedStateToEnvConfig = (
return envConfig;
};

const browserslistQueryToString = (query: unknown): string =>
Array.isArray(query) ? query.join(", ") : String(query ?? "");

/**
* Syncs the env preset sidebar state with the `targets` option of a config.
* Targets that have no dedicated control in the sidebar are stored in
* `otherTargets`, so that they survive when the config is regenerated.
*/
export const applyTargetsToEnvConfig = (
envConfig: EnvConfig,
targets: unknown
) => {
envConfig.browsers = "";
envConfig.isElectronEnabled = false;
envConfig.isNodeEnabled = false;
envConfig.otherTargets = {};

if (typeof targets === "string" || Array.isArray(targets)) {
envConfig.browsers = browserslistQueryToString(targets);
} else if (targets != null && typeof targets === "object") {
const { browsers, electron, node, ...otherTargets } = targets as {
[target: string]: any;
};
envConfig.browsers = browserslistQueryToString(browsers);
if (electron != null) {
envConfig.isElectronEnabled = true;
envConfig.electron = electron;
}
if (node != null) {
envConfig.isNodeEnabled = true;
envConfig.node = node;
}
envConfig.otherTargets = otherTargets;
}
};

export const persistedStateToExternalPluginsState = (
persistedState: ReplState
): Array<BabelPlugin> => {
Expand Down Expand Up @@ -379,6 +416,7 @@ export function buildTransformOpts(
if (envConfig.isNodeEnabled) {
targets.node = envConfig.node;
}
Object.assign(targets, envConfig.otherTargets);
if (Object.keys(targets).length === 1 && targets.browsers) {
targets = envConfig.browsers;
}
Expand Down
3 changes: 3 additions & 0 deletions website/src/components/repl/lib/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ export type EnvConfig = {
shippedProposals: boolean;
version?: any;
node: string | undefined | null;
// Targets without a dedicated control in the sidebar (e.g. `rhino`, `deno`
// or `esmodules`), preserved as-is from the config.
otherTargets: { [target: string]: unknown };
assumptions?: any;
};

Expand Down
Loading