Skip to content

Commit 25068de

Browse files
committed
fix: move eslint/prettier to root only
1 parent d8a7f2b commit 25068de

10 files changed

+101
-212
lines changed

.gitignore

+31-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# will have compiled rust files and executables
2-
/target/
3-
/node_modules/
2+
target/
43

54
# editors
65
.idea
@@ -9,3 +8,33 @@
98

109
.env
1110
.env.*
11+
node_modules
12+
13+
# Logs
14+
logs
15+
*.log
16+
npm-debug.log*
17+
yarn-debug.log*
18+
yarn-error.log*
19+
pnpm-debug.log*
20+
lerna-debug.log*
21+
22+
dist
23+
dist-ssr
24+
*.local
25+
26+
build
27+
.svelte-kit
28+
package
29+
!.env.example
30+
vite.config.ts.timestamp-*
31+
32+
# Written to disk when using `act`
33+
.pnpm-store
34+
35+
# playwright
36+
test-results*
37+
playwright-report
38+
39+
# storybook
40+
*storybook.log

packages/ui/.npmrc .npmrc

File renamed without changes.

app/.prettierignore .prettierignore

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
.DS_Store
22
node_modules
33
butler/target
4-
/build
5-
/.svelte-kit
6-
/package
4+
build
5+
dist
6+
.svelte-kit
7+
package
78
.env
89
.env.*
910
!.env.example
11+
crates/
1012

1113
# Ignore files for PNPM, NPM and YARN
1214
pnpm-lock.yaml
@@ -19,4 +21,4 @@ yarn.lock
1921
/src-tauri
2022

2123
# Written to disk when using `act`
22-
.pnpm-store
24+
.pnpm-store

app/.gitignore

-28
This file was deleted.

app/package.json

-17
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
"build": "vite build",
2020
"check": "svelte-check --tsconfig ./tsconfig.json",
2121
"check:watch": "pnpm check --watch",
22-
"lint": "prettier --check . && eslint .",
23-
"format": "prettier --write .",
24-
"fix": "eslint --fix .",
2522
"tauri": "tauri",
2623
"prepare": "svelte-kit sync"
2724
},
@@ -43,7 +40,6 @@
4340
"@codemirror/legacy-modes": "^6.4.0",
4441
"@codemirror/state": "^6.4.1",
4542
"@codemirror/view": "^6.26.3",
46-
"@eslint/js": "^9.5.0",
4743
"@gitbutler/ui": "workspace:*",
4844
"@lezer/common": "^1.2.1",
4945
"@lezer/highlight": "^1.2.0",
@@ -58,21 +54,13 @@
5854
"@tauri-apps/api": "^1.5.5",
5955
"@types/diff": "^5.2.1",
6056
"@types/diff-match-patch": "^1.0.36",
61-
"@types/eslint__js": "^8.42.3",
6257
"@types/git-url-parse": "^9.0.3",
6358
"@types/lscache": "^1.3.4",
6459
"@types/marked": "^5.0.2",
65-
"@typescript-eslint/parser": "^7.13.1",
6660
"autoprefixer": "^10.4.19",
6761
"class-transformer": "^0.5.1",
6862
"date-fns": "^2.30.0",
6963
"diff-match-patch": "^1.0.5",
70-
"eslint": "^9.5.0",
71-
"eslint-config-prettier": "^9.1.0",
72-
"eslint-import-resolver-typescript": "^3.6.1",
73-
"eslint-plugin-import-x": "^0.5.1",
74-
"eslint-plugin-square-svelte-store": "^1.0.0",
75-
"eslint-plugin-svelte": "2.40.0",
7664
"git-url-parse": "^14.0.0",
7765
"globals": "^15.6.0",
7866
"inter-ui": "^4.0.2",
@@ -83,13 +71,10 @@
8371
"postcss-load-config": "^5.1.0",
8472
"postcss-pxtorem": "^6.1.0",
8573
"posthog-js": "1.136.4",
86-
"prettier": "^3.3.2",
87-
"prettier-plugin-svelte": "^3.2.4",
8874
"reflect-metadata": "^0.2.2",
8975
"rxjs": "^7.8.1",
9076
"svelte": "5.0.0-next.149",
9177
"svelte-check": "^3.8.0",
92-
"svelte-eslint-parser": "^0.39.2",
9378
"svelte-floating-ui": "^1.5.8",
9479
"svelte-french-toast": "^1.2.0",
9580
"svelte-loadable-store": "^2.0.1",
@@ -99,8 +84,6 @@
9984
"tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
10085
"tinykeys": "^2.1.0",
10186
"tslib": "^2.6.3",
102-
"typescript": "^5.4.5",
103-
"typescript-eslint": "^7.13.1",
10487
"vite": "^5.2.13",
10588
"vitest": "^0.34.6"
10689
},

