Skip to content

Commit 2d345d0

Browse files
committed
Update prettier formatting settings
Unlike lint rules which often have objective value, code style is swamp of preference, often without good rules. At GitButler, we want to use the language or ecosystem's default code style unless there is some very good reason like accessibility that the whole team has gotten behind. For JS, we ended up deciding to revert `singleQuote` and `trailingComma` to the prettier defaults since there doesn’t seem to be any good reason to diverge there. For now, we’ve left the `printWidth` set to `100` since there was not concensus around reducing it to the default, and having parity with the `rustfmt` is a pretty good reason.
1 parent 1bba3a6 commit 2d345d0

File tree

1,154 files changed

+21517
-21492
lines changed

Some content is hidden

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

1,154 files changed

+21517
-21492
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
name: init-env-node
22
description: Prepare Node.js Environment
33
runs:
4-
using: 'composite'
4+
using: "composite"
55
steps:
66
- uses: pnpm/action-setup@v4
77
name: Install pnpm
88
- uses: actions/setup-node@v4
99
name: Setup node
1010
with:
1111
cache: pnpm
12-
node-version-file: '.nvmrc'
12+
node-version-file: ".nvmrc"
1313
- name: Install dependencies
1414
shell: bash
1515
run: pnpm install

.github/dependabot.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
version: 2
22

33
updates:
4-
- package-ecosystem: 'github-actions'
5-
directory: '/'
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
66
schedule:
7-
interval: 'weekly'
7+
interval: "weekly"
88

9-
- package-ecosystem: 'npm'
10-
directory: '/'
9+
- package-ecosystem: "npm"
10+
directory: "/"
1111
schedule:
12-
interval: 'weekly'
12+
interval: "weekly"
1313
ignore:
14-
- dependency-name: '*'
15-
update-types: ['version-update:semver-major']
16-
- dependency-name: '*lexical*'
14+
- dependency-name: "*"
15+
update-types: ["version-update:semver-major"]
16+
- dependency-name: "*lexical*"
1717
# Lexical must match svelte-lexical, updating manually.
18-
update-types: ['version-update:semver-minor']
18+
update-types: ["version-update:semver-minor"]
1919
groups:
2020
npm-updates:
2121
update-types: [minor, patch]
2222

23-
- package-ecosystem: 'cargo'
24-
directory: '/'
23+
- package-ecosystem: "cargo"
24+
directory: "/"
2525
schedule:
26-
interval: 'monthly'
26+
interval: "monthly"
2727
ignore:
28-
- dependency-name: '*'
29-
update-types: ['version-update:semver-major']
30-
- dependency-name: 'libsqlite3-sys'
28+
- dependency-name: "*"
29+
update-types: ["version-update:semver-major"]
30+
- dependency-name: "libsqlite3-sys"
3131
groups:
3232
rust-updates:
3333
update-types: [minor, patch]

.github/pr-labeler.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ CLI:
88
- changed-files:
99
- any-glob-to-any-file: crates/but/**/*
1010

11-
'@gitbutler/desktop':
11+
"@gitbutler/desktop":
1212
- changed-files:
1313
- any-glob-to-any-file: apps/desktop/**/*
1414

15-
'@gitbutler/web':
15+
"@gitbutler/web":
1616
- changed-files:
1717
- any-glob-to-any-file: apps/web/**/*
1818

19-
'@gitbutler/ui':
19+
"@gitbutler/ui":
2020
- changed-files:
2121
- any-glob-to-any-file: packages/ui/**/*
2222

23-
'@gitbutler/no-relative-imports':
23+
"@gitbutler/no-relative-imports":
2424
- changed-files:
2525
- any-glob-to-any-file: packages/no-relative-imports/**/*

.github/workflows/pr-labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v6
1515
with:
1616
persist-credentials: false
17-
repository: 'gitbutlerapp/gitbutler'
17+
repository: "gitbutlerapp/gitbutler"
1818
- uses: actions/labeler@v6
1919
with:
20-
configuration-path: '.github/pr-labeler.yml'
20+
configuration-path: ".github/pr-labeler.yml"

