Skip to content

Commit 67228d2

Browse files
committed
Reformat all code with Prettier.
Signed-off-by: Anders Kaseorg <[email protected]>
1 parent 4521041 commit 67228d2

Some content is hidden

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

91 files changed

+8137
-7292
lines changed

.editorconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
root = true
22

33
[*]
4-
indent_style = tab
5-
indent_size = 4
64
end_of_line = lf
75
charset = utf-8
86
trim_trailing_whitespace = true
97
insert_final_newline = true
108

11-
[{package.json,*.yml}]
9+
[{*.css,*.html,*.js,*.json,*.ts}]
1210
indent_style = space
1311
indent_size = 2
14-
15-
[*.md]
16-
trim_trailing_whitespace = false

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,28 @@ about: Create a report to help us improve
44
---
55

66
**Describe the bug**
7+
78
<!-- A clear and concise description of what the bug is. -->
89

910
**To Reproduce**
11+
1012
<!-- Clear steps to reproduce the issue. -->
1113

1214
**Expected behavior**
15+
1316
<!-- A clear and concise description of what you expected to happen. -->
1417

1518
**Screenshots**
19+
1620
<!-- If applicable, add screenshots to help explain your problem. -->
1721

1822
**Desktop (please complete the following information):**
19-
- Operating System:
20-
<!-- (Platform and Version) e.g. macOS 10.13.6 / Windows 10 (1803) / Ubuntu 18.04 x64 -->
21-
- Zulip Desktop Version:
22-
<!-- e.g. 5.2.0 -->
23+
24+
- Operating System:
25+
<!-- (Platform and Version) e.g. macOS 10.13.6 / Windows 10 (1803) / Ubuntu 18.04 x64 -->
26+
- Zulip Desktop Version:
27+
<!-- e.g. 5.2.0 -->
2328

2429
**Additional context**
30+
2531
<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/custom.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
name: Custom issue template
33
about: Describe this issue template's purpose here.
44
---
5-
6-

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ about: Suggest an idea for this project
44
---
55

66
**Problem Description**
7+
78
<!-- Please add a clear and concise description of what the problem is. -->
89

910
**Proposed Solution**
11+
1012
<!-- Describe the solution you'd like in a clear and concise manner -->
1113

1214
**Describe alternatives you've considered**
15+
1316
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
1417

1518
**Additional context**
19+
1620
<!-- Add any other context or screenshots about the feature request here. -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
23
<!--
34
Remove the fields that are not appropriate
45
Please include:
@@ -11,6 +12,7 @@ Please include:
1112
**Screenshots?**
1213

1314
**You have tested this PR on:**
14-
- [ ] Windows
15-
- [ ] Linux/Ubuntu
16-
- [ ] macOS
15+
16+
- [ ] Windows
17+
- [ ] Linux/Ubuntu
18+
- [ ] macOS