package.json

+20-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,30 @@
1717
"build:app:nightly": "pnpm --filter @gitbutler/app run build:nightly",
1818
"build:app:development": "pnpm --filter @gitbutler/app run build:development",
1919
"check": "pnpm --filter @gitbutler/app run check",
20-
"lint": "pnpm --filter @gitbutler/app run lint",
21-
"format": "pnpm --filter @gitbutler/app run format",
20+
"lint:og": "pnpm --filter @gitbutler/app run lint",
21+
"format:og": "pnpm --filter @gitbutler/app run format",
2222
"tauri": "tauri",
23+
"lint": "prettier --check . && eslint .",
24+
"format": "prettier --write .",
25+
"fix": "eslint --fix .",
2326
"prepare": "pnpm --filter @gitbutler/app run prepare",
2427
"rustfmt": "cargo +nightly fmt -- --config-path rustfmt-nightly.toml"
2528
},
2629
"devDependencies": {
27-
"@tauri-apps/cli": "^1.5.13"
30+
"@eslint/js": "^9.5.0",
31+
"@tauri-apps/cli": "^1.5.13",
32+
"@types/eslint__js": "^8.42.3",
33+
"@typescript-eslint/parser": "^7.13.1",
34+
"eslint": "^9.5.0",
35+
"eslint-config-prettier": "^9.1.0",
36+
"eslint-import-resolver-typescript": "^3.6.1",
37+
"eslint-plugin-import-x": "^0.5.1",
38+
"eslint-plugin-storybook": "0.9.0--canary.156.da7873a.0",
39+
"eslint-plugin-svelte": "2.40.0",
40+
"prettier": "^3.3.2",
41+
"prettier-plugin-svelte": "^3.2.4",
42+
"svelte-eslint-parser": "^0.39.2",
43+
"typescript": "5.4.5",
44+
"typescript-eslint": "^7.13.1"
2845
}
2946
}

packages/ui/.gitignore

-28
This file was deleted.

packages/ui/.prettierignore

-22
This file was deleted.

packages/ui/package.json

-17
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
],
2525
"scripts": {
2626
"dev": "vite dev",
27-
"lint": "prettier --check . && eslint .",
28-
"format": "prettier --write .",
29-
"fix": "eslint --fix .",
3027
"check": "svelte-check --tsconfig ./tsconfig.json",
3128
"check:watch": "pnpm check --watch",
3229
"package": "svelte-kit sync && svelte-package",
@@ -36,7 +33,6 @@
3633
"storybook:build": "storybook build"
3734
},
3835
"devDependencies": {
39-
"@eslint/js": "^9.5.0",
4036
"@storybook/addon-essentials": "^8.1.10",
4137
"@storybook/addon-interactions": "^8.1.10",
4238
"@storybook/addon-links": "^8.1.10",
@@ -47,23 +43,10 @@
4743
"@sveltejs/kit": "^2.5.10",
4844
"@sveltejs/package": "^2.3.2",
4945
"@sveltejs/vite-plugin-svelte": "^3.1.1",
50-
"@types/eslint__js": "^8.42.3",
51-
"@typescript-eslint/parser": "^7.13.1",
52-
"eslint": "^9.5.0",
53-
"eslint-config-prettier": "^9.1.0",
54-
"eslint-import-resolver-typescript": "^3.6.1",
55-
"eslint-plugin-import-x": "^0.5.1",
56-
"eslint-plugin-storybook": "0.9.0--canary.156.da7873a.0",
57-
"eslint-plugin-svelte": "2.40.0",
5846
"globals": "^15.6.0",
59-
"prettier": "^3.3.2",
60-
"prettier-plugin-svelte": "^3.2.4",
6147
"storybook": "^8.1.10",
6248
"svelte": "5.0.0-next.149",
6349
"svelte-check": "^3.8.0",
64-
"svelte-eslint-parser": "^0.39.2",
65-
"typescript": "^5.4.5",
66-
"typescript-eslint": "^7.13.1",
6750
"vite": "^5.2.13"
6851
}
6952
}

0 commit comments

Comments
 (0)