fix: move eslint/prettier to root only

This commit is contained in:
ndom91 2024-06-28 11:34:54 +02:00
parent d8a7f2bbdc
commit 25068de8bb
No known key found for this signature in database
10 changed files with 101 additions and 212 deletions

33
.gitignore vendored
View File

@ -1,6 +1,5 @@
# will have compiled rust files and executables # will have compiled rust files and executables
/target/ target/
/node_modules/
# editors # editors
.idea .idea
@ -9,3 +8,33 @@
.env .env
.env.* .env.*
node_modules
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
dist
dist-ssr
*.local
build
.svelte-kit
package
!.env.example
vite.config.ts.timestamp-*
# Written to disk when using `act`
.pnpm-store
# playwright
test-results*
playwright-report
# storybook
*storybook.log

View File

@ -1,12 +1,14 @@
.DS_Store .DS_Store
node_modules node_modules
butler/target butler/target
/build build
/.svelte-kit dist
/package .svelte-kit
package
.env .env
.env.* .env.*
!.env.example !.env.example
crates/
# Ignore files for PNPM, NPM and YARN # Ignore files for PNPM, NPM and YARN
pnpm-lock.yaml pnpm-lock.yaml

28
app/.gitignore vendored
View File

@ -1,28 +0,0 @@
node_modules
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
dist
dist-ssr
*.local
build
.svelte-kit
package
!.env.example
vite.config.ts.timestamp-*
# Written to disk when using `act`
.pnpm-store
# playwright
test-results*
playwright-report
*storybook.log

View File

@ -19,9 +19,6 @@
"build": "vite build", "build": "vite build",
"check": "svelte-check --tsconfig ./tsconfig.json", "check": "svelte-check --tsconfig ./tsconfig.json",
"check:watch": "pnpm check --watch", "check:watch": "pnpm check --watch",
"lint": "prettier --check . && eslint .",
"format": "prettier --write .",
"fix": "eslint --fix .",
"tauri": "tauri", "tauri": "tauri",
"prepare": "svelte-kit sync" "prepare": "svelte-kit sync"
}, },
@ -43,7 +40,6 @@
"@codemirror/legacy-modes": "^6.4.0", "@codemirror/legacy-modes": "^6.4.0",
"@codemirror/state": "^6.4.1", "@codemirror/state": "^6.4.1",
"@codemirror/view": "^6.26.3", "@codemirror/view": "^6.26.3",
"@eslint/js": "^9.5.0",
"@gitbutler/ui": "workspace:*", "@gitbutler/ui": "workspace:*",
"@lezer/common": "^1.2.1", "@lezer/common": "^1.2.1",
"@lezer/highlight": "^1.2.0", "@lezer/highlight": "^1.2.0",
@ -58,21 +54,13 @@
"@tauri-apps/api": "^1.5.5", "@tauri-apps/api": "^1.5.5",
"@types/diff": "^5.2.1", "@types/diff": "^5.2.1",
"@types/diff-match-patch": "^1.0.36", "@types/diff-match-patch": "^1.0.36",
"@types/eslint__js": "^8.42.3",
"@types/git-url-parse": "^9.0.3", "@types/git-url-parse": "^9.0.3",
"@types/lscache": "^1.3.4", "@types/lscache": "^1.3.4",
"@types/marked": "^5.0.2", "@types/marked": "^5.0.2",
"@typescript-eslint/parser": "^7.13.1",
"autoprefixer": "^10.4.19", "autoprefixer": "^10.4.19",
"class-transformer": "^0.5.1", "class-transformer": "^0.5.1",
"date-fns": "^2.30.0", "date-fns": "^2.30.0",
"diff-match-patch": "^1.0.5", "diff-match-patch": "^1.0.5",
"eslint": "^9.5.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import-x": "^0.5.1",
"eslint-plugin-square-svelte-store": "^1.0.0",
"eslint-plugin-svelte": "2.40.0",
"git-url-parse": "^14.0.0", "git-url-parse": "^14.0.0",
"globals": "^15.6.0", "globals": "^15.6.0",
"inter-ui": "^4.0.2", "inter-ui": "^4.0.2",
@ -83,13 +71,10 @@
"postcss-load-config": "^5.1.0", "postcss-load-config": "^5.1.0",
"postcss-pxtorem": "^6.1.0", "postcss-pxtorem": "^6.1.0",
"posthog-js": "1.136.4", "posthog-js": "1.136.4",
"prettier": "^3.3.2",
"prettier-plugin-svelte": "^3.2.4",
"reflect-metadata": "^0.2.2", "reflect-metadata": "^0.2.2",
"rxjs": "^7.8.1", "rxjs": "^7.8.1",
"svelte": "5.0.0-next.149", "svelte": "5.0.0-next.149",
"svelte-check": "^3.8.0", "svelte-check": "^3.8.0",
"svelte-eslint-parser": "^0.39.2",
"svelte-floating-ui": "^1.5.8", "svelte-floating-ui": "^1.5.8",
"svelte-french-toast": "^1.2.0", "svelte-french-toast": "^1.2.0",
"svelte-loadable-store": "^2.0.1", "svelte-loadable-store": "^2.0.1",
@ -99,8 +84,6 @@
"tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1", "tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
"tinykeys": "^2.1.0", "tinykeys": "^2.1.0",
"tslib": "^2.6.3", "tslib": "^2.6.3",
"typescript": "^5.4.5",
"typescript-eslint": "^7.13.1",
"vite": "^5.2.13", "vite": "^5.2.13",
"vitest": "^0.34.6" "vitest": "^0.34.6"
}, },

