gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-27 19:50:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade prettier and use common path + config

Browse Source
This commit is contained in:
Mattias Granlund 2023-11-16 16:51:41 +01:00
parent 964b8c361c
commit 176372758d
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -1,3 +1,4 @@
{ {
"prettier.configPath": "packages/ui/.prettierrc", "prettier.configPath": "packages/ui/.prettierrc",
"prettier.prettierPath": "packages/ui/node_modules/prettier/index.cjs"
} }

2
packages/ui/package.json
View File

@ -71,7 +71,7 @@
"postcss": "^8.4.31", "postcss": "^8.4.31",
"postcss-load-config": "^4.0.1", "postcss-load-config": "^4.0.1",
"posthog-js": "^1.84.2", "posthog-js": "^1.84.2",
"prettier": "^3.0.3", "prettier": "^3.1.0",
"prettier-plugin-svelte": "^3.0.3", "prettier-plugin-svelte": "^3.0.3",
"prettier-plugin-tailwindcss": "^0.5.6", "prettier-plugin-tailwindcss": "^0.5.6",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",

4
packages/ui/src/routes/+error.svelte
View File

@ -10,8 +10,8 @@
$: message = $page.error $: message = $page.error
? $page.error.message ? $page.error.message
: $page.status === 404 : $page.status === 404
? 'Page not found' ? 'Page not found'
: 'Something went wrong'; : 'Something went wrong';
</script> </script>
<div class="flex h-full flex-1"> <div class="flex h-full flex-1">

2
packages/ui/src/routes/[projectId]/components/RemoteNamePanel.svelte
View File

@ -39,7 +39,7 @@
value={remoteBranchName} value={remoteBranchName}
on:change={handleUpdateName} on:change={handleUpdateName}
name="remoteName" name="remoteName"
class="text-color-2 block w-full rounded-md border-0 px-2 py-1.5 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6" class="text-color-2 ring-gray-300 focus:ring-indigo-600 block w-full rounded-md border-0 px-2 py-1.5 shadow-sm ring-1 ring-inset placeholder:text-gray-400 focus:ring-2 focus:ring-inset sm:text-sm sm:leading-6"
placeholder="Remote branch name (optional)" placeholder="Remote branch name (optional)"
/> />
</div> </div>

22
pnpm-lock.yaml
View File

@ -177,14 +177,14 @@ importers:
specifier: ^1.84.2 specifier: ^1.84.2
version: 1.84.2 version: 1.84.2
prettier: prettier:
specifier: ^3.0.3 specifier: ^3.1.0
version: 3.0.3 version: 3.1.0
prettier-plugin-svelte: prettier-plugin-svelte:
specifier: ^3.0.3 specifier: ^3.0.3
version: 3.0.3(prettier@3.0.3)(svelte@4.2.2) version: 3.0.3(prettier@3.1.0)(svelte@4.2.2)
prettier-plugin-tailwindcss: prettier-plugin-tailwindcss:
specifier: ^0.5.6 specifier: ^0.5.6
version: 0.5.6(prettier-plugin-svelte@3.0.3)(prettier@3.0.3) version: 0.5.6(prettier-plugin-svelte@3.0.3)(prettier@3.1.0)
reflect-metadata: reflect-metadata:
specifier: ^0.1.13 specifier: ^0.1.13
version: 0.1.13 version: 0.1.13
@ -3684,17 +3684,17 @@ packages:
engines: {node: '>= 0.8.0'} engines: {node: '>= 0.8.0'}
dev: true dev: true
/prettier-plugin-svelte@3.0.3(prettier@3.0.3)(svelte@4.2.2): /prettier-plugin-svelte@3.0.3(prettier@3.1.0)(svelte@4.2.2):
resolution: {integrity: sha512-dLhieh4obJEK1hnZ6koxF+tMUrZbV5YGvRpf2+OADyanjya5j0z1Llo8iGwiHmFWZVG/hLEw/AJD5chXd9r3XA==} resolution: {integrity: sha512-dLhieh4obJEK1hnZ6koxF+tMUrZbV5YGvRpf2+OADyanjya5j0z1Llo8iGwiHmFWZVG/hLEw/AJD5chXd9r3XA==}
peerDependencies: peerDependencies:
prettier: ^3.0.0 prettier: ^3.0.0
svelte: ^3.2.0 || ^4.0.0-next.0 svelte: ^3.2.0 || ^4.0.0-next.0
dependencies: dependencies:
prettier: 3.0.3 prettier: 3.1.0
svelte: 4.2.2 svelte: 4.2.2
dev: true dev: true
/prettier-plugin-tailwindcss@0.5.6(prettier-plugin-svelte@3.0.3)(prettier@3.0.3): /prettier-plugin-tailwindcss@0.5.6(prettier-plugin-svelte@3.0.3)(prettier@3.1.0):
resolution: {integrity: sha512-2Xgb+GQlkPAUCFi3sV+NOYcSI5XgduvDBL2Zt/hwJudeKXkyvRS65c38SB0yb9UB40+1rL83I6m0RtlOQ8eHdg==} resolution: {integrity: sha512-2Xgb+GQlkPAUCFi3sV+NOYcSI5XgduvDBL2Zt/hwJudeKXkyvRS65c38SB0yb9UB40+1rL83I6m0RtlOQ8eHdg==}
engines: {node: '>=14.21.3'} engines: {node: '>=14.21.3'}
peerDependencies: peerDependencies:
@ -3746,12 +3746,12 @@ packages:
prettier-plugin-twig-melody: prettier-plugin-twig-melody:
optional: true optional: true
dependencies: dependencies:
prettier: 3.0.3 prettier: 3.1.0
prettier-plugin-svelte: 3.0.3(prettier@3.0.3)(svelte@4.2.2) prettier-plugin-svelte: 3.0.3(prettier@3.1.0)(svelte@4.2.2)
dev: true dev: true
/prettier@3.0.3: /prettier@3.1.0:
resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==} resolution: {integrity: sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==}
engines: {node: '>=14'} engines: {node: '>=14'}
hasBin: true hasBin: true
dev: true dev: true