Skip to content

Commit

Permalink
chore(site): align ESLint config to typescript-eslint's recommended-r…
Browse files Browse the repository at this point in the history
…equiring-type-checking (#5797)
  • Loading branch information
JoshuaKGoldberg committed Jan 26, 2023
1 parent dd8eab5 commit 43a441f
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 20 deletions.
31 changes: 21 additions & 10 deletions site/.eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ env:
extends:
- eslint:recommended
- plugin:@typescript-eslint/recommended
- plugin:@typescript-eslint/recommended-requiring-type-checking
- plugin:eslint-comments/recommended
- plugin:import/recommended
- plugin:import/typescript
Expand Down Expand Up @@ -35,28 +36,38 @@ root: true
rules:
"@typescript-eslint/brace-style":
["error", "1tbs", { "allowSingleLine": false }]
"@typescript-eslint/camelcase": "off"
"@typescript-eslint/explicit-function-return-type": "off"
"@typescript-eslint/method-signature-style": ["error", "property"]
"@typescript-eslint/no-floating-promises": error
"@typescript-eslint/no-invalid-void-type": error
# TODO: Investigate whether to enable this rule & fix and/or disable all its complaints
"@typescript-eslint/no-misused-promises": "off"
# TODO: Investigate whether to enable this rule & fix and/or disable all its complaints
"@typescript-eslint/no-unsafe-argument": "off"
# TODO: Investigate whether to enable this rule & fix and/or disable all its complaints
"@typescript-eslint/no-unsafe-assignment": "off"
# TODO: Investigate whether to enable this rule & fix and/or disable all its complaints
"@typescript-eslint/no-unsafe-call": "off"
# TODO: Investigate whether to enable this rule & fix and/or disable all its complaints
"@typescript-eslint/no-unsafe-member-access": "off"
# TODO: Investigate whether to enable this rule & fix and/or disable all its complaints
"@typescript-eslint/no-unsafe-return": "off"
# TODO: Investigate whether to enable this rule & fix and/or disable all its complaints
"@typescript-eslint/require-await": "off"
# TODO: Investigate whether to enable this rule & fix and/or disable all its complaints
"@typescript-eslint/restrict-plus-operands": "off"
# TODO: Investigate whether to enable this rule & fix and/or disable all its complaints
"@typescript-eslint/restrict-template-expressions": "off"
# TODO: Investigate whether to enable this rule & fix and/or disable all its complaints
"@typescript-eslint/unbound-method": "off"
# We're disabling the `no-namespace` rule to use a pattern of defining an interface,
# and then defining functions that operate on that data via namespace. This is helpful for
# dealing with immutable objects. This is a common pattern that shows up in some other
# large TypeScript projects, like VSCode.
# More details: https://github.com/coder/m/pull/9720#discussion_r697609528
"@typescript-eslint/no-namespace": "off"
"@typescript-eslint/no-unnecessary-boolean-literal-compare": error
"@typescript-eslint/no-unnecessary-condition": warn
"@typescript-eslint/no-unnecessary-type-assertion": warn
"@typescript-eslint/no-unused-vars":
- error
- argsIgnorePattern: "^_"
varsIgnorePattern: "^_"
ignoreRestSiblings: true
"@typescript-eslint/no-use-before-define": "off"
"@typescript-eslint/object-curly-spacing": ["error", "always"]
"@typescript-eslint/triple-slash-reference": "off"
"brace-style": "off"
"curly": ["error", "all"]
"eslint-comments/require-description": "error"
Expand Down
6 changes: 2 additions & 4 deletions site/src/api/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ export const hardCodedCSRFCookie = (): string => {
export const withDefaultFeatures = (
fs: Partial<TypesGen.Entitlements["features"]>,
): TypesGen.Entitlements["features"] => {
for (const k in TypesGen.FeatureNames) {
const feature = k as TypesGen.FeatureName
for (const feature of TypesGen.FeatureNames) {
// Skip fields that are already filled.
if (fs[feature] !== undefined) {
continue
Expand Down Expand Up @@ -140,8 +139,7 @@ export const getTokens = async (): Promise<TypesGen.APIKey[]> => {
}

export const deleteAPIKey = async (keyId: string): Promise<void> => {
const response = await axios.delete("/api/v2/users/me/keys/" + keyId)
return response.data
await axios.delete("/api/v2/users/me/keys/" + keyId)
}

export const getUsers = async (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const fillAndSubmitForm = async ({
await userEvent.clear(maxTtlField)
await userEvent.type(maxTtlField, default_ttl_ms.toString())

const allowCancelJobsField = await screen.getByRole("checkbox")
const allowCancelJobsField = screen.getByRole("checkbox")
// checkbox is checked by default, so it must be clicked to get unchecked
if (!allow_user_cancel_workspace_jobs) {
await userEvent.click(allowCancelJobsField)
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/UsersPage/UsersPage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ describe("UsersPage", () => {
expect(API.getUsers).toBeCalledWith({ offset: 0, limit: 25, q: "" }),
)

const pageButtons = await container.querySelectorAll(
const pageButtons = container.querySelectorAll(
`button[name="Page button"]`,
)
// count handler says there are 2 pages of results
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/WorkspacesPage/WorkspacesPage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe("WorkspacesPage", () => {
name: "Previous page",
})
expect(prevPage).toBeDisabled()
const pageButtons = await container.querySelectorAll(
const pageButtons = container.querySelectorAll(
`button[name="Page button"]`,
)
expect(pageButtons.length).toBe(2)
Expand Down
4 changes: 1 addition & 3 deletions site/src/xServices/users/searchUserXService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@ export const searchUserMachine = createMachine(
{
services: {
searchUsers: async (_, { query }) =>
await (
await getUsers(queryToFilter(query))
).users,
(await getUsers(queryToFilter(query))).users,
},
actions: {
assignSearchResults: assign({
Expand Down

0 comments on commit 43a441f

Please sign in to comment.