View File

@ -17,13 +17,30 @@
"build:app:nightly": "pnpm --filter @gitbutler/app run build:nightly", "build:app:nightly": "pnpm --filter @gitbutler/app run build:nightly",
"build:app:development": "pnpm --filter @gitbutler/app run build:development", "build:app:development": "pnpm --filter @gitbutler/app run build:development",
"check": "pnpm --filter @gitbutler/app run check", "check": "pnpm --filter @gitbutler/app run check",
"lint": "pnpm --filter @gitbutler/app run lint", "lint:og": "pnpm --filter @gitbutler/app run lint",
"format": "pnpm --filter @gitbutler/app run format", "format:og": "pnpm --filter @gitbutler/app run format",
"tauri": "tauri", "tauri": "tauri",
"lint": "prettier --check . && eslint .",
"format": "prettier --write .",
"fix": "eslint --fix .",
"prepare": "pnpm --filter @gitbutler/app run prepare", "prepare": "pnpm --filter @gitbutler/app run prepare",
"rustfmt": "cargo +nightly fmt -- --config-path rustfmt-nightly.toml" "rustfmt": "cargo +nightly fmt -- --config-path rustfmt-nightly.toml"
}, },
"devDependencies": { "devDependencies": {
"@tauri-apps/cli": "^1.5.13" "@eslint/js": "^9.5.0",
"@tauri-apps/cli": "^1.5.13",
"@types/eslint__js": "^8.42.3",
"@typescript-eslint/parser": "^7.13.1",
"eslint": "^9.5.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import-x": "^0.5.1",
"eslint-plugin-storybook": "0.9.0--canary.156.da7873a.0",
"eslint-plugin-svelte": "2.40.0",
"prettier": "^3.3.2",
"prettier-plugin-svelte": "^3.2.4",
"svelte-eslint-parser": "^0.39.2",
"typescript": "5.4.5",
"typescript-eslint": "^7.13.1"
} }
} }

View File

@ -1,28 +0,0 @@
node_modules
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
dist
dist-ssr
*.local
build
.svelte-kit
package
!.env.example
vite.config.ts.timestamp-*
# Written to disk when using `act`
.pnpm-store
# playwright
test-results*
playwright-report
*storybook.log

View File

@ -1,22 +0,0 @@
.DS_Store
node_modules
butler/target
/build
/.svelte-kit
/package
.env
.env.*
!.env.example
# Ignore files for PNPM, NPM and YARN
pnpm-lock.yaml
package-lock.json
yarn.lock
# Ignore not svelte dirs
/.github
/.vscode
/src-tauri
# Written to disk when using `act`
.pnpm-store

View File

