Skip to content

Commit 339e885

Browse files
committed
add prettier to the standard flow
1 parent 2f2510c commit 339e885

File tree

6 files changed

+30
-39
lines changed

6 files changed

+30
-39
lines changed

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.vscode
22
.yarn
3+
**/*.md

.watchmanconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
{
2-
"ignore_dirs": [
3-
"testdata"
4-
]
2+
"ignore_dirs": ["testdata"]
53
}

docker-compose-dev.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ services:
44
entrypoint: python
55
command: "-m synapse.app.homeserver -c /config/homeserver.yaml"
66
volumes:
7-
- ./testdata/synapse:/config
8-
- ./testdata/synapse.data:/media-store
7+
- ./testdata/synapse:/config
8+
- ./testdata/synapse.data:/media-store
99

1010
mas:
1111
image: ghcr.io/element-hq/matrix-authentication-service:latest
1212
ports:
13-
- "8007:8007"
13+
- "8007:8007"
1414
volumes:
15-
- ./testdata/mas/config.yaml:/config.yaml:ro
15+
- ./testdata/mas/config.yaml:/config.yaml:ro
1616

1717
nginx:
1818
image: nginx:latest
1919
ports:
20-
- "8008:8008"
20+
- "8008:8008"
2121
volumes:
22-
- ./testdata/nginx/nginx.conf:/etc/nginx/conf.d/nginx.conf:ro
22+
- ./testdata/nginx/nginx.conf:/etc/nginx/conf.d/nginx.conf:ro
2323

2424
synapse-admin-prod:
2525
image: ghcr.io/etkecc/synapse-admin
@@ -31,17 +31,17 @@ services:
3131
condition: service_healthy
3232
restart: true
3333
ports:
34-
- "8080:8080"
34+
- "8080:8080"
3535
volumes:
36-
- ./testdata/element/nginx.conf:/etc/nginx/nginx.conf:ro
37-
- /dev/null:/etc/nginx/conf.d/default.conf:ro
38-
- ./testdata/element/config.json:/app/config.json:ro
36+
- ./testdata/element/nginx.conf:/etc/nginx/nginx.conf:ro
37+
- /dev/null:/etc/nginx/conf.d/default.conf:ro
38+
- ./testdata/element/config.json:/app/config.json:ro
3939

4040
postgres:
4141
image: postgres:17-alpine
4242
volumes:
43-
- ./testdata/postgres.data:/var/lib/postgresql/data
44-
- ./testdata/postgres.initdb:/docker-entrypoint-initdb.d:ro
43+
- ./testdata/postgres.data:/var/lib/postgresql/data
44+
- ./testdata/postgres.initdb:/docker-entrypoint-initdb.d:ro
4545
environment:
4646
POSTGRES_USER: synapse
4747
POSTGRES_PASSWORD: synapse

index.html

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
@@ -10,18 +10,8 @@
1010
manifest.json provides metadata used when your web app is installed on a
1111
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
1212
-->
13-
<link
14-
rel="manifest"
15-
href="./manifest.json"
16-
media="(prefers-color-scheme: light)"
17-
data-scheme="light"
18-
/>
19-
<link
20-
rel="manifest"
21-
href="./manifest-dark.json"
22-
media="(prefers-color-scheme: dark)"
23-
data-scheme="dark"
24-
/>
13+
<link rel="manifest" href="./manifest.json" media="(prefers-color-scheme: light)" data-scheme="light" />
14+
<link rel="manifest" href="./manifest-dark.json" media="(prefers-color-scheme: dark)" data-scheme="dark" />
2515
<link rel="shortcut icon" href="./favicon.ico" />
2616
<title>Synapse Admin</title>
2717
<style>
@@ -87,7 +77,7 @@
8777
.loader:before,
8878
.loader:after {
8979
position: absolute;
90-
content: '';
80+
content: "";
9181
}
9282

9383
.loader:before {
@@ -118,23 +108,23 @@
118108

119109
@-webkit-keyframes load2 {
120110
0% {
121-
-webkit-transform: rotate(0deg);
122-
transform: rotate(0deg);
111+
-webkit-transform: rotate(0deg);
112+
transform: rotate(0deg);
123113
}
124114
100% {
125-
-webkit-transform: rotate(360deg);
126-
transform: rotate(360deg);
115+
-webkit-transform: rotate(360deg);
116+
transform: rotate(360deg);
127117
}
128118
}
129119

130120
@keyframes load2 {
131121
0% {
132-
-webkit-transform: rotate(0deg);
133-
transform: rotate(0deg);
122+
-webkit-transform: rotate(0deg);
123+
transform: rotate(0deg);
134124
}
135125
100% {
136-
-webkit-transform: rotate(360deg);
137-
transform: rotate(360deg);
126+
-webkit-transform: rotate(360deg);
127+
transform: rotate(360deg);
138128
}
139129
}
140130
</style>
@@ -147,7 +137,7 @@
147137
</div>
148138
</div>
149139
<script type="module" src="/src/index.tsx"></script>
150-
<span id="js-version" style="display: none;"></span>
140+
<span id="js-version" style="display: none"></span>
151141
</body>
152142
<script>
153143
const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");

justfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ stop-dev:
4848
register-user localpart password *admin:
4949
docker-compose -f docker-compose-dev.yml exec mas mas-cli manage register-user --yes {{ if admin =="1" {"--admin"} else {"--no-admin"} }} -p {{ password }} {{ localpart }}
5050

51-
# run yarn {fix,lint,test} commands
51+
# run yarn {fix,format,test} commands
5252
test:
5353
@-yarn run fix
54+
@-yarn run format
5455
@-yarn run test
5556

5657
# run the app in a production mode

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
"start": "vite serve",
9898
"build": "vite build",
9999
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint --ignore-path .gitignore --ignore-pattern testdata/ --ext .ts,.tsx .",
100+
"format": "prettier --write \"src/**/*\"",
100101
"fix": "yarn lint --fix",
101102
"test": "yarn jest",
102103
"test:watch": "yarn jest --watch"

0 commit comments

Comments
 (0)