Skip to content

Commit

Permalink
fix: fix bugs with solid and astro support
Browse files Browse the repository at this point in the history
  • Loading branch information
aminya committed Mar 6, 2024
1 parent 037337c commit 190b2c3
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 7 deletions.
6 changes: 5 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"cSpell.words": ["Globified", "globify"],
"cSpell.words": [
"astrojs",
"Globified",
"globify"
],
"explorer.fileNesting.patterns": {
"index.js": "*.js"
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-config-atomic",
"version": "1.21.1",
"version": "1.21.2",
"description": "Eslint config used in atom-ide-community",
"repository": "https://github.com/atom-ide-community/eslint-config-atomic",
"license": "MIT",
Expand Down Expand Up @@ -36,6 +36,7 @@
"anymatch": "^3.1.3",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-astro": "^0.31.4",
"eslint-plugin-html": "^8.0.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-json": "^3.1.0",
Expand All @@ -44,7 +45,6 @@
"eslint-plugin-optimize-regex": "^1.2.1",
"eslint-plugin-react": "^7.34.0",
"eslint-plugin-solid": "^0.13.1",
"eslint-plugin-astro": "^0.31.4",
"eslint-plugin-yaml": "^0.5.0",
"globify-gitignore": "^1.0.3",
"make-synchronous": "^0.1.1",
Expand Down
7 changes: 7 additions & 0 deletions src/astro.cts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Linter } from "eslint"
import { pluginImportAstroRulesExtra } from "./plugin-import-rules.cjs"

export const astroConfig: Linter.ConfigOverride<Linter.RulesRecord> = {
// astro files
Expand All @@ -10,4 +11,10 @@ export const astroConfig: Linter.ConfigOverride<Linter.RulesRecord> = {
},
plugins: ["astro", "only-warn"],
extends: ["plugin:astro/recommended"],
rules: {
...pluginImportAstroRulesExtra
},
globals: {
astroHTML: "readonly",
},
}
8 changes: 6 additions & 2 deletions src/index-solid.cts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ import { tsConfig } from "./typescript.cjs"

const nonStrictConfig: Linter.Config = {
...base,
plugins: ["solid", ...(base.plugins ?? [])],
extends: ["plugin:solid/recommended", ...(base.extends ?? [])],
overrides: [
// JavaScript:
{
files: ["*.js", "*.jsx", "*.mjs", "*.cjs"],
plugins: ["solid", ...(base.plugins ?? [])],
extends: ["plugin:solid/recommended", ...(base.extends ?? [])],
},
// TypeScript:
{
...tsConfig,
Expand Down
13 changes: 11 additions & 2 deletions src/plugin-import-rules.cts
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,26 @@ export const pluginImportTypeScriptRulesExtra: Linter.RulesRecord = {
"import/namespace": "off",
}

export const pluginImportAstroRulesExtra: Linter.RulesRecord = {
// Buggy on Astro:
"import/default": "off",
"import/no-absolute-path": "off",
"import/no-unresolved": "off",
"import/no-extraneous-dependencies": "off",
}

export const pluginImportSettings = {
"import/core-modules": ["atom", "electron"],
// support TypeScript and Coffee importing
"import/extensions": [".ts", ".tsx", ".cts", ".mts", ".d.ts", ".js", ".cjs", ".mjs", ".jsx", ".coffee"],
"import/extensions": [".ts", ".tsx", ".cts", ".mts", ".d.ts", ".js", ".cjs", ".mjs", ".jsx", ".coffee", ".astro"],
"import/external-module-folders": ["node_modules", "node_modules/@types"],
"import/parsers": {
"@typescript-eslint/parser": [".ts", ".tsx", ".d.ts"],
"astro-eslint-parser": [".astro"],
},
"import/resolver": {
node: {
extensions: [".ts", ".tsx", ".cts", ".mts", ".d.ts", ".js", ".cjs", ".mjs", ".jsx", ".coffee"],
extensions: [".ts", ".tsx", ".cts", ".mts", ".d.ts", ".js", ".cjs", ".mjs", ".jsx", ".coffee", ".astro"],
},
},
}

0 comments on commit 190b2c3

Please sign in to comment.