@ -24,9 +24,6 @@
], ],
"scripts": { "scripts": {
"dev": "vite dev", "dev": "vite dev",
"lint": "prettier --check . && eslint .",
"format": "prettier --write .",
"fix": "eslint --fix .",
"check": "svelte-check --tsconfig ./tsconfig.json", "check": "svelte-check --tsconfig ./tsconfig.json",
"check:watch": "pnpm check --watch", "check:watch": "pnpm check --watch",
"package": "svelte-kit sync && svelte-package", "package": "svelte-kit sync && svelte-package",
@ -36,7 +33,6 @@
"storybook:build": "storybook build" "storybook:build": "storybook build"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "^9.5.0",
"@storybook/addon-essentials": "^8.1.10", "@storybook/addon-essentials": "^8.1.10",
"@storybook/addon-interactions": "^8.1.10", "@storybook/addon-interactions": "^8.1.10",
"@storybook/addon-links": "^8.1.10", "@storybook/addon-links": "^8.1.10",
@ -47,23 +43,10 @@
"@sveltejs/kit": "^2.5.10", "@sveltejs/kit": "^2.5.10",
"@sveltejs/package": "^2.3.2", "@sveltejs/package": "^2.3.2",
"@sveltejs/vite-plugin-svelte": "^3.1.1", "@sveltejs/vite-plugin-svelte": "^3.1.1",
"@types/eslint__js": "^8.42.3",
"@typescript-eslint/parser": "^7.13.1",
"eslint": "^9.5.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import-x": "^0.5.1",
"eslint-plugin-storybook": "0.9.0--canary.156.da7873a.0",
"eslint-plugin-svelte": "2.40.0",
"globals": "^15.6.0", "globals": "^15.6.0",
"prettier": "^3.3.2",
"prettier-plugin-svelte": "^3.2.4",
"storybook": "^8.1.10", "storybook": "^8.1.10",
"svelte": "5.0.0-next.149", "svelte": "5.0.0-next.149",
"svelte-check": "^3.8.0", "svelte-check": "^3.8.0",
"svelte-eslint-parser": "^0.39.2",
"typescript": "^5.4.5",
"typescript-eslint": "^7.13.1",
"vite": "^5.2.13" "vite": "^5.2.13"
} }
} }

View File

