Skip to content

Commit 4ea430e

Browse files
fix: Fixes eslint
1 parent 991ed4b commit 4ea430e

File tree

5 files changed

+43
-34
lines changed

5 files changed

+43
-34
lines changed

.eslintrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"extends": "./.config/.eslintrc"
2+
"extends": "./.config/.eslintrc",
3+
"parserOptions": {
4+
"project": "./.config/tsconfig.json"
5+
}
36
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dev": "webpack -w -c ./.config/webpack/webpack.config.ts --env development",
88
"e2e": "yarn exec cypress install && yarn exec grafana-e2e run",
99
"e2e:update": "yarn exec cypress install && yarn exec grafana-e2e run --update-screenshots",
10-
"lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .",
10+
"lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx src/**/*.{ts,tsx}",
1111
"lint:fix": "yarn run lint --fix",
1212
"prepare": "husky install",
1313
"server": "docker-compose up --build",
@@ -47,7 +47,7 @@
4747
"eslint": "8.26.0",
4848
"eslint-config-prettier": "^8.8.0",
4949
"eslint-plugin-deprecation": "^2.0.0",
50-
"eslint-plugin-jsdoc": "^39.6.2",
50+
"eslint-plugin-jsdoc": "^46.0.0",
5151
"eslint-plugin-prettier": "^4.0.0",
5252
"eslint-plugin-react": "^7.26.1",
5353
"eslint-plugin-react-hooks": "^4.2.0",

src/components/HaystackQueryInput.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ export function HaystackQueryInput({ query, onChange }: HaystackQueryInputProps)
6464
);
6565
}
6666
return <p>Select a query type</p>;
67-
}
67+
}

src/types.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { DataQuery, DataSourceJsonData, SelectableValue } from '@grafana/data';
1+
import { DataSourceJsonData, SelectableValue } from '@grafana/data';
2+
import { DataQuery } from '@grafana/schema';
23

