Skip to content

Commit 4079529

Browse files
committed
chore: merge eslint and prettier to oxlint and oxfmt
1 parent ae393a8 commit 4079529

File tree

213 files changed

+1266
-1420
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+1266
-1420
lines changed

.changeset/dull-emus-visit.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@resolid/react-ui": patch
3+
---
4+
5+
chore: merge eslint and prettier to oxlint and oxfmt

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@changesets/cli": "^2.29.8",
2424
"@commitlint/cli": "^20.4.2",
2525
"@commitlint/config-conventional": "^20.4.2",
26-
"@resolid/config": "^5.0.0",
26+
"@resolid/config": "^5.0.1",
2727
"@svitejs/changesets-changelog-github-compact": "^1.2.0",
2828
"@tailwindcss/language-server": "^0.14.29",
2929
"@types/node": "^24.10.13",

packages/react-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"dependencies": {
5050
"@floating-ui/react": "^0.27.18",
5151
"@formkit/tempo": "^1.0.0",
52-
"@resolid/utils": "^1.2.6",
52+
"@resolid/utils": "^1.2.7",
5353
"@tanstack/react-virtual": "^3.13.19",
5454
"tailwind-variants": "^3.2.2"
5555
},

packages/react-ui/plugins/react-compiler-plugin.js

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,33 @@ import { transformAsync } from "@babel/core";
1111
* @returns {import('rolldown').Plugin}
1212
* A Rolldown plugin instance.
1313
*/
14-
export const reactCompilerRolldownPlugin = ({ filter }) => {
15-
return {
16-
name: "rolldown-react-compiler-plugin",
17-
transform: {
18-
filter: {
19-
id: filter,
20-
},
21-
async handler(code, id) {
22-
const result = await transformAsync(code, {
23-
filename: id,
24-
plugins: [
25-
[
26-
"babel-plugin-react-compiler",
27-
{
28-
target: "19",
29-
},
30-
],
14+
export const reactCompilerRolldownPlugin = ({ filter }) => ({
15+
name: "rolldown-react-compiler-plugin",
16+
transform: {
17+
filter: {
18+
id: filter,
19+
},
20+
async handler(code, id) {
21+
const result = await transformAsync(code, {
22+
filename: id,
23+
plugins: [
24+
[
25+
"babel-plugin-react-compiler",
26+
{
27+
target: "19",
28+
},
3129
],
32-
parserOpts: { sourceType: "module", plugins: ["jsx", "typescript"] },
33-
ast: false,
34-
cloneInputAst: false,
35-
compact: false,
36-
sourceMaps: false,
37-
babelrc: false,
38-
configFile: false,
39-
});
30+
],
31+
parserOpts: { sourceType: "module", plugins: ["jsx", "typescript"] },
32+
ast: false,
33+
cloneInputAst: false,
34+
compact: false,
35+
sourceMaps: false,
36+
babelrc: false,
37+
configFile: false,
38+
});
4039

41-
return result.code;
42-
},
40+
return result.code;
4341
},
44-
};
45-
};
42+
},
43+
});

packages/react-ui/src/components/accordion/accordion-content.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@ import { CollapsibleContent } from "../collapsible/collapsible-content";
44

55
export const AccordionContent = (
66
props: PrimitiveProps<"div", EmptyObject, "id" | "role">,
7-
): JSX.Element => {
8-
return <CollapsibleContent role={"region"} {...props} />;
9-
};
7+
): JSX.Element => <CollapsibleContent role="region" {...props} />;

packages/react-ui/src/components/accordion/accordion-context.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export type AccordionContextValue = Required<AccordionBaseProps> & {
2121
setOpenedValue: Dispatch<SetStateAction<string | number | null | (string | number)[]>>;
2222
};
2323

24-
const desc = createSafeContext<AccordionContextValue>({ name: "AccordionContext" });
24+
const [context, hook] = createSafeContext<AccordionContextValue>({ name: "AccordionContext" });
2525

26-
export const AccordionContext: SafeContext<AccordionContextValue> = desc[0];
27-
export const useAccordion: UseSafeContext<AccordionContextValue> = desc[1];
26+
export const AccordionContext: SafeContext<AccordionContextValue> = context;
27+
export const useAccordion: UseSafeContext<AccordionContextValue> = hook;

packages/react-ui/src/components/accordion/accordion-header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ import { Polymorphic, type PolymorphicProps } from "../../primitives";
44
export const AccordionHeader = (props: PolymorphicProps<"h3">): JSX.Element => {
55
const { render, ...rest } = props;
66

7-
return <Polymorphic<"h3"> as={"h3"} render={render} {...rest} />;
7+
return <Polymorphic<"h3"> as="h3" render={render} {...rest} />;
88
};

packages/react-ui/src/components/accordion/accordion-item.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ export const AccordionItem = (props: PrimitiveProps<"div", AccordionItemProps>):
3333
const handleOpenChange = (open: boolean) => {
3434
if (open) {
3535
if (Array.isArray(openedValue)) {
36-
setOpenedValue((prev) => [value, ...(prev as Array<string | number>)]);
36+
setOpenedValue((prev) => [value, ...(prev as (string | number)[])]);
3737
} else {
3838
setOpenedValue(value);
3939
}
4040
} else {
4141
if (Array.isArray(openedValue)) {
42-
setOpenedValue((prev) => (prev as Array<string | number>).filter((p) => p != value));
42+
setOpenedValue((prev) => (prev as (string | number)[]).filter((p) => p != value));
4343
} else {
4444
if (collapsible) {
4545
setOpenedValue(null);

packages/react-ui/src/components/accordion/accordion-root.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export const AccordionRoot = (props: PrimitiveProps<"div", AccordionRootProps>):
9696
onNavigate={setActiveIndex}
9797
className={tx("flex", orientation == "horizontal" ? "flex-row" : "flex-col", className)}
9898
onKeyDown={handleKeyDown}
99-
render={(props) => <div {...props} aria-orientation={undefined} />}
99+
render={(renderProps) => <div {...renderProps} aria-orientation={undefined} />}
100100
{...rest}
101101
>
102102
<AccordionContext value={context}>

packages/react-ui/src/components/accordion/tests/accordion.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ const ComponentUnderTest = (props: AccordionProps) => {
2121

2222
return (
2323
<Accordion {...props}>
24-
{items.map((item, id) => (
25-
<AccordionItem key={id} value={item.value} disabled={item.disabled}>
24+
{items.map((item) => (
25+
<AccordionItem key={item.value} value={item.value} disabled={item.disabled}>
2626
<AccordionHeader>
2727
<AccordionTrigger>{item.value} Trigger</AccordionTrigger>
2828
</AccordionHeader>

0 commit comments

Comments
 (0)