Skip to content

Commit 8fa3011

Browse files
aslilacaslilac
committed
sort imports
1 parent bb3d084 commit 8fa3011

File tree

505 files changed

+1635
-1642
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

505 files changed

+1635
-1642
lines changed

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ trim_trailing_whitespace = true
77
insert_final_newline = true
88
indent_style = tab
99

10-
[*.{md,json,yaml,yml,tf,tfvars,nix}]
10+
[*.{md,yaml,yml,tf,tfvars,nix}]
1111
indent_style = space
1212
indent_size = 2
1313

‎.prettierignore

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,13 @@ result
7979
# by Prettier.
8080
helm/**/templates/*.yaml
8181

82-
# Terraform state files used in tests, these are automatically generated.
83-
# Example: provisioner/terraform/testdata/instance-id/instance-id.tfstate.json
84-
**/testdata/**/*.tf*.json
85-
8682
# Testdata shouldn't be formatted.
87-
scripts/apitypings/testdata/**/*.ts
88-
enterprise/tailnet/testdata/*.golden.html
89-
tailnet/testdata/*.golden.html
90-
91-
# Generated files shouldn't be formatted.
92-
site/e2e/provisionerGenerated.ts
83+
testdata/
9384

85+
# Ignore generated files
9486
**/pnpm-lock.yaml
95-
96-
# Ignore generated JSON (e.g. examples/examples.gen.json).
9787
**/*.gen.json
88+
89+
# Everything in site/ is formatted by Biome. For the rest of the repo though, we
90+
# need broader language support.
91+
site/

‎.prettierignore.include

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,13 @@
22
# by Prettier.
33
helm/**/templates/*.yaml
44

5-
# Terraform state files used in tests, these are automatically generated.
6-
# Example: provisioner/terraform/testdata/instance-id/instance-id.tfstate.json
7-
**/testdata/**/*.tf*.json
8-
95
# Testdata shouldn't be formatted.
10-
scripts/apitypings/testdata/**/*.ts
11-
enterprise/tailnet/testdata/*.golden.html
12-
tailnet/testdata/*.golden.html
13-
14-
# Generated files shouldn't be formatted.
15-
site/e2e/provisionerGenerated.ts
6+
testdata/
167

8+
# Ignore generated files
179
**/pnpm-lock.yaml
18-
19-
# Ignore generated JSON (e.g. examples/examples.gen.json).
2010
**/*.gen.json
11+
12+
# Everything in site/ is formatted by Biome. For the rest of the repo though, we
13+
# need broader language support.
14+
site/

‎.vscode/extensions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"zxh404.vscode-proto3",
1010
"redhat.vscode-yaml",
1111
"streetsidesoftware.code-spell-checker",
12-
"dbaeumer.vscode-eslint",
13-
"EditorConfig.EditorConfig"
12+
"EditorConfig.EditorConfig",
13+
"biomejs.biome"
1414
]
1515
}

‎.vscode/settings.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@
190190
}
191191
]
192192
},
193-
"eslint.workingDirectories": ["./site"],
194193
"search.exclude": {
195194
"**.pb.go": true,
196195
"**/*.gen.json": true,
@@ -224,5 +223,16 @@
224223
// with VS Code.
225224
"typescript.tsdk": "./site/node_modules/typescript/lib",
226225
// Playwright tests in VSCode will open a browser to live "view" the test.
227-
"playwright.reuseBrowser": true
226+
"playwright.reuseBrowser": true,
227+
228+
"[javascript][javascriptreact][json][jsonc][typescript][typescriptreact]": {
229+
"editor.defaultFormatter": "biomejs.biome",
230+
"editor.codeActionsOnSave":{
231+
"source.organizeImports.biome": "explicit"
232+
}
233+
},
234+
235+
"[css][html][markdown]": {
236+
"editor.defaultFormatter": "biomejs.biome"
237+
}
228238
}

‎Makefile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ BOLD := $(shell tput bold 2>/dev/null)
391391
GREEN := $(shell tput setaf 2 2>/dev/null)
392392
RESET := $(shell tput sgr0 2>/dev/null)
393393