34
export interface HaystackQuery extends DataQuery {
45
type: string; // Defines the type of query that should be executed

yarn.lock

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,15 +1476,6 @@
14761476
resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6"
14771477
integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==
14781478

1479-
"@es-joy/jsdoccomment@~0.36.1":
1480-
version "0.36.1"
1481-
resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.36.1.tgz#c37db40da36e4b848da5fd427a74bae3b004a30f"
1482-
integrity sha512-922xqFsTpHs6D0BUiG4toiyPOMc8/jafnWKxz1KWgS4XzKPy2qXf1Pe6UFuNSCQqt6tOuhAWXBNuuyUhJmw9Vg==
1483-
dependencies:
1484-
comment-parser "1.3.1"
1485-
esquery "^1.4.0"
1486-
jsdoc-type-pratt-parser "~3.1.0"
1487-
14881479
"@es-joy/jsdoccomment@~0.40.1":
14891480
version "0.40.1"
14901481
resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.40.1.tgz#13acd77fb372ed1c83b7355edd865a3b370c9ec4"
@@ -1494,6 +1485,15 @@
14941485
esquery "^1.5.0"
14951486
jsdoc-type-pratt-parser "~4.0.0"
14961487

1488+
"@es-joy/jsdoccomment@~0.41.0":
1489+
version "0.41.0"
1490+
resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.41.0.tgz#4a2f7db42209c0425c71a1476ef1bdb6dcd836f6"
1491+
integrity sha512-aKUhyn1QI5Ksbqcr3fFJj16p99QdjUxXAEuFst1Z47DRyoiMwivIH9MV/ARcJOCXVjPfjITciej8ZD2O/6qUmw==
1492+
dependencies:
1493+
comment-parser "1.4.1"
1494+
esquery "^1.5.0"
1495+
jsdoc-type-pratt-parser "~4.0.0"
1496+
14971497
"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
14981498
version "4.4.0"
14991499
resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
@@ -4520,16 +4520,16 @@ commander@^5.1.0:
45204520
resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
45214521
integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
45224522

4523-
4524-
version "1.3.1"
4525-
resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b"
4526-
integrity sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==
4527-
45284523
45294524
version "1.4.0"
45304525
resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.0.tgz#0f8c560f59698193854f12884c20c0e39a26d32c"
45314526
integrity sha512-QLyTNiZ2KDOibvFPlZ6ZngVsZ/0gYnE6uTXi5aoDg8ed3AkJAz4sEje3Y8a29hQ1s6A99MZXe47fLAXQ1rTqaw==
45324527

4528+
4529+
version "1.4.1"
4530+
resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.1.tgz#bdafead37961ac079be11eb7ec65c4d021eaf9cc"
4531+
integrity sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==
4532+
45334533
common-path-prefix@^3.0.0:
45344534
version "3.0.0"
45354535
resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
@@ -5670,18 +5670,20 @@ [email protected]:
56705670
semver "^7.5.4"
56715671
spdx-expression-parse "^3.0.1"
56725672

5673-
eslint-plugin-jsdoc@^39.6.2:
5674-
version "39.9.1"
5675-
resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.9.1.tgz#e9ce1723411fd7ea0933b3ef0dd02156ae3068e2"
5676-
integrity sha512-Rq2QY6BZP2meNIs48aZ3GlIlJgBqFCmR55+UBvaDkA3ZNQ0SvQXOs2QKkubakEijV8UbIVbVZKsOVN8G3MuqZw==
5673+
eslint-plugin-jsdoc@^46.0.0:
5674+
version "46.10.1"
5675+
resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.10.1.tgz#77c871309c4ed93758a3b2fdf384dc6189cf8605"
5676+
integrity sha512-x8wxIpv00Y50NyweDUpa+58ffgSAI5sqe+zcZh33xphD0AVh+1kqr1ombaTRb7Fhpove1zfUuujlX9DWWBP5ag==
56775677
dependencies:
5678-
"@es-joy/jsdoccomment" "~0.36.1"
5679-
comment-parser "1.3.1"
5678+
"@es-joy/jsdoccomment" "~0.41.0"
5679+
are-docs-informative "^0.0.2"
5680+
comment-parser "1.4.1"
56805681
debug "^4.3.4"
56815682
escape-string-regexp "^4.0.0"
5682-
esquery "^1.4.0"
5683-
semver "^7.3.8"
5684-
spdx-expression-parse "^3.0.1"
5683+
esquery "^1.5.0"
5684+
is-builtin-module "^3.2.1"
5685+
semver "^7.5.4"
5686+
spdx-expression-parse "^4.0.0"
56855687

56865688
eslint-plugin-prettier@^4.0.0:
56875689
version "4.2.1"
@@ -7865,11 +7867,6 @@ jsbn@~0.1.0:
78657867
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
78667868
integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
78677869

7868-
jsdoc-type-pratt-parser@~3.1.0:
7869-
version "3.1.0"
7870-
resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz#a4a56bdc6e82e5865ffd9febc5b1a227ff28e67e"
7871-
integrity sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==
7872-
78737870
jsdoc-type-pratt-parser@~4.0.0:
78747871
version "4.0.0"
78757872
resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
@@ -10157,7 +10154,7 @@ semver@^6.3.1:
1015710154
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
1015810155
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
1015910156

10160-
semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
10157+
semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
1016110158
version "7.5.0"
1016210159
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
1016310160
integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
@@ -10444,6 +10441,14 @@ spdx-expression-parse@^3.0.1:
1044410441
spdx-exceptions "^2.1.0"
1044510442
spdx-license-ids "^3.0.0"
1044610443

10444+
spdx-expression-parse@^4.0.0:
10445+
version "4.0.0"
10446+
resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz#a23af9f3132115465dac215c099303e4ceac5794"
10447+
integrity sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==
10448+
dependencies:
10449+
spdx-exceptions "^2.1.0"
10450+
spdx-license-ids "^3.0.0"
10451+
1044710452
spdx-license-ids@^3.0.0:
1044810453
version "3.0.13"
1044910454
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5"

0 commit comments

Comments
 (0)