.github/workflows/publish.yaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: 'Publish'
1+
name: "Publish"
22
on:
33
schedule:
44
# every day at 1am UTC, 3AM CEST or 2AM CET.
5-
- cron: '0 1 * * *'
5+
- cron: "0 1 * * *"
66
workflow_run:
7-
workflows: ['Nightly build']
7+
workflows: ["Nightly build"]
88
types:
99
- completed
1010

@@ -91,15 +91,15 @@ jobs:
9191
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-private-repositories
9292
include:
9393
- platform: macos-15 # [macOs, ARM64] - default target
94-
target: ''
94+
target: ""
9595
- platform: macos-15 # [macOs, x64] - cross-compile
9696
target: x86_64-apple-darwin
9797
- platform: ubuntu-22.04 # [linux, x64]
98-
target: ''
98+
target: ""
9999
- platform: ubuntu-22.04-arm # [linux, ARM64]
100-
target: ''
100+
target: ""
101101
- platform: windows-latest # [windows, x64]
102-
target: ''
102+
target: ""
103103

104104
runs-on: ${{ matrix.platform }}
105105

@@ -234,7 +234,7 @@ jobs:
234234
- name: Upload Artifacts
235235
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
236236
with:
237-
name: '${{ env.channel }}-${{ matrix.platform }}${{ env.artifact_suffix }}-${{ github.run_number }}'
237+
name: "${{ env.channel }}-${{ matrix.platform }}${{ env.artifact_suffix }}-${{ github.run_number }}"
238238
path: release/
239239
if-no-files-found: error
240240

@@ -250,7 +250,7 @@ jobs:
250250
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
251251
if: runner.os == 'Windows'
252252
with:
253-
name: '${{ env.channel }}-windows-aux-${{ github.run_number }}'
253+
name: "${{ env.channel }}-windows-aux-${{ github.run_number }}"
254254
path: tauri-aux-artifacts/
255255
if-no-files-found: error
256256

@@ -268,7 +268,7 @@ jobs:
268268
- name: Download unsigned artifacts
269269
uses: actions/download-artifact@v7.0.0
270270
with:
271-
name: '${{ needs.build-tauri.outputs.channel }}-${{ matrix.platform }}-${{ github.run_number }}'
271+
name: "${{ needs.build-tauri.outputs.channel }}-${{ matrix.platform }}-${{ github.run_number }}"
272272
path: release
273273
- name: Sign Windows binary
274274
shell: bash
@@ -279,7 +279,7 @@ jobs:
279279
- name: Upload signed artifacts
280280
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
281281
with:
282-
name: '${{ needs.build-tauri.outputs.channel }}-${{ matrix.platform }}-${{ github.run_number }}'
282+
name: "${{ needs.build-tauri.outputs.channel }}-${{ matrix.platform }}-${{ github.run_number }}"
283283
path: release/
284284
if-no-files-found: error
285285
overwrite: true
@@ -298,7 +298,7 @@ jobs:
298298
- name: Download ev-signed artifacts
299299
uses: actions/download-artifact@v7.0.0
300300
with:
301-
name: '${{ needs.build-tauri.outputs.channel }}-${{ matrix.platform }}-${{ github.run_number }}'
301+
name: "${{ needs.build-tauri.outputs.channel }}-${{ matrix.platform }}-${{ github.run_number }}"
302302
path: release
303303
- name: Set file as a variable
304304
shell: bash
@@ -328,7 +328,7 @@ jobs:
328328
- name: Upload re-signed artifacts
329329
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
330330
with:
331-
name: '${{ needs.build-tauri.outputs.channel }}-${{ matrix.platform }}-${{ github.run_number }}'
331+
name: "${{ needs.build-tauri.outputs.channel }}-${{ matrix.platform }}-${{ github.run_number }}"
332332
path: release/
333333
if-no-files-found: error
334334
overwrite: true
@@ -344,15 +344,15 @@ jobs:
344344
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-private-repositories
345345
include:
346346
- platform: macos-15 # [macOs, ARM64] - default target
347-
target: ''
347+
target: ""
348348
- platform: macos-15 # [macOs, x64] - cross-compile
349349
target: x86_64-apple-darwin
350350
- platform: ubuntu-22.04 # [linux, x64]
351-
target: ''
351+
target: ""
352352
- platform: ubuntu-22.04-arm # [linux, ARM64]
353-
target: ''
353+
target: ""
354354
- platform: windows-latest # [windows, x64]
355-
target: ''
355+
target: ""
356356
steps:
357357
- uses: actions/checkout@v6
358358
with:
@@ -369,7 +369,7 @@ jobs:
369369
- name: Download artifacts
370370
uses: actions/download-artifact@v7.0.0
371371
with:
372-
name: '${{ needs.build-tauri.outputs.channel }}-${{ matrix.platform }}${{ env.artifact_suffix }}-${{ github.run_number }}'
372+
name: "${{ needs.build-tauri.outputs.channel }}-${{ matrix.platform }}${{ env.artifact_suffix }}-${{ github.run_number }}"
373373
path: release
374374
- name: Extract version
375375
shell: bash
@@ -389,9 +389,9 @@ jobs:
389389
with:
390390
aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
391391
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
392-
aws_bucket: 'releases.gitbutler.com'
393-
source_dir: 'release-s3/'
394-
destination_dir: 'releases/${{ needs.build-tauri.outputs.channel }}/${{ env.version }}-${{ github.run_number }}'
392+
aws_bucket: "releases.gitbutler.com"
393+
source_dir: "release-s3/"
394+
destination_dir: "releases/${{ needs.build-tauri.outputs.channel }}/${{ env.version }}-${{ github.run_number }}"
395395

