Skip to content

Commit

Permalink
chore: simplify eslint typescript parser
Browse files Browse the repository at this point in the history
  • Loading branch information
schoero committed Dec 20, 2023
1 parent 8435e2e commit 5bd5ac2
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 59 deletions.
66 changes: 13 additions & 53 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import eslintPluginSortExports from "eslint-plugin-sort-exports";
import eslintPluginVitest from "eslint-plugin-vitest";

import eslintPluginTypeScript from "@typescript-eslint/eslint-plugin";
import eslintParserTypeScript from "@typescript-eslint/parser";

import sharedRules from "@schoero/configs/eslint";

Expand Down Expand Up @@ -46,19 +45,13 @@ export default [

{
files: ["**/*.ts"],
languageOptions: {
parser: eslintParserTypeScript,
parserOptions: {
project: "./tsconfig.json"
}
},
plugins: {
"eslint-plugin-ts": eslintPluginTypeScript,
"eslint-plugin-typescript": eslintPluginTypeScript,
"eslint-plugin-vitest": eslintPluginVitest
},
rules: {
"eslint-plugin-ts/no-duplicate-type-constituents": "off",
"eslint-plugin-ts/no-restricted-imports": ["error", {
"eslint-plugin-typescript/no-duplicate-type-constituents": "off",
"eslint-plugin-typescript/no-restricted-imports": ["error", {
patterns: [
...indexImports,
...dependencyInjection
Expand All @@ -69,9 +62,6 @@ export default [
},
{
files: ["schemas/renderer/config.json"],
languageOptions: {
parser: eslintPluginJsonc
},
plugins: {
"eslint-plugin-jsonc": eslintPluginJsonc
},
Expand All @@ -96,17 +86,11 @@ export default [
files: [
"**/platform/**/browser.ts"
],
languageOptions: {
parser: eslintParserTypeScript,
parserOptions: {
project: "./tsconfig.json"
}
},
plugins: {
"eslint-plugin-ts": eslintPluginTypeScript
"eslint-plugin-typescript": eslintPluginTypeScript
},
rules: {
"eslint-plugin-ts/no-restricted-imports": ["error", {
"eslint-plugin-typescript/no-restricted-imports": ["error", {
patterns: [
{
allowTypeImports: true,
Expand All @@ -122,17 +106,11 @@ export default [
files: [
"**/platform/**/node.ts"
],
languageOptions: {
parser: eslintParserTypeScript,
parserOptions: {
project: "./tsconfig.json"
}
},
plugins: {
"eslint-plugin-ts": eslintPluginTypeScript
"eslint-plugin-typescript": eslintPluginTypeScript
},
rules: {
"eslint-plugin-ts/no-restricted-imports": ["error", {
"eslint-plugin-typescript/no-restricted-imports": ["error", {
patterns: [
{
allowTypeImports: true,
Expand All @@ -151,17 +129,11 @@ export default [
"**/*.test-d.ts",
"**/tests/**/*.ts"
],
languageOptions: {
parser: eslintParserTypeScript,
parserOptions: {
project: "./tsconfig.json"
}
},
plugins: {
"eslint-plugin-ts": eslintPluginTypeScript
"eslint-plugin-typescript": eslintPluginTypeScript
},
rules: {
"eslint-plugin-ts/no-restricted-imports": ["error", {
"eslint-plugin-typescript/no-restricted-imports": ["error", {
patterns: [
{
allowTypeImports: false,
Expand Down Expand Up @@ -197,17 +169,11 @@ export default [
files: [
"**/renderer/markup/html/**/*.ts"
],
languageOptions: {
parser: eslintParserTypeScript,
parserOptions: {
project: "./tsconfig.json"
}
},
plugins: {
"eslint-plugin-ts": eslintPluginTypeScript
"eslint-plugin-typescript": eslintPluginTypeScript
},
rules: {
"eslint-plugin-ts/no-restricted-imports": ["error", {
"eslint-plugin-typescript/no-restricted-imports": ["error", {
patterns: [
...dependencyInjection,
...indexImports,
Expand All @@ -228,17 +194,11 @@ export default [
files: [
"**/renderer/markup/markdown/**/*.ts"
],
languageOptions: {
parser: eslintParserTypeScript,
parserOptions: {
project: "./tsconfig.json"
}
},
plugins: {
"eslint-plugin-ts": eslintPluginTypeScript
"eslint-plugin-typescript": eslintPluginTypeScript
},
rules: {
"eslint-plugin-ts/no-restricted-imports": ["error", {
"eslint-plugin-typescript/no-restricted-imports": ["error", {
patterns: [
...dependencyInjection,
...indexImports,
Expand Down
11 changes: 6 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"typescript": "^5.3.3"
},
"devDependencies": {
"@schoero/configs": "^0.0.0-beta.2",
"@schoero/configs": "^0.0.0-beta.5",
"@types/minimatch": "^5.1.2",
"@types/node": "^20.10.5",
"changelogen": "^0.5.5",
Expand Down

0 comments on commit 5bd5ac2

Please sign in to comment.