.htmlhintrc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
{
2-
"tagname-lowercase": true,
3-
"attr-lowercase": true,
4-
"attr-value-double-quotes": true,
52
"attr-value-not-empty": false,
63
"attr-no-duplication": true,
74
"doctype-first": true,
8-
"tag-pair": true,
9-
"empty-tag-not-self-closed": true,
105
"spec-char-escape": true,
116
"id-unique": true,
127
"src-not-empty": true,
@@ -17,9 +12,8 @@
1712
"style-disabled": false,
1813
"inline-style-disabled": false,
1914
"inline-script-disabled": false,
20-
"space-tab-mixed-disabled": "space4",
2115
"id-class-ad-disabled": false,
2216
"href-abs-or-rel": false,
2317
"attr-unsafe-chars": true,
2418
"head-script-disabled": true
25-
}
19+
}

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/app/**/*.js
2+
/app/translations/*.json
3+
/dist

.prettierignore.non-js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
*.js
2+
*.ts
3+
/app/translations/*.json
4+
/dist

.stylelintrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
2-
"extends": ["stylelint-config-standard"],
2+
"extends": ["stylelint-config-standard", "stylelint-config-prettier"],
33
"rules": {
44
"color-named": "never",
55
"color-no-hex": true,
66
"font-family-no-missing-generic-family-keyword": [true, {"ignoreFontFamilies": ["Material Icons"]}],
7-
"indentation": 4,
87
"selector-type-no-unknown": [true, {"ignoreTypes": ["send-feedback", "webview"]}],
98
}
109
}

CONTRIBUTING.md

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,42 @@ Zulip-Desktop app is built on top of [Electron](http://electron.atom.io/). If yo
1010

1111
## Community
1212

13-
* The whole Zulip documentation, such as setting up a development environment, setting up with the Zulip webapp project, and testing, can be read [here](https://zulip.readthedocs.io).
13+
- The whole Zulip documentation, such as setting up a development environment, setting up with the Zulip webapp project, and testing, can be read [here](https://zulip.readthedocs.io).
1414

15-
* If you have any questions regarding zulip-desktop, open an [issue](https://github.com/zulip/zulip-desktop/issues/new/) or ask it on [chat.zulip.org](https://chat.zulip.org/#narrow/stream/16-desktop).
15+
- If you have any questions regarding zulip-desktop, open an [issue](https://github.com/zulip/zulip-desktop/issues/new/) or ask it on [chat.zulip.org](https://chat.zulip.org/#narrow/stream/16-desktop).
1616

1717
## Issue
18+
1819
Ensure the bug was not already reported by searching on GitHub under [issues](https://github.com/zulip/zulip-desktop/issues). If you're unable to find an open issue addressing the bug, open a [new issue](https://github.com/zulip/zulip-desktop/issues/new).
1920

2021
The [zulipbot](https://github.com/zulip/zulipbot) helps to claim an issue by commenting the following in the comment section: "**@zulipbot** claim". **@zulipbot** will assign you to the issue and label the issue as **in progress**. For more details, check out [**@zulipbot**](https://github.com/zulip/zulipbot).
2122

2223
Please pay attention to the following points while opening an issue.
2324

2425
### Does it happen on web browsers? (especially Chrome)
26+
2527
Zulip's desktop client is based on Electron, which integrates the Chrome engine within a standalone application.
2628
If the problem you encounter can be reproduced on web browsers, it may be an issue with [Zulip web app](https://github.com/zulip/zulip).
2729

2830
### Write detailed information
31+
2932
Detailed information is very helpful to understand an issue.
3033

3134
For example:
32-
* How to reproduce the issue, step-by-step.
33-
* The expected behavior (or what is wrong).
34-
* Screenshots for GUI issues.
35-
* The application version.
36-
* The operating system.
37-
* The Zulip-Desktop version.
3835

36+
- How to reproduce the issue, step-by-step.
37+
- The expected behavior (or what is wrong).
38+
- Screenshots for GUI issues.
39+
- The application version.
40+
- The operating system.
41+
- The Zulip-Desktop version.
3942

4043
## Pull Requests
44+
4145
Pull Requests are always welcome.
4246

4347
1. When you edit the code, please run `npm run test` to check the formatting of your code before you `git commit`.
4448
2. Ensure the PR description clearly describes the problem and solution. It should include:
45-
* The operating system on which you tested.
46-
* The Zulip-Desktop version on which you tested.
47-
* The relevant issue number, if applicable.
49+
- The operating system on which you tested.
50+
- The Zulip-Desktop version on which you tested.
51+
- The relevant issue number, if applicable.

README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Zulip Desktop Client
2+
23
[![Build Status](https://travis-ci.com/zulip/zulip-desktop.svg?branch=main)](https://travis-ci.com/github/zulip/zulip-desktop)
34
[![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-desktop?branch=main&svg=true)](https://ci.appveyor.com/project/zulip/zulip-desktop/branch/main)
45
[![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
@@ -10,21 +11,23 @@ Desktop client for Zulip. Available for Mac, Linux, and Windows.
1011
![screenshot](https://i.imgur.com/vekKnW4.png)
1112

1213
# Download
14+
1315
Please see the [installation guide](https://zulip.com/help/desktop-app-install-guide).
1416

1517
# Features
16-
* Sign in to multiple organizations
17-
* Desktop notifications with inline reply
18-
* Tray/dock integration
19-
* Multi-language spell checker
20-
* Automatic updates
18+
19+
- Sign in to multiple organizations
20+
- Desktop notifications with inline reply
21+
- Tray/dock integration
22+
- Multi-language spell checker
23+
- Automatic updates
2124

2225
# Reporting issues
2326

2427
This desktop client shares most of its code with the Zulip webapp.
2528
Issues in an individual organization's Zulip window should be reported
2629
in the [Zulip server and webapp
27-
project](https://github.com/zulip/zulip/issues/new). Other
30+
project](https://github.com/zulip/zulip/issues/new). Other
2831
issues in the desktop app and its settings should be reported [in this
2932
project](https://github.com/zulip/zulip-desktop/issues/new).
3033

@@ -34,4 +37,5 @@ First, join us on the [Zulip community server](https://zulip.readthedocs.io/en/l
3437
Also see our [contribution guidelines](./CONTRIBUTING.md) and our [development guide](./development.md).
3538

3639
# License
40+
3741
Released under the [Apache-2.0](./LICENSE) license.

0 commit comments

Comments
 (0)