394-
fmt: fmt/ts fmt/terraform fmt/shfmt fmt/go
394+
fmt: fmt/ts fmt/go fmt/terraform fmt/shfmt fmt/prettier
395395
.PHONY: fmt
396396

397397
fmt/go:
@@ -414,6 +414,16 @@ else
414414
endif
415415
.PHONY: fmt/ts
416416

417+
fmt/prettier: .prettierignore
418+
echo "$(GREEN)==>$(RESET) $(BOLD)fmt/prettier$(RESET)"
419+
# Avoid writing files in CI to reduce file write activity
420+
ifdef CI
421+
pnpm run format:check
422+
else
423+
pnpm run format
424+
endif
425+
.PHONY: fmt/prettier
426+
417427
fmt/terraform: $(wildcard *.tf)
418428
echo "$(GREEN)==>$(RESET) $(BOLD)fmt/terraform$(RESET)"
419429
terraform fmt -recursive
@@ -521,8 +531,6 @@ gen/mark-fresh:
521531
coderd/apidoc/swagger.json \
522532
.prettierignore.include \
523533
.prettierignore \
524-
site/.prettierrc.yaml \
525-
site/.prettierignore \
526534
site/e2e/provisionerGenerated.ts \
527535
site/src/theme/icons.json \
528536
examples/examples.gen.json \

‎package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
"_comment": "This version doesn't matter, it's just to allow importing from other repos.",
33
"name": "coder",
44
"version": "0.0.0",
5+
"packageManager": "pnpm@9.7.1+sha512.faf344af2d6ca65c4c5c8c2224ea77a81a5e8859cbc4e06b1511ddce2f0151512431dd19e6aff31f2c6a8f5f2aced9bd2273e1fed7dd4de1868984059d2c4247",
56
"scripts": {
6-
"format": "prettier --cache --write",
7+
"format": "prettier --cache --write '**/*.{css,html,json,md,yaml,yml}'",
8+
"format:check": "prettier --cache --check '**/*.{css,html,json,md,yaml,yml}'",
79
"storybook": "pnpm run -C site/ storybook"
810
},
911
"devDependencies": {
10-
"prettier": "3.0.0"
11-
},
12-
"dependencies": {
13-
"exec": "^0.2.1"
14-
},
15-
"packageManager": "pnpm@8.14.0+sha1.bb42032ff80dba5f9245bc1b03470d2fa0b7fb2f"
12+
"prettier": "3.3.3"
13+
}
1614
}

‎pnpm-lock.yaml

Lines changed: 5 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"check:all": "pnpm format:check && pnpm lint && pnpm test",
1010
"chromatic": "chromatic",
1111
"dev": "vite",
12-
"format": "biome format --write e2e/ src/ && prettier --write '../**/*.{css,html,md,yaml,yml}'",
13-
"format:check": "biome format e2e/ src/ && prettier --check '../**/*.{css,html,md,yaml,yml}'",
14-
"lint": "pnpm run lint:types && pnpm run lint:check",
12+
"format": "biome format --write e2e/ src/",
13+
"format:check": "biome format e2e/ src/",
14+
"lint": "pnpm run lint:check && pnpm run lint:types",
1515
"lint:check": " biome lint --error-on-warnings e2e/ src/",
1616
"lint:fix": " biome lint --error-on-warnings --write e2e/ src/",
1717
"lint:types": "tsc -p .",

‎site/src/@types/storybook.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import * as _storybook_types from "@storybook/react";
2-
import type { QueryKey } from "react-query";
32
import type {
3+
DeploymentValues,
44
Experiments,
55
FeatureName,
66
SerpentOption,
77
User,
8-
DeploymentValues,
98
} from "api/typesGenerated";
109
import type { Permissions } from "contexts/auth/permissions";
10+
import type { QueryKey } from "react-query";
1111

1212
declare module "@storybook/react" {
1313
type WebSocketEvent =

0 commit comments

Comments
 (0)