@ -8,9 +8,51 @@ importers:
.: .:
devDependencies: devDependencies:
'@eslint/js':
specifier: ^9.5.0
version: 9.5.0
'@tauri-apps/cli': '@tauri-apps/cli':
specifier: ^1.5.13 specifier: ^1.5.13
version: 1.5.14 version: 1.5.14
'@types/eslint__js':
specifier: ^8.42.3
version: 8.42.3
'@typescript-eslint/parser':
specifier: ^7.13.1
version: 7.13.1(eslint@9.5.0)(typescript@5.4.5)
eslint:
specifier: ^9.5.0
version: 9.5.0
eslint-config-prettier:
specifier: ^9.1.0
version: 9.1.0(eslint@9.5.0)
eslint-import-resolver-typescript:
specifier: ^3.6.1
version: 3.6.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1)(eslint@9.5.0)
eslint-plugin-import-x:
specifier: ^0.5.1
version: 0.5.1(eslint@9.5.0)(typescript@5.4.5)
eslint-plugin-storybook:
specifier: 0.9.0--canary.156.da7873a.0
version: 0.9.0--canary.156.da7873a.0(eslint@9.5.0)(typescript@5.4.5)
eslint-plugin-svelte:
specifier: 2.40.0
version: 2.40.0(eslint@9.5.0)(svelte@5.0.0-next.149)
prettier:
specifier: ^3.3.2
version: 3.3.2
prettier-plugin-svelte:
specifier: ^3.2.4
version: 3.2.4(prettier@3.3.2)(svelte@5.0.0-next.149)
svelte-eslint-parser:
specifier: ^0.39.2
version: 0.39.2(svelte@5.0.0-next.149)
typescript:
specifier: 5.4.5
version: 5.4.5
typescript-eslint:
specifier: ^7.13.1
version: 7.13.1(eslint@9.5.0)(typescript@5.4.5)
app: app:
dependencies: dependencies:
@ -69,9 +111,6 @@ importers:
'@codemirror/view': '@codemirror/view':
specifier: ^6.26.3 specifier: ^6.26.3
version: 6.26.3 version: 6.26.3
'@eslint/js':
specifier: ^9.5.0
version: 9.5.0
'@gitbutler/ui': '@gitbutler/ui':
specifier: workspace:* specifier: workspace:*
version: link:../packages/ui version: link:../packages/ui
@ -114,9 +153,6 @@ importers:
'@types/diff-match-patch': '@types/diff-match-patch':
specifier: ^1.0.36 specifier: ^1.0.36
version: 1.0.36 version: 1.0.36
'@types/eslint__js':
specifier: ^8.42.3
version: 8.42.3
'@types/git-url-parse': '@types/git-url-parse':
specifier: ^9.0.3 specifier: ^9.0.3
version: 9.0.3 version: 9.0.3
@ -126,9 +162,6 @@ importers:
'@types/marked': '@types/marked':
specifier: ^5.0.2 specifier: ^5.0.2
version: 5.0.2 version: 5.0.2
'@typescript-eslint/parser':
specifier: ^7.13.1
version: 7.13.1(eslint@9.5.0)(typescript@5.4.5)
autoprefixer: autoprefixer:
specifier: ^10.4.19 specifier: ^10.4.19
version: 10.4.19(postcss@8.4.38) version: 10.4.19(postcss@8.4.38)
@ -141,24 +174,6 @@ importers:
diff-match-patch: diff-match-patch:
specifier: ^1.0.5 specifier: ^1.0.5
version: 1.0.5 version: 1.0.5
eslint:
specifier: ^9.5.0
version: 9.5.0
eslint-config-prettier:
specifier: ^9.1.0
version: 9.1.0(eslint@9.5.0)
eslint-import-resolver-typescript:
specifier: ^3.6.1
version: 3.6.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1)(eslint@9.5.0)
eslint-plugin-import-x:
specifier: ^0.5.1
version: 0.5.1(eslint@9.5.0)(typescript@5.4.5)
eslint-plugin-square-svelte-store:
specifier: ^1.0.0
version: 1.0.0
eslint-plugin-svelte:
specifier: 2.40.0
version: 2.40.0(eslint@9.5.0)(svelte@5.0.0-next.149)
git-url-parse: git-url-parse:
specifier: ^14.0.0 specifier: ^14.0.0
version: 14.0.0 version: 14.0.0
@ -189,12 +204,6 @@ importers:
posthog-js: posthog-js:
specifier: 1.136.4 specifier: 1.136.4
version: 1.136.4 version: 1.136.4
prettier:
specifier: ^3.3.2
version: 3.3.2
prettier-plugin-svelte:
specifier: ^3.2.4
version: 3.2.4(prettier@3.3.2)(svelte@5.0.0-next.149)
reflect-metadata: reflect-metadata:
specifier: ^0.2.2 specifier: ^0.2.2
version: 0.2.2 version: 0.2.2
@ -207,9 +216,6 @@ importers:
svelte-check: svelte-check:
specifier: ^3.8.0 specifier: ^3.8.0
version: 3.8.0(@babel/core@7.24.7)(postcss-load-config@5.1.0(postcss@8.4.38))(postcss@8.4.38)(svelte@5.0.0-next.149) version: 3.8.0(@babel/core@7.24.7)(postcss-load-config@5.1.0(postcss@8.4.38))(postcss@8.4.38)(svelte@5.0.0-next.149)
svelte-eslint-parser:
specifier: ^0.39.2
version: 0.39.2(svelte@5.0.0-next.149)
svelte-floating-ui: svelte-floating-ui:
specifier: ^1.5.8 specifier: ^1.5.8
version: 1.5.8 version: 1.5.8
@ -237,12 +243,6 @@ importers:
tslib: tslib:
specifier: ^2.6.3 specifier: ^2.6.3
version: 2.6.3 version: 2.6.3
typescript:
specifier: ^5.4.5
version: 5.4.5
typescript-eslint:
specifier: ^7.13.1
version: 7.13.1(eslint@9.5.0)(typescript@5.4.5)
vite: vite:
specifier: ^5.2.13 specifier: ^5.2.13
version: 5.2.13(@types/node@20.5.9) version: 5.2.13(@types/node@20.5.9)
@ -252,9 +252,6 @@ importers:
packages/ui: packages/ui:
devDependencies: devDependencies:
'@eslint/js':
specifier: ^9.5.0
version: 9.5.0
'@storybook/addon-essentials': '@storybook/addon-essentials':
specifier: ^8.1.10 specifier: ^8.1.10
version: 8.1.10(@types/react@18.3.3)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) version: 8.1.10(@types/react@18.3.3)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@ -285,39 +282,9 @@ importers:
'@sveltejs/vite-plugin-svelte': '@sveltejs/vite-plugin-svelte':
specifier: ^3.1.1 specifier: ^3.1.1
version: 3.1.1(svelte@5.0.0-next.149)(vite@5.2.13(@types/node@20.5.9)) version: 3.1.1(svelte@5.0.0-next.149)(vite@5.2.13(@types/node@20.5.9))
'@types/eslint__js':
specifier: ^8.42.3
version: 8.42.3
'@typescript-eslint/parser':
specifier: ^7.13.1
version: 7.13.1(eslint@9.5.0)(typescript@5.4.5)
eslint:
specifier: ^9.5.0
version: 9.5.0
eslint-config-prettier:
specifier: ^9.1.0
version: 9.1.0(eslint@9.5.0)
eslint-import-resolver-typescript:
specifier: ^3.6.1
version: 3.6.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1)(eslint@9.5.0)
eslint-plugin-import-x:
specifier: ^0.5.1
version: 0.5.1(eslint@9.5.0)(typescript@5.4.5)
eslint-plugin-storybook:
specifier: 0.9.0--canary.156.da7873a.0
version: 0.9.0--canary.156.da7873a.0(eslint@9.5.0)(typescript@5.4.5)
eslint-plugin-svelte:
specifier: 2.40.0
version: 2.40.0(eslint@9.5.0)(svelte@5.0.0-next.149)
globals: globals:
specifier: ^15.6.0 specifier: ^15.6.0
version: 15.6.0 version: 15.6.0
prettier:
specifier: ^3.3.2
version: 3.3.2
prettier-plugin-svelte:
specifier: ^3.2.4
version: 3.2.4(prettier@3.3.2)(svelte@5.0.0-next.149)
storybook: storybook:
specifier: ^8.1.10 specifier: ^8.1.10
version: 8.1.10(@babel/preset-env@7.24.7(@babel/core@7.24.7))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) version: 8.1.10(@babel/preset-env@7.24.7(@babel/core@7.24.7))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@ -327,15 +294,6 @@ importers:
svelte-check: svelte-check:
specifier: ^3.8.0 specifier: ^3.8.0
version: 3.8.0(@babel/core@7.24.7)(postcss-load-config@5.1.0(postcss@8.4.38))(postcss@8.4.38)(svelte@5.0.0-next.149) version: 3.8.0(@babel/core@7.24.7)(postcss-load-config@5.1.0(postcss@8.4.38))(postcss@8.4.38)(svelte@5.0.0-next.149)
svelte-eslint-parser:
specifier: ^0.39.2
version: 0.39.2(svelte@5.0.0-next.149)
typescript:
specifier: ^5.4.5
version: 5.4.5
typescript-eslint:
specifier: ^7.13.1
version: 7.13.1(eslint@9.5.0)(typescript@5.4.5)
vite: vite:
specifier: ^5.2.13 specifier: ^5.2.13
version: 5.2.13(@types/node@20.5.9) version: 5.2.13(@types/node@20.5.9)
@ -3425,9 +3383,6 @@ packages:
'@typescript-eslint/parser': '@typescript-eslint/parser':
optional: true optional: true
eslint-plugin-square-svelte-store@1.0.0:
resolution: {integrity: sha512-QLybNNEPcBKVrgAeow/7ouOqbTVsWwEdStFab9ZMZaW19Y//ZEhhtuEb92P69n9u/JRL6EFhArV9AfS+LgS4mA==}
eslint-plugin-storybook@0.9.0--canary.156.da7873a.0: eslint-plugin-storybook@0.9.0--canary.156.da7873a.0:
resolution: {integrity: sha512-3b6hQMRfKWwkNB0koK0y9Boi+GYAt8vz+3tzU5JHylyAZh3Vg5TgvxM6IRhKixEY4OlQhsJPhqMzP0rT9fP5mA==} resolution: {integrity: sha512-3b6hQMRfKWwkNB0koK0y9Boi+GYAt8vz+3tzU5JHylyAZh3Vg5TgvxM6IRhKixEY4OlQhsJPhqMzP0rT9fP5mA==}
engines: {node: '>= 18'} engines: {node: '>= 18'}
@ -7474,7 +7429,7 @@ snapshots:
'@types/shimmer': 1.0.5 '@types/shimmer': 1.0.5
import-in-the-middle: 1.4.2 import-in-the-middle: 1.4.2
require-in-the-middle: 7.3.0 require-in-the-middle: 7.3.0
semver: 7.6.0 semver: 7.6.2
shimmer: 1.2.1 shimmer: 1.2.1
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@ -7487,7 +7442,7 @@ snapshots:
'@types/shimmer': 1.0.5 '@types/shimmer': 1.0.5
import-in-the-middle: 1.7.4 import-in-the-middle: 1.7.4
require-in-the-middle: 7.3.0 require-in-the-middle: 7.3.0
semver: 7.6.0 semver: 7.6.2
shimmer: 1.2.1 shimmer: 1.2.1
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@ -10030,8 +9985,6 @@ snapshots:
- eslint-import-resolver-webpack - eslint-import-resolver-webpack
- supports-color - supports-color
eslint-plugin-square-svelte-store@1.0.0: {}
eslint-plugin-storybook@0.9.0--canary.156.da7873a.0(eslint@9.5.0)(typescript@5.4.5): eslint-plugin-storybook@0.9.0--canary.156.da7873a.0(eslint@9.5.0)(typescript@5.4.5):
dependencies: dependencies:
'@storybook/csf': 0.0.1 '@storybook/csf': 0.0.1