396396
# tell our server to update with the version number
397397
- name: Notify GitButler API of new release
@@ -414,7 +414,7 @@ jobs:
414414
- name: Create git tag
415415
shell: bash
416416
env:
417-
TAG_NAME: '${{ needs.build-tauri.outputs.channel }}/${{ needs.publish-tauri.outputs.version }}'
417+
TAG_NAME: "${{ needs.build-tauri.outputs.channel }}/${{ needs.publish-tauri.outputs.version }}"
418418
run: |
419419
function tag_exists() {
420420
git tag --list | grep -q "^$1$"

.github/workflows/push-e2e-img.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
branches:
55
- master
66
paths:
7-
- 'e2e/blackbox/Dockerfile'
7+
- "e2e/blackbox/Dockerfile"
88

99
jobs:
1010
docker_publish:
@@ -24,6 +24,6 @@ jobs:
2424
- name: Build and push container image
2525
uses: docker/build-push-action@v6
2626
with:
27-
context: 'e2e/blackbox/Dockerfile'
27+
context: "e2e/blackbox/Dockerfile"
2828
push: true
2929
tags: ghcr.io/gitbutler/e2e-runner:latest

.github/workflows/push.yaml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Test'
1+
name: "Test"
22
on:
33
push:
44
branches:
@@ -155,7 +155,7 @@ jobs:
155155
cargo check -p but --all-targets
156156
name: Special `cargo check` runs
157157
env:
158-
RUSTFLAGS: '--deny warnings'
158+
RUSTFLAGS: "--deny warnings"
159159
- name: cargo clippy
160160
run: |
161161
rustup component add clippy
@@ -216,7 +216,7 @@ jobs:
216216
run: sudo ./scripts/install-minimal-debian-dependencies.sh
217217
- run: cargo test --workspace --exclude gitbutler-tauri --exclude but-server
218218
env:
219-
GITBUTLER_TESTS_NO_CLEANUP: '1'
219+
GITBUTLER_TESTS_NO_CLEANUP: "1"
220220
# It's intentional to use 'name equals run-script' so it's easy to re-run locally on failure.
221221
- run: cargo test -p but
222222
- run: cargo test -p but-server
@@ -264,7 +264,7 @@ jobs:
264264
with:
265265
shared-key: cargo-test
266266
save-if: ${{ github.ref == 'refs/heads/master' }}
267-
- name: 'cargo check'
267+
- name: "cargo check"
268268
run: cargo check --workspace --all-targets --features windows
269269

270270
build-installer:
@@ -278,16 +278,16 @@ jobs:
278278
include:
279279
- platform: macos-15 # [macOs, ARM64] - default target
280280
artifact_id: macos-15-aarch64
281-
target: ''
281+
target: ""
282282
- platform: macos-15 # [macOs, x64] - cross-compile
283283
artifact_id: macos-15-x86_64
284284
target: x86_64-apple-darwin
285285
- platform: ubuntu-22.04 # [linux, x64]
286286
artifact_id: linux-x86_64
287-
target: ''
287+
target: ""
288288
- platform: ubuntu-22.04-arm # [linux, ARM64]
289289
artifact_id: linux-aarch64
290-
target: ''
290+
target: ""
291291

292292
runs-on: ${{ matrix.platform }}
293293

@@ -317,7 +317,7 @@ jobs:
317317
- name: Upload Artifacts
318318
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
319319
with:
320-
name: 'but-installer-${{ matrix.artifact_id }}-${{ github.run_number }}'
320+
name: "but-installer-${{ matrix.artifact_id }}-${{ github.run_number }}"
321321
path: target/${{matrix.target}}/release/but-installer
322322
if-no-files-found: error
323323
retention-days: 7
@@ -395,7 +395,7 @@ jobs:
395395
- name: Download ${{ matrix.artifact_id }} installer
396396
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
397397
with:
398-
name: 'but-installer-${{ matrix.artifact_id }}-${{ github.run_number }}'
398+
name: "but-installer-${{ matrix.artifact_id }}-${{ github.run_number }}"
399399
path: .
400400
- run: chmod +x ./but-installer
401401
- name: Install release
@@ -420,22 +420,22 @@ jobs:
420420
- name: Download macOS x86_64 installer
421421
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
422422
with:
423-
name: 'but-installer-macos-15-x86_64-${{ github.run_number }}'
423+
name: "but-installer-macos-15-x86_64-${{ github.run_number }}"
424424
path: s3-upload/macos/x86_64
425425
- name: Download macOS aarch64 installer
426426
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
427427
with:
428-
name: 'but-installer-macos-15-aarch64-${{ github.run_number }}'
428+
name: "but-installer-macos-15-aarch64-${{ github.run_number }}"
429429
path: s3-upload/macos/aarch64
430430
- name: Download Linux x86_64 installer
431431
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
432432
with:
433-
name: 'but-installer-linux-x86_64-${{ github.run_number }}'
433+
name: "but-installer-linux-x86_64-${{ github.run_number }}"
434434
path: s3-upload/linux/x86_64
435435
- name: Download Linux aarch64 installer
436436
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
437437
with:
438-
name: 'but-installer-linux-aarch64-${{ github.run_number }}'
438+
name: "but-installer-linux-aarch64-${{ github.run_number }}"
439439
path: s3-upload/linux/aarch64
440440
- name: Make binaries executable
441441
run: |
@@ -445,17 +445,17 @@ jobs:
445445
with:
446446
aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
447447
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
448-
aws_bucket: 'releases.gitbutler.com'
449-
source_dir: 's3-upload/'
450-
destination_dir: 'installers/${{ github.sha }}'
448+
aws_bucket: "releases.gitbutler.com"
449+
source_dir: "s3-upload/"
450+
destination_dir: "installers/${{ github.sha }}"
451451
- name: Upload to S3 (latest)
452452
uses: shallwefootball/s3-upload-action@4350529f410221787ccf424e50133cbc1b52704e # master
453453
with:
454454
aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
455455
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
456-
aws_bucket: 'releases.gitbutler.com'
457-
source_dir: 's3-upload/'
458-
destination_dir: 'installers/latest'
456+
aws_bucket: "releases.gitbutler.com"
457+
source_dir: "s3-upload/"
458+
destination_dir: "installers/latest"
459459

460460
check-rust:
461461
if: always()
@@ -488,7 +488,7 @@ jobs:
488488
- uses: actions/checkout@v6
489489
with:
490490
persist-credentials: false
491-
sparse-checkout: '.github/workflows'
491+
sparse-checkout: ".github/workflows"
492492
- name: Generate workflows list to scan
493493
run: |
494494
shopt -s extglob

.github/workflows/test-e2e-blackbox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
pull_request:
77
branches: [master]
88
paths-ignore:
9-
- 'apps/web/**'
9+
- "apps/web/**"
1010
workflow_dispatch:
1111
inputs:
1212
sha:

0 commit comments

Comments
 (0)