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
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,66 @@ ruleTester.run(RULE_NAME, rule, {
],
},
{
code: tsx`<>text</>`,
code: tsx`
/** @jsx createElement */
/** @jsxFrag Fragment */

const element = <><div /></>;
`,
errors: [
{
messageId: "avoidShorthandFragment",
data: {
jsxFragmentFactory: "Fragment",
},
},
],
},
{
code: tsx`
/** @jsx React.createElement */
/** @jsxFrag React.Fragment */

const element = <><div /></>;
`,
errors: [
{
messageId: "avoidShorthandFragment",
data: {
jsxFragmentFactory: "React.Fragment",
},
},
],
},
{
code: tsx`
/** @jsx h */
/** @jsxFrag Fragment */

const element = <><div /></>;
`,
errors: [
{
messageId: "avoidShorthandFragment",
data: {
jsxFragmentFactory: "Fragment",
},
},
],
},
{
code: tsx`
/** @jsx Preact.h */
/** @jsxFrag Preact.Fragment */

const element = <><div /></>;
`,
errors: [
{
messageId: "avoidShorthandFragment",
data: {
jsxFragmentFactory: "Preact.Fragment",
},
},
],
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { RuleContext, RuleFeature } from "@eslint-react/kit";
import type { RuleListener } from "@typescript-eslint/utils/ts-eslint";
import type { CamelCase } from "string-ts";
import { JsxConfig, type RuleContext, type RuleFeature } from "@eslint-react/kit";

import { createRule } from "../utils";

Expand All @@ -18,7 +18,7 @@ export default createRule<[], MessageID>({
[Symbol.for("rule_features")]: RULE_FEATURES,
},
messages: {
avoidShorthandFragment: "Avoid using shorthand fragment syntax. Use 'Fragment' component instead.",
avoidShorthandFragment: "Avoid using shorthand fragment syntax. Use '{{jsxFragmentFactory}}' component instead.",
},
schema: [],
},
Expand All @@ -28,11 +28,21 @@ export default createRule<[], MessageID>({
});

export function create(context: RuleContext<MessageID, []>): RuleListener {
const jsxConfigFromContext = JsxConfig.getFromContext(context);
const jsxConfigFromAnnotation = JsxConfig.getFromAnnotation(context);
const jsxConfig = {
...jsxConfigFromContext,
...jsxConfigFromAnnotation,
};

return {
JSXFragment(node) {
context.report({
messageId: "avoidShorthandFragment",
node,
data: {
jsxFragmentFactory: jsxConfig.jsxFragmentFactory,
},
});
},
};
Expand Down