Skip to content

Commit 42ead71

Browse files
committed
Merge branch 'main' into 2.0.0-next
2 parents e1fc626 + 49aa622 commit 42ead71

File tree

6 files changed

+29
-5
lines changed

6 files changed

+29
-5
lines changed

apps/website/content/docs/configuration/configure-language-config.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: "Configure Language Config"
44

55
import { JSXConfigTypeTable } from "./configure-language-config";
66

7-
ESLint React uses your language config for static analysis. This page details which options are used and how they affect the linting process.
7+
ESLint React uses your Language Config for static analysis. This page details which options are used and how they affect the linting process.
88

99
## JSX Transform
1010

@@ -18,7 +18,7 @@ The following compiler options are respected:
1818

1919
Since this part does not perform type checking, there is **almost no performance impact**.
2020

21-
## Rules that Need Type Information
21+
## Type Information
2222

2323
ESLint React uses the Typed Linting API from `typescript-eslint` to retrieve type information for the rules that require it.
2424

apps/website/content/docs/configuration/meta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"title": "Configuration",
33
"pages": [
44
"configure-analyzer",
5-
"configure-language-config",
65
"!configure-language-preference",
6+
"configure-language-config",
77
"!---Advanced Configuration---",
88
"!enhanced-additional-components",
99
"!using-custom-parsers"

apps/website/content/docs/getting-started/javascript.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export default defineConfig([
6969

7070
<Step>
7171

72-
## Configure Language Service Integration (Optional)
72+
## Configure Language Config (Optional)
7373

7474
```ts title="eslint.config.js"
7575
// @ts-check

apps/website/content/docs/getting-started/typescript.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export default tseslint.config({
7070

7171
<Step>
7272

73-
## Configure Language Service Integration (Optional)
73+
## Configure Language Config (Optional)
7474

7575
```ts title="eslint.config.js"
7676
// @ts-check
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
title: "Glossary"
3+
description: "A collection of terms and concepts used in the ESLint React."
4+
---
5+
6+
## L
7+
8+
### Language Config
9+
10+
The configuration file specifies the root files and the options for the features provided by the language service.
11+
12+
ESLint React uses the Language Config to provide information (e.g. [JSX Transform](/docs/configuration/configure-language-config#jsx-transform)) about the code it is linting.
13+
14+
For TypeScript or JavaScript files, the Language Config are typically named `tsconfig.json` or `jsconfig.json` and are located in the root of a project.
15+
16+
For MDX files, the Language Config is the `"mdx"` property in the `tsconfig.json` file.
17+
18+
### Language Preference
19+
20+
Language Preference is a set of rules that represents the user's preference for how code should be formatted.
21+
22+
ESLint React provides a way to customize the code style used in the internal fixer's output through Language Preference.

apps/website/content/docs/meta.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
"title": "Documentation",
33
"pages": [
44
"getting-started",
5+
"---Core Concepts---",
6+
"glossary",
57
"---Core Reference---",
68
"rules",
79
"presets",

0 commit comments

Comments
 (0)