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
232 changes: 113 additions & 119 deletions .pkgs/configs/eslint.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,130 +88,124 @@ const p11tGroups = {
},
groups: ["id", "type", "meta", "alias", "rules", "unknown"],
};
export const strictTypeChecked = defineConfig([
{
ignores: GLOB_JS,
},
{
extends: [
js.configs.recommended,
...tseslint.configs.strict,
export const strictTypeChecked = defineConfig({
ignores: GLOB_JS,
}, {
extends: [
js.configs.recommended,
...tseslint.configs.strict,
],
files: GLOB_TS,
rules: {
eqeqeq: ["error", "smart"],
"no-console": "error",
"no-else-return": "error",
"no-fallthrough": ["error", { commentPattern: ".*intentional fallthrough.*" }],
"no-implicit-coercion": ["error", { allow: ["!!"] }],
"prefer-object-has-own": "error",
"no-restricted-syntax": [
"error",
{
message: "no typescript named import",
selector: "ImportDeclaration[source.value='typescript'] ImportSpecifier",
},
],
files: GLOB_TS,
rules: {
eqeqeq: ["error", "smart"],
"no-console": "error",
"no-else-return": "error",
"no-fallthrough": ["error", { commentPattern: ".*intentional fallthrough.*" }],
"no-implicit-coercion": ["error", { allow: ["!!"] }],
"prefer-object-has-own": "error",
"no-restricted-syntax": [
"error",
{
message: "no typescript named import",
selector: "ImportDeclaration[source.value='typescript'] ImportSpecifier",
},
],
"@typescript-eslint/ban-ts-comment": [
"error",
{
"ts-check": false,
"ts-expect-error": "allow-with-description",
"ts-ignore": true,
"ts-nocheck": true,
},
],
"@typescript-eslint/ban-types": "off",
"@typescript-eslint/consistent-type-exports": "error",
"@typescript-eslint/consistent-type-imports": "error",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-confusing-void-expression": "off",
"@typescript-eslint/no-empty-object-type": "off",
"@typescript-eslint/no-misused-promises": "warn",
"@typescript-eslint/no-namespace": "off",
"@typescript-eslint/no-unnecessary-parameter-property-assignment": "warn",
"@typescript-eslint/no-unused-vars": ["warn", { caughtErrors: "all" }],
"@typescript-eslint/strict-boolean-expressions": ["error", {
allowAny: false,
allowNullableBoolean: false,
allowNullableEnum: false,
allowNullableNumber: false,
allowNullableObject: false,
allowNullableString: false,
allowNumber: true,
allowString: false,
}],
},
},
{
extends: [
jsdoc({ config: "flat/recommended-typescript-error" }),
pluginDeMorgan.configs.recommended,
pluginPerfectionist.configs["recommended-natural"],
pluginRegexp.configs["flat/recommended"],
"@typescript-eslint/ban-ts-comment": [
"error",
{
"ts-check": false,
"ts-expect-error": "allow-with-description",
"ts-ignore": true,
"ts-nocheck": true,
},
],
files: GLOB_TS,
plugins: {
["@stylistic"]: stylistic,
["function"]: pluginFunction,
["unicorn"]: pluginUnicorn,
},
rules: {
"function/function-return-boolean": ["error", { pattern: "/^(is|has|can|should)/" }],
"@stylistic/arrow-parens": ["warn", "always"],
"@stylistic/no-multi-spaces": ["warn"],
"@stylistic/operator-linebreak": "off",
"@stylistic/quote-props": ["error", "as-needed"],
"perfectionist/sort-exports": "off",
"perfectionist/sort-imports": "off",
"perfectionist/sort-interfaces": [
"warn",
{ ...p11tOptions, ...p11tGroups },
],
"perfectionist/sort-intersection-types": "off",
"perfectionist/sort-modules": "off",
"perfectionist/sort-named-exports": "off",
"perfectionist/sort-named-imports": "off",
"perfectionist/sort-object-types": [
"warn",
{ ...p11tOptions, ...p11tGroups },
],
"perfectionist/sort-objects": [
"warn",
{ ...p11tOptions, ...p11tGroups },
],
"perfectionist/sort-switch-case": "off",
"perfectionist/sort-union-types": "off",
"jsdoc/check-param-names": "warn",
"jsdoc/check-tag-names": "warn",
"jsdoc/informative-docs": "off",
"jsdoc/lines-before-block": "off",
"jsdoc/require-jsdoc": "off",
"jsdoc/require-param": "warn",
"jsdoc/require-param-description": "warn",
"jsdoc/require-returns": "off",
"jsdoc/require-yields": "warn",
"jsdoc/tag-lines": "off",
"unicorn/template-indent": [
"warn",
{
comments: templateIndentTags,
tags: templateIndentTags,
},
],
},
"@typescript-eslint/ban-types": "off",
"@typescript-eslint/consistent-type-exports": "error",
"@typescript-eslint/consistent-type-imports": "error",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-confusing-void-expression": "off",
"@typescript-eslint/no-empty-object-type": "off",
"@typescript-eslint/no-misused-promises": "warn",
"@typescript-eslint/no-namespace": "off",
"@typescript-eslint/no-unnecessary-parameter-property-assignment": "warn",
"@typescript-eslint/no-unused-vars": ["warn", { caughtErrors: "all" }],
"@typescript-eslint/strict-boolean-expressions": ["error", {
allowAny: false,
allowNullableBoolean: false,
allowNullableEnum: false,
allowNullableNumber: false,
allowNullableObject: false,
allowNullableString: false,
allowNumber: true,
allowString: false,
}],
},
]);
export const disableTypeChecked = defineConfig([
{
extends: [
tseslint.configs.disableTypeChecked,
}, {
extends: [
jsdoc({ config: "flat/recommended-typescript-error" }),
pluginDeMorgan.configs.recommended,
pluginPerfectionist.configs["recommended-natural"],
pluginRegexp.configs["flat/recommended"],
],
files: GLOB_TS,
plugins: {
["@stylistic"]: stylistic,
["function"]: pluginFunction,
["unicorn"]: pluginUnicorn,
},
rules: {
"function/function-return-boolean": ["error", { pattern: "/^(is|has|can|should)/" }],
"@stylistic/arrow-parens": ["warn", "always"],
"@stylistic/no-multi-spaces": ["warn"],
"@stylistic/operator-linebreak": "off",
"@stylistic/quote-props": ["error", "as-needed"],
"perfectionist/sort-exports": "off",
"perfectionist/sort-imports": "off",
"perfectionist/sort-interfaces": [
"warn",
{ ...p11tOptions, ...p11tGroups },
],
rules: {
"function/function-return-boolean": "off",
},
"perfectionist/sort-intersection-types": "off",
"perfectionist/sort-modules": "off",
"perfectionist/sort-named-exports": "off",
"perfectionist/sort-named-imports": "off",
"perfectionist/sort-object-types": [
"warn",
{ ...p11tOptions, ...p11tGroups },
],
"perfectionist/sort-objects": [
"warn",
{ ...p11tOptions, ...p11tGroups },
],
"perfectionist/sort-switch-case": "off",
"perfectionist/sort-union-types": "off",
"jsdoc/check-param-names": "warn",
"jsdoc/check-tag-names": "warn",
"jsdoc/informative-docs": "off",
"jsdoc/lines-before-block": "off",
"jsdoc/require-jsdoc": "off",
"jsdoc/require-param": "warn",
"jsdoc/require-param-description": "warn",
"jsdoc/require-returns": "off",
"jsdoc/require-yields": "warn",
"jsdoc/tag-lines": "off",
"unicorn/template-indent": [
"warn",
{
comments: templateIndentTags,
tags: templateIndentTags,
},
],
},
});
export const disableTypeChecked = defineConfig({
extends: [
tseslint.configs.disableTypeChecked,
],
rules: {
"function/function-return-boolean": "off",
},
]);
});
/**
* Common ESLint JS rules to disable that are problematic when using TypeScript.
*/
Expand Down
8 changes: 4 additions & 4 deletions .pkgs/configs/eslint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const p11tGroups = {
groups: ["id", "type", "meta", "alias", "rules", "unknown"],
};

export const strictTypeChecked: Linter.Config[] = defineConfig([
export const strictTypeChecked: Linter.Config[] = defineConfig(
{
ignores: GLOB_JS,
},
Expand Down Expand Up @@ -217,9 +217,9 @@ export const strictTypeChecked: Linter.Config[] = defineConfig([
],
},
},
]);
);

export const disableTypeChecked: Linter.Config[] = defineConfig([
export const disableTypeChecked: Linter.Config[] = defineConfig(
{
extends: [
tseslint.configs.disableTypeChecked,
Expand All @@ -228,7 +228,7 @@ export const disableTypeChecked: Linter.Config[] = defineConfig([
"function/function-return-boolean": "off",
},
},
]);
);

/**
* Common ESLint JS rules to disable that are problematic when using TypeScript.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ import eslintJs from "@eslint/js";
import { defineConfig } from "eslint/config";
import tseslint from "typescript-eslint";

export default defineConfig([
export default defineConfig(
{
files: ["**/*.ts", "**/*.tsx"],

Expand Down Expand Up @@ -111,7 +111,7 @@ export default defineConfig([
"@eslint-react/no-missing-key": "warn",
},
},
]);
);
```

[Full Installation Guide ↗](https://eslint-react.xyz/docs/getting-started/typescript)
Expand Down
4 changes: 2 additions & 2 deletions apps/website/content/docs/getting-started/javascript.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { Step, Steps } from "fumadocs-ui/components/steps";
import eslintReact from "@eslint-react/eslint-plugin";
import { defineConfig } from "eslint/config";

export default defineConfig([
export default defineConfig(
{
files: ["**/*.js", "**/*.jsx"],

Expand All @@ -56,7 +56,7 @@ import { Step, Steps } from "fumadocs-ui/components/steps";
"@eslint-react/no-missing-key": "warn",
},
},
]);
);
```
</Step>

Expand Down
4 changes: 2 additions & 2 deletions apps/website/content/docs/getting-started/typescript.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { Step, Steps } from "fumadocs-ui/components/steps";
import { defineConfig } from "eslint/config";
import tseslint from "typescript-eslint";

export default defineConfig([
export default defineConfig(
{
files: ["**/*.ts", "**/*.tsx"],

Expand Down Expand Up @@ -59,7 +59,7 @@ import { Step, Steps } from "fumadocs-ui/components/steps";
"@eslint-react/no-missing-key": "warn",
},
},
]);
);
```
</Step>

Expand Down
5 changes: 2 additions & 3 deletions apps/website/eslint.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ const GLOB_IGNORES = [
const dirname = fileURLToPath(new URL(".", import.meta.url));
const gitignore = fileURLToPath(new URL(".gitignore", import.meta.url));

export default defineConfig([
// @ts-expect-error - types issue
export default defineConfig(
includeIgnoreFile(gitignore, "Imported .gitignore patterns"),
globalIgnores(GLOB_IGNORES),
{
Expand Down Expand Up @@ -89,4 +88,4 @@ export default defineConfig([
"no-undef": "off",
},
},
]);
);
4 changes: 2 additions & 2 deletions eslint.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import tseslint from "typescript-eslint";
const dirname = fileURLToPath(new URL(".", import.meta.url));
const gitignore = fileURLToPath(new URL(".gitignore", import.meta.url));

export default defineConfig([
export default defineConfig(
includeIgnoreFile(gitignore, "Imported .gitignore patterns") as never,
globalIgnores([
...GLOB_IGNORES,
Expand Down Expand Up @@ -106,4 +106,4 @@ export default defineConfig([
},
},
disableProblematicEslintJsRules,
]);
);
4 changes: 2 additions & 2 deletions examples/next/eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const GLOB_CONFIG = ["**/*.config.{js,mjs,ts,tsx}"];

const gitignore = fileURLToPath(new URL(".gitignore", import.meta.url));

export default defineConfig([
export default defineConfig(
includeIgnoreFile(gitignore, "Imported .gitignore patterns"),
{
files: GLOB_TS,
Expand Down Expand Up @@ -68,4 +68,4 @@ export default defineConfig([
"no-console": "off",
},
},
]);
);
4 changes: 2 additions & 2 deletions examples/react-dom-js/eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import globals from "globals";
import JSCONFIG_APP from "./jsconfig.app.json" with { type: "json" };
import JSCONFIG_NODE from "./jsconfig.node.json" with { type: "json" };

export default defineConfig([
export default defineConfig(
// base configuration for browser environment source files
{
files: JSCONFIG_APP.include,
Expand Down Expand Up @@ -56,4 +56,4 @@ export default defineConfig([
eslintPluginReactRefresh.configs.recommended,
],
},
]);
);
Loading
Loading