Skip to content

feat(dev-infra): enable formatting of //webui #1429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sudoforge merged 1 commit into from
May 17, 2025
Merged

feat(dev-infra): enable formatting of //webui #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ jobs:
- name: Check out code
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- uses: DeterminateSystems/nix-installer-action@21a544727d0c62386e78b4befe52d19ad12692e3 # v17

- uses: nicknovitski/nix-develop@9be7cfb4b10451d3390a75dc18ad0465bed4932a # v1.2.1

- name: Install
run: make install

Expand Down
18 changes: 12 additions & 6 deletions treefmt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
};

mdformat = {
enable = true;
enable = false;

package = pkgs.mdformat.withPlugins (
p: with p; [
Expand Down Expand Up @@ -42,11 +42,8 @@
strict = true;
};

# this is disabled due to `//webui` not yet being integrated with the flake.
# the entire package directory is ignored below in
# `settings.global.excludes`.
prettier = {
enable = false;
enable = true;

settings = {
singleQuote = true;
Expand Down Expand Up @@ -79,8 +76,17 @@
"doc/man/*.1" # generated via //doc:generate.go
"doc/md/*" # generated via //doc:generate.go
"misc/completion/*/*"
"webui/*" # not currently supported, //webui is not yet flakeified
"Makefile"
]
++ excludes;

settings.formatter = {
prettier = {
excludes = [
"*.md"
"*.yaml"
"*.yml"
];
};
};
}
6 changes: 3 additions & 3 deletions webui/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
extends: ['react-app', 'prettier', 'plugin:prettier/recommended'],
extends: ['react-app'],
rules: {
'import/order': [
'error',
Expand Down Expand Up @@ -42,8 +42,8 @@ module.exports = {
},
parserOptions: {
schema: './src/schema.json',
operations: './src/**/*.graphql'
}
operations: './src/**/*.graphql',
},
},
],
};
3 changes: 2 additions & 1 deletion webui/codegen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
schema: '../api/graphql/schema/*.graphql'
overwrite: true
documents: src/**/*.graphql
Expand Down Expand Up @@ -31,4 +32,4 @@ generates:

hooks:
afterAllFileWrite:
- prettier --write
- nix fmt
180 changes: 0 additions & 180 deletions webui/package-lock.json
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions webui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@
"@types/node": "^22.15.18",
"@types/react": "^19.1.4",
"@types/react-dom": "^19.1.5",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.4.0",
"prettier": "^3.5.3",
"react-scripts": "^5.0.1",
"typescript": "^4.9.5"
},
Expand Down
26 changes: 13 additions & 13 deletions webui/packed_assets.go
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 16 additions & 14 deletions webui/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
<title>git-bug webui</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root">
</div>
</body>
<head>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta name="theme-color" content="#000000" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<title>git-bug webui</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
</body>
</html>
Loading