Skip to content

Commit 628fdd1

Browse files
ndom91ndom91
committed
fix: rename eslint/prettier configs to mjs in root
1 parent e84946d commit 628fdd1

5 files changed

+35
-37
lines changed

‎.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package
99
.env.*
1010
!.env.example
1111
crates/
12+
flake*
1213

1314
# Ignore files for PNPM, NPM and YARN
1415
pnpm-lock.yaml

‎.prettierrc.js ‎.prettierrc.mjs

File renamed without changes.

‎DEVELOPMENT.md

+29-31
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,28 @@ you right. Let's get started.
99

1010
- [Overview](#overview)
1111
- [The Basics](#the-basics)
12-
- [Prerequisites](#prerequisites)
13-
- [Install dependencies](#install-dependencies)
14-
- [Run the app](#run-the-app)
15-
- [Lint & format](#lint--format)
12+
- [Prerequisites](#prerequisites)
13+
- [Install dependencies](#install-dependencies)
14+
- [Run the app](#run-the-app)
15+
- [Lint & format](#lint--format)
1616
- [Debugging](#debugging)
17-
- [Logs](#logs)
18-
- [Tokio](#tokio)
17+
- [Logs](#logs)
18+
- [Tokio](#tokio)
1919
- [Building](#building)
20-
- [Building on Windows](#building-on-windows)
21-
- [File permissions](#file-permissions)
22-
- [Perl](#perl)
23-
- [Crosscompilation](#crosscompilation)
20+
- [Building on Windows](#building-on-windows)
21+
- [File permissions](#file-permissions)
22+
- [Perl](#perl)
23+
- [Crosscompilation](#crosscompilation)
2424
- [Design](#design)
2525
- [Contributing](#contributing)
2626
- [Some Other Random Notes](#some-other-random-notes)
27-
- [Icon generation](#icon-generation)
28-
- [Release](#release)
29-
- [Versioning](#versioning)
30-
- [Publishing](#publishing)
27+
- [Icon generation](#icon-generation)
28+
- [Release](#release)
29+
- [Versioning](#versioning)
30+
- [Publishing](#publishing)
3131
- [Development mode OAuth login](#development-mode-oauth-login)
3232
- [Joining the GitButler Team](#joining-the-gitbutler-team)
3333

34-
3534
---
3635

3736
## Overview
@@ -134,18 +133,18 @@ The app writes logs into:
134133

135134
We are also collecting tokio's runtime tracing information that could be viewed using [tokio-console](https://github.com/tokio-rs/console#tokio-console-prototypes):
136135

137-
- development:
138-
```bash
139-
$ tokio-console
140-
```
141-
- nightly:
142-
```bash
143-
$ tokio-console http://127.0.0.1:6668
144-
```
145-
- production:
146-
```bash
147-
$ tokio-console http://127.0.0.1:6667
148-
```
136+
- development:
137+
```bash
138+
$ tokio-console
139+
```
140+
- nightly:
141+
```bash
142+
$ tokio-console http://127.0.0.1:6668
143+
```
144+
- production:
145+
```bash
146+
$ tokio-console http://127.0.0.1:6667
147+
```
149148

150149
---
151150

@@ -175,7 +174,7 @@ Sometimes npm's prefix is incorrect on Windows, we can check this via:
175174
npm config get prefix
176175
```
177176

178-
If it's not `C:\Users\<username>\AppData\Roaming\npm` or another folder that is
177+
If it's not `C:\Users\<username>\AppData\Roaming\npm` or another folder that is
179178
normally writable, then we can set it in Powershell:
180179

181180
```sh
@@ -205,10 +204,10 @@ which only allow ARM Windows to be used.
205204

206205
The `winapi` dependency on `gitbutler-git` doesn't currently compile on ARM,
207206
which means cross-compilation to x86-64 is required to workaround that. Besides,
208-
most users will probably still be on INTEL machines, making this capability
207+
most users will probably still be on INTEL machines, making this capability
209208
a common requirement.
210209

211-
In a Git `bash`, *with MSVC for x86-64 installed on the system*, run the following
210+
In a Git `bash`, _with MSVC for x86-64 installed on the system_, run the following
212211
to prepare the environment.
213212

214213
```bash
@@ -302,4 +301,3 @@ If you are interested in joining our small but tightly knit engineering team, we
302301
- [Senior Rust developer](https://gitbutler.homerun.co/senior-rust-developer) (Onsite Berlin)
303302
- [Senior TypeScript developer](https://gitbutler.homerun.co/senior-typescript-developer) (Onsite Berlin)
304303
- [Senior Rails developer](https://gitbutler.homerun.co/senior-rails-developer) (Onsite Berlin)
305-

‎README.md

+5-6
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@
3737
[s5]: https://img.shields.io/youtube/channel/subscribers/UCEwkZIHGqsTGYvX8wgD0LoQ
3838
[l5]: https://www.youtube.com/@gitbutlerapp
3939
[s6]: https://img.shields.io/badge/GitButler-%23B9F4F2?logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMzkiIGhlaWdodD0iMjgiIHZpZXdCb3g9IjAgMCAzOSAyOCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTI1LjIxNDUgMTIuMTk5N0wyLjg3MTA3IDEuMzg5MTJDMS41NDI5NSAwLjc0NjUzMiAwIDEuNzE0MDYgMCAzLjE4OTQ3VjI0LjgxMDVDMCAyNi4yODU5IDEuNTQyOTUgMjcuMjUzNSAyLjg3MTA3IDI2LjYxMDlMMjUuMjE0NSAxNS44MDAzQzI2LjcxOTcgMTUuMDcyMSAyNi43MTk3IDEyLjkyNzkgMjUuMjE0NSAxMi4xOTk3WiIgZmlsbD0iYmxhY2siLz4KPHBhdGggZD0iTTEzLjc4NTUgMTIuMTk5N0wzNi4xMjg5IDEuMzg5MTJDMzcuNDU3MSAwLjc0NjUzMiAzOSAxLjcxNDA2IDM5IDMuMTg5NDdWMjQuODEwNUMzOSAyNi4yODU5IDM3LjQ1NzEgMjcuMjUzNSAzNi4xMjg5IDI2LjYxMDlMMTMuNzg1NSAxNS44MDAzQzEyLjI4MDMgMTUuMDcyMSAxMi4yODAzIDEyLjkyNzkgMTMuNzg1NSAxMi4xOTk3WiIgZmlsbD0idXJsKCNwYWludDBfcmFkaWFsXzMxMF8xMjkpIi8%2BCjxkZWZzPgo8cmFkaWFsR3JhZGllbnQgaWQ9InBhaW50MF9yYWRpYWxfMzEwXzEyOSIgY3g9IjAiIGN5PSIwIiByPSIxIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgZ3JhZGllbnRUcmFuc2Zvcm09InRyYW5zbGF0ZSgxNi41NzAxIDE0KSBzY2FsZSgxOS44NjQxIDE5LjgzODMpIj4KPHN0b3Agb2Zmc2V0PSIwLjMwMTA1NiIgc3RvcC1vcGFjaXR5PSIwIi8%2BCjxzdG9wIG9mZnNldD0iMSIvPgo8L3JhZGlhbEdyYWRpZW50Pgo8L2RlZnM%2BCjwvc3ZnPgo%3D
40-
4140
[l6]: https://gitbutler.com/
4241

43-
4442
GitButler is a git client that lets you work on multiple branches at the same time.
4543
It allows you to quickly organize file changes into separate branches while still having them applied to your working directory.
4644
You can then push branches individually to your remote, or directly create pull requests.
@@ -94,14 +92,14 @@ GitButler is a [Tauri](https://tauri.app/)-based application. Its UI is written
9492
9593
Using Git you can stash your changes and switch to another branch, where you can commit, and push your fix.
9694

97-
*With GitButler* you simply assign your fix to a separate virtual branch, which you can individually push (or directly create a PR). An additional benefit is that you can retain the fix in your working directory while waiting for CI and/or code review.
95+
_With GitButler_ you simply assign your fix to a separate virtual branch, which you can individually push (or directly create a PR). An additional benefit is that you can retain the fix in your working directory while waiting for CI and/or code review.
9896

9997
### Trying Someone Else's Branch Together With My Work in Progress
10098

10199
> Say you want to test a branch from someone else for the purpose of code review.
102100
103101
Using Git trying out someone else's branch is a full context switch away from your own work.
104-
*With GitButler* you can apply and unapply (add / remove) any remote branch directly into your working directory.
102+
_With GitButler_ you can apply and unapply (add / remove) any remote branch directly into your working directory.
105103

106104
## Documentation
107105

@@ -129,8 +127,9 @@ If you want to skip right to getting the code to actually compile, take a look
129127
at the [DEVELOPMENT.md](DEVELOPMENT.md) file.
130128

131129
Want to show your support? Add a GitButler badge to your project's README:
130+
132131
```md
133-
[![GitButler](https://img.shields.io/badge/GitButler-%23B9F4F2?logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMzkiIGhlaWdodD0iMjgiIHZpZXdCb3g9IjAgMCAzOSAyOCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTI1LjIxNDUgMTIuMTk5N0wyLjg3MTA3IDEuMzg5MTJDMS41NDI5NSAwLjc0NjUzMiAwIDEuNzE0MDYgMCAzLjE4OTQ3VjI0LjgxMDVDMCAyNi4yODU5IDEuNTQyOTUgMjcuMjUzNSAyLjg3MTA3IDI2LjYxMDlMMjUuMjE0NSAxNS44MDAzQzI2LjcxOTcgMTUuMDcyMSAyNi43MTk3IDEyLjkyNzkgMjUuMjE0NSAxMi4xOTk3WiIgZmlsbD0iYmxhY2siLz4KPHBhdGggZD0iTTEzLjc4NTUgMTIuMTk5N0wzNi4xMjg5IDEuMzg5MTJDMzcuNDU3MSAwLjc0NjUzMiAzOSAxLjcxNDA2IDM5IDMuMTg5NDdWMjQuODEwNUMzOSAyNi4yODU5IDM3LjQ1NzEgMjcuMjUzNSAzNi4xMjg5IDI2LjYxMDlMMTMuNzg1NSAxNS44MDAzQzEyLjI4MDMgMTUuMDcyMSAxMi4yODAzIDEyLjkyNzkgMTMuNzg1NSAxMi4xOTk3WiIgZmlsbD0idXJsKCNwYWludDBfcmFkaWFsXzMxMF8xMjkpIi8%2BCjxkZWZzPgo8cmFkaWFsR3JhZGllbnQgaWQ9InBhaW50MF9yYWRpYWxfMzEwXzEyOSIgY3g9IjAiIGN5PSIwIiByPSIxIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgZ3JhZGllbnRUcmFuc2Zvcm09InRyYW5zbGF0ZSgxNi41NzAxIDE0KSBzY2FsZSgxOS44NjQxIDE5LjgzODMpIj4KPHN0b3Agb2Zmc2V0PSIwLjMwMTA1NiIgc3RvcC1vcGFjaXR5PSIwIi8%2BCjxzdG9wIG9mZnNldD0iMSIvPgo8L3JhZGlhbEdyYWRpZW50Pgo8L2RlZnM%2BCjwvc3ZnPgo%3D
134-
)](https://gitbutler.com/)
132+
[![GitButler](https://img.shields.io/badge/GitButler-%23B9F4F2?logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMzkiIGhlaWdodD0iMjgiIHZpZXdCb3g9IjAgMCAzOSAyOCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTI1LjIxNDUgMTIuMTk5N0wyLjg3MTA3IDEuMzg5MTJDMS41NDI5NSAwLjc0NjUzMiAwIDEuNzE0MDYgMCAzLjE4OTQ3VjI0LjgxMDVDMCAyNi4yODU5IDEuNTQyOTUgMjcuMjUzNSAyLjg3MTA3IDI2LjYxMDlMMjUuMjE0NSAxNS44MDAzQzI2LjcxOTcgMTUuMDcyMSAyNi43MTk3IDEyLjkyNzkgMjUuMjE0NSAxMi4xOTk3WiIgZmlsbD0iYmxhY2siLz4KPHBhdGggZD0iTTEzLjc4NTUgMTIuMTk5N0wzNi4xMjg5IDEuMzg5MTJDMzcuNDU3MSAwLjc0NjUzMiAzOSAxLjcxNDA2IDM5IDMuMTg5NDdWMjQuODEwNUMzOSAyNi4yODU5IDM3LjQ1NzEgMjcuMjUzNSAzNi4xMjg5IDI2LjYxMDlMMTMuNzg1NSAxNS44MDAzQzEyLjI4MDMgMTUuMDcyMSAxMi4yODAzIDEyLjkyNzkgMTMuNzg1NSAxMi4xOTk3WiIgZmlsbD0idXJsKCNwYWludDBfcmFkaWFsXzMxMF8xMjkpIi8%2BCjxkZWZzPgo8cmFkaWFsR3JhZGllbnQgaWQ9InBhaW50MF9yYWRpYWxfMzEwXzEyOSIgY3g9IjAiIGN5PSIwIiByPSIxIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgZ3JhZGllbnRUcmFuc2Zvcm09InRyYW5zbGF0ZSgxNi41NzAxIDE0KSBzY2FsZSgxOS44NjQxIDE5LjgzODMpIj4KPHN0b3Agb2Zmc2V0PSIwLjMwMTA1NiIgc3RvcC1vcGFjaXR5PSIwIi8%2BCjxzdG9wIG9mZnNldD0iMSIvPgo8L3JhZGlhbEdyYWRpZW50Pgo8L2RlZnM%2BCjwvc3ZnPgo%3D)](https://gitbutler.com/)
135133
```
134+
136135
[![BADGE][s6]][l6]

‎eslint.config.js ‎eslint.config.mjs

File renamed without changes.

0 commit comments

Comments
 (0)