Skip to content
Merged
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
6 changes: 0 additions & 6 deletions .babelrc

This file was deleted.

3 changes: 2 additions & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module.exports = defineConfig([
},
settings: {
react: {
version: "16.8.6",
version: "19.1.0",
},
},
languageOptions: {
Expand Down Expand Up @@ -80,6 +80,7 @@ module.exports = defineConfig([
"jsdoc/require-jsdoc": "off",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn",
"react-hooks/react-compiler": "error",
"func-style": "off",
},
},
Expand Down
2 changes: 1 addition & 1 deletion functions/og.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "https://esm.sh/react@18.2.0"
import React from "https://esm.sh/react@19.1.0"
import { ImageResponse } from "https://deno.land/x/og_edge@0.0.6/mod.ts"

const ESLintLogo = () => (
Expand Down
374 changes: 213 additions & 161 deletions package-lock.json

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
"@octokit/graphql": "^4.8.0",
"@octokit/rest": "^18.12.0",
"babel-loader": "^8.2.3",
"babel-plugin-react-compiler": "^19.1.0-rc.1",
"cheerio": "*",
"common-tags": "^1.8.2",
"cross-env": "^7.0.3",
Expand All @@ -84,7 +85,7 @@
"eslint-config-eslint": "^11.0.0",
"eslint-plugin-jsx-a11y": "^6.10.1",
"eslint-plugin-react": "^7.37.1",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-hooks": "^6.0.0-rc.1",
"globals": "^15.1.0",
"gray-matter": "^4.0.3",
"hyperlink": "^5.0.4",
Expand Down Expand Up @@ -123,9 +124,9 @@
"@uiw/react-codemirror": "4.5.1",
"algoliasearch": "^4.12.1",
"crelt": "^1.0.5",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-select": "^5.3.2",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"react-select": "^5.10.1",
"react-split": "^2.0.14"
}
}
9 changes: 7 additions & 2 deletions src/playground/components/Alert.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,20 @@ export default function Alert({
{options.rules[ruleId] && (
<button
onClick={() => {
delete options.rules[ruleId];
const newRules = { ...options.rules };
delete newRules[ruleId];

setRulesWithInvalidConfigs(
new Set(
[...rulesWithInvalidConfigs].filter(
rule => rule !== ruleId,
),
),
);
onUpdate(Object.assign({}, options));
onUpdate({
...options,
rules: newRules,
});
}}
className="alert__fix-btn"
>
Expand Down
119 changes: 82 additions & 37 deletions src/playground/components/Configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,17 @@ export default function Configuration({
}, [options.rules]);

const handleRuleChange = () => {
const rules = { ...options.rules };

selectedRules.forEach(selectedRule => {
if (ruleNames.includes(selectedRule)) {
rules[selectedRule] = ["error"];
options.rules = rules;
onUpdate(Object.assign({}, options));
const newOptions = {
...options,
rules: {
...options.rules,
[selectedRule]: ["error"],
},
};

onUpdate(newOptions);
ruleInputRef.current.setValue("");
}
});
Expand Down Expand Up @@ -198,18 +202,28 @@ export default function Configuration({

const selectAll = () => {
if (allRulesSelected) {
options.rules = {};
const newOptions = {
...options,
rules: {},
};

setSelectedRules([]);
onUpdate(newOptions);
} else {
const rules = {};

ruleNames.forEach(ruleName => {
rules[ruleName] = ["error"];
options.rules = rules;
ruleInputRef.current.setValue("");
});

const newOptions = {
...options,
rules,
};

ruleInputRef.current.setValue("");
onUpdate(newOptions);
}
onUpdate(Object.assign({}, options));
};

const revertToDefault = () => {
Expand Down Expand Up @@ -288,15 +302,22 @@ export default function Configuration({
)}
options={ECMAVersionsOptions}
onChange={selected => {
const newOptions = {
...options,
languageOptions: {
...options.languageOptions,
},
};

if (selected.value === "default") {
delete options.languageOptions
delete newOptions.languageOptions
.ecmaVersion;
} else {
options.languageOptions.ecmaVersion =
newOptions.languageOptions.ecmaVersion =
selected.value;
}

onUpdate(Object.assign({}, options));
onUpdate(newOptions);
}}
/>
</label>
Expand All @@ -315,15 +336,22 @@ export default function Configuration({
)}
options={sourceTypeOptions}
onChange={selected => {
const newOptions = {
...options,
languageOptions: {
...options.languageOptions,
},
};

if (selected.value === "default") {
delete options.languageOptions
delete newOptions.languageOptions
.sourceType;
} else {
options.languageOptions.sourceType =
newOptions.languageOptions.sourceType =
selected.value;
}

onUpdate(Object.assign({}, options));
onUpdate(newOptions);
}}
/>
</label>
Expand All @@ -350,14 +378,24 @@ export default function Configuration({
theme={theme => customTheme(theme)}
options={ECMAFeaturesOptions}
onChange={selectedOptions => {
options.languageOptions.parserOptions.ecmaFeatures =
{};
const newOptions = {
...options,
languageOptions: {
...options.languageOptions,
parserOptions: {
...options.languageOptions
.parserOptions,
ecmaFeatures: {},
},
},
};

selectedOptions.forEach(selected => {
options.languageOptions.parserOptions.ecmaFeatures[
newOptions.languageOptions.parserOptions.ecmaFeatures[
selected.value
] = true;
});
onUpdate(Object.assign({}, options));
onUpdate(newOptions);
}}
/>
</div>
Expand Down Expand Up @@ -463,9 +501,17 @@ export default function Configuration({
aria-label={`Remove ${ruleName}`}
title={`Remove ${ruleName}`}
onClick={() => {
delete options.rules[
const newOptions = {
...options,
rules: {
...options.rules,
},
};

delete newOptions.rules[
ruleName
];

setRulesWithInvalidConfigs(
new Set(
[
Expand All @@ -477,12 +523,7 @@ export default function Configuration({
),
),
);
onUpdate(
Object.assign(
{},
options,
),
);
onUpdate(newOptions);
}}
>
<svg
Expand Down Expand Up @@ -524,11 +565,19 @@ export default function Configuration({
placeholder={'["error"]'}
onChange={event => {
try {
options.rules[
ruleName
] = JSON.parse(
event.target.value,
);
const newOptions = {
...options,
rules: {
...options.rules,
[ruleName]:
JSON.parse(
event
.target
.value,
),
},
};

setRulesWithInvalidConfigs(
new Set(
[
Expand All @@ -540,12 +589,8 @@ export default function Configuration({
),
),
);
onUpdate(
Object.assign(
{},
options,
),
);

onUpdate(newOptions);
} catch {
setRulesWithInvalidConfigs(
new Set([
Expand Down
3 changes: 2 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ module.exports = (env, { mode }) => ({
include: path.resolve(__dirname, "src/playground"),
exclude: /node_modules/u,
options: {
configFile: path.resolve(__dirname, ".babelrc"),
plugins: ["babel-plugin-react-compiler"],
presets: ["@babel/preset-env", "@babel/preset-react"],
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ordering: babel-plugin-react-compiler => @babel/preset-react => @babel/preset-env

},
},
{
Expand Down