mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-25 10:33:21 +03:00
Merged origin/master into sidebar-branches
This commit is contained in:
Caleb Owens
commit
e4c3557255
@ -30,8 +30,6 @@
|
||||
"@codemirror/lang-xml": "^6.1.0",
|
||||
"@codemirror/language": "^6.10.2",
|
||||
"@codemirror/legacy-modes": "^6.4.0",
|
||||
"@codemirror/state": "^6.4.1",
|
||||
"@codemirror/view": "^6.26.3",
|
||||
"@gitbutler/ui": "workspace:*",
|
||||
"@lezer/common": "^1.2.1",
|
||||
"@lezer/highlight": "^1.2.0",
|
||||
@ -42,8 +40,6 @@
|
||||
"@sveltejs/kit": "catalog:svelte",
|
||||
"@sveltejs/vite-plugin-svelte": "catalog:svelte",
|
||||
"@tauri-apps/api": "^1.6.0",
|
||||
"@types/crypto-js": "^4.2.2",
|
||||
"@types/diff": "^5.2.1",
|
||||
"@types/diff-match-patch": "^1.0.36",
|
||||
"@types/git-url-parse": "^9.0.3",
|
||||
"@types/lscache": "^1.3.4",
|
||||
@ -59,7 +55,6 @@
|
||||
"date-fns": "^2.30.0",
|
||||
"diff-match-patch": "^1.0.5",
|
||||
"git-url-parse": "^14.0.0",
|
||||
"inter-ui": "^4.0.2",
|
||||
"lscache": "^1.3.2",
|
||||
"marked": "^10.0.0",
|
||||
"mocha": "^10.7.0",
|
||||
@ -72,16 +67,11 @@
|
||||
"reflect-metadata": "^0.2.2",
|
||||
"svelte": "catalog:svelte",
|
||||
"svelte-check": "catalog:svelte",
|
||||
"svelte-floating-ui": "^1.5.8",
|
||||
"svelte-french-toast": "^1.2.0",
|
||||
"svelte-loadable-store": "^2.0.1",
|
||||
"svelte-resize-observer": "^2.0.0",
|
||||
"tauri-plugin-context-menu": "^0.7.0",
|
||||
"tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v1",
|
||||
"tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
|
||||
"tinykeys": "^2.1.0",
|
||||
"ts-node": "^10.9.2",
|
||||
"tslib": "^2.6.3",
|
||||
"vite": "catalog:",
|
||||
"vitest": "^0.34.6"
|
||||
},
|
||||
|
||||
@ -20,8 +20,6 @@
|
||||
"@sveltejs/vite-plugin-svelte": "catalog:svelte",
|
||||
"svelte": "catalog:svelte",
|
||||
"svelte-check": "catalog:svelte",
|
||||
"tslib": "^2.4.1",
|
||||
"typescript": "^5.0.0",
|
||||
"vite": "catalog:"
|
||||
},
|
||||
"dependencies": {
|
||||
|
||||
@ -4,7 +4,6 @@ import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
|
||||
/** @type {import('@sveltejs/kit').Config} */
|
||||
const config = {
|
||||
preprocess: vitePreprocess(),
|
||||
|
||||
kit: {
|
||||
adapter: adapter()
|
||||
}
|
||||
|
||||
108
pnpm-lock.yaml
108
pnpm-lock.yaml
@ -133,12 +133,6 @@ importers:
|
||||
'@codemirror/legacy-modes':
|
||||
specifier: ^6.4.0
|
||||
version: 6.4.0
|
||||
'@codemirror/state':
|
||||
specifier: ^6.4.1
|
||||
version: 6.4.1
|
||||
'@codemirror/view':
|
||||
specifier: ^6.26.3
|
||||
version: 6.26.3
|
||||
'@gitbutler/ui':
|
||||
specifier: workspace:*
|
||||
version: link:../../packages/ui
|
||||
@ -169,12 +163,6 @@ importers:
|
||||
'@tauri-apps/api':
|
||||
specifier: ^1.6.0
|
||||
version: 1.6.0
|
||||
'@types/crypto-js':
|
||||
specifier: ^4.2.2
|
||||
version: 4.2.2
|
||||
'@types/diff':
|
||||
specifier: ^5.2.1
|
||||
version: 5.2.1
|
||||
'@types/diff-match-patch':
|
||||
specifier: ^1.0.36
|
||||
version: 1.0.36
|
||||
@ -220,9 +208,6 @@ importers:
|
||||
git-url-parse:
|
||||
specifier: ^14.0.0
|
||||
version: 14.0.0
|
||||
inter-ui:
|
||||
specifier: ^4.0.2
|
||||
version: 4.0.2
|
||||
lscache:
|
||||
specifier: ^1.3.2
|
||||
version: 1.3.2
|
||||
@ -259,21 +244,9 @@ importers:
|
||||
svelte-check:
|
||||
specifier: catalog:svelte
|
||||
version: 3.8.4(@babel/core@7.24.7)(postcss-load-config@5.1.0(postcss@8.4.39))(postcss@8.4.39)(svelte@5.0.0-next.196)
|
||||
svelte-floating-ui:
|
||||
specifier: ^1.5.8
|
||||
version: 1.5.8
|
||||
svelte-french-toast:
|
||||
specifier: ^1.2.0
|
||||
version: 1.2.0(svelte@5.0.0-next.196)
|
||||
svelte-loadable-store:
|
||||
specifier: ^2.0.1
|
||||
version: 2.0.1(svelte@5.0.0-next.196)
|
||||
svelte-resize-observer:
|
||||
specifier: ^2.0.0
|
||||
version: 2.0.0
|
||||
tauri-plugin-context-menu:
|
||||
specifier: ^0.7.0
|
||||
version: 0.7.0
|
||||
tauri-plugin-log-api:
|
||||
specifier: github:tauri-apps/tauri-plugin-log#v1
|
||||
version: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/2bb26e22f7f7b4f164bad02f0ae4085796f77fff
|
||||
@ -286,9 +259,6 @@ importers:
|
||||
ts-node:
|
||||
specifier: ^10.9.2
|
||||
version: 10.9.2(@types/node@20.5.9)(typescript@5.4.5)
|
||||
tslib:
|
||||
specifier: ^2.6.3
|
||||
version: 2.6.3
|
||||
vite:
|
||||
specifier: 'catalog:'
|
||||
version: 5.2.13(@types/node@20.5.9)
|
||||
@ -326,12 +296,6 @@ importers:
|
||||
svelte-check:
|
||||
specifier: catalog:svelte
|
||||
version: 3.8.4(@babel/core@7.24.7)(postcss-load-config@5.1.0(postcss@8.4.39))(postcss@8.4.39)(svelte@5.0.0-next.196)
|
||||
tslib:
|
||||
specifier: ^2.4.1
|
||||
version: 2.6.3
|
||||
typescript:
|
||||
specifier: ^5.0.0
|
||||
version: 5.4.5
|
||||
vite:
|
||||
specifier: 'catalog:'
|
||||
version: 5.2.13(@types/node@20.14.13)
|
||||
@ -1322,15 +1286,6 @@ packages:
|
||||
resolution: {integrity: sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
'@floating-ui/core@1.5.2':
|
||||
resolution: {integrity: sha512-Ii3MrfY/GAIN3OhXNzpCKaLxHQfJF9qvwq/kEJYdqDxeIHa01K8sldugal6TmeeXl+WMvhv9cnVzUTaFFJF09A==}
|
||||
|
||||
'@floating-ui/dom@1.5.3':
|
||||
resolution: {integrity: sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==}
|
||||
|
||||
'@floating-ui/utils@0.1.6':
|
||||
resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==}
|
||||
|
||||
'@fontsource/fira-mono@4.5.10':
|
||||
resolution: {integrity: sha512-bxUnRP8xptGRo8YXeY073DSpfK74XpSb0ZyRNpHV9WvLnJ7TwPOjZll8hTMin7zLC6iOp59pDZ8EQDj1gzgAQQ==}
|
||||
|
||||
@ -2291,9 +2246,6 @@ packages:
|
||||
'@types/cross-spawn@6.0.6':
|
||||
resolution: {integrity: sha512-fXRhhUkG4H3TQk5dBhQ7m/JDdSNHKwR2BBia62lhwEIq9xGiQKLxd6LymNhn47SjXhsUEPmxi+PKw2OkW4LLjA==}
|
||||
|
||||
'@types/crypto-js@4.2.2':
|
||||
resolution: {integrity: sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==}
|
||||
|
||||
'@types/culori@2.1.1':
|
||||
resolution: {integrity: sha512-NzLYD0vNHLxTdPp8+RlvGbR2NfOZkwxcYGFwxNtm+WH2NuUNV8785zv1h0sulFQ5aFQ9n/jNDUuJeo3Bh7+oFA==}
|
||||
|
||||
@ -2303,9 +2255,6 @@ packages:
|
||||
'@types/diff-match-patch@1.0.36':
|
||||
resolution: {integrity: sha512-xFdR6tkm0MWvBfO8xXCSsinYxHcqkQUlcHeSpMC2ukzOb6lwQAfDmW+Qt0AvlGd8HpsS28qKsB+oPeJn9I39jg==}
|
||||
|
||||
'@types/diff@5.2.1':
|
||||
resolution: {integrity: sha512-uxpcuwWJGhe2AR1g8hD9F5OYGCqjqWnBUQFD8gMZsDbv8oPHzxJF6iMO6n8Tk0AdzlxoaaoQhOYlIg/PukVU8g==}
|
||||
|
||||
'@types/emscripten@1.39.13':
|
||||
resolution: {integrity: sha512-cFq+fO/isvhvmuP/+Sl4K4jtU6E23DoivtbO4r50e3odaxAiVdbfSYRDdJ4gCdxx+3aRjhphS5ZMwIH4hFy/Cw==}
|
||||
|
||||
@ -4166,10 +4115,6 @@ packages:
|
||||
resolution: {integrity: sha512-mg3Fh9g2zfuVWJn6lhST0O7x4n03k7G8Tx5nvikJkbq8/CK47WDVm+UznF0G6s5Zi0KcyUisr6DU8T67N5U+1Q==}
|
||||
engines: {node: '>=14.18.0'}
|
||||
|
||||
inter-ui@4.0.2:
|
||||
resolution: {integrity: sha512-YmfzwEtzuVzEenQwSB/tmmqi/A0a2GnFk4mG4ZFULXiO5DNk0fJWiO3o9i1sdVKuMVGx9iiNQnCq8ghWZJVVHw==}
|
||||
engines: {node: '>=16.0.0'}
|
||||
|
||||
internal-slot@1.0.7:
|
||||
resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
|
||||
engines: {node: '>= 0.4'}
|
||||
@ -5462,9 +5407,6 @@ packages:
|
||||
resolution: {integrity: sha512-nQFEv9gRw6SJAwWD2LrL0NmQvAcO7FBwJbwmr2ttPAacfy0xuiOjE5zt+zM4xDyuyvUaxBi/9gb2SoCyNEVJcw==}
|
||||
engines: {node: '>=8.6.0'}
|
||||
|
||||
resize-observer-polyfill@1.5.1:
|
||||
resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==}
|
||||
|
||||
resolve-alpn@1.2.1:
|
||||
resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}
|
||||
|
||||
@ -5841,9 +5783,6 @@ packages:
|
||||
svelte:
|
||||
optional: true
|
||||
|
||||
svelte-floating-ui@1.5.8:
|
||||
resolution: {integrity: sha512-dVvJhZ2bT+kQDHlE4Lep8t+sgEc0XD96fXLzAi2DDI2bsaegBbClxXVNMma0C2WsG+n9GJSYx292dTvA8CYRtw==}
|
||||
|
||||
svelte-french-toast@1.2.0:
|
||||
resolution: {integrity: sha512-5PW+6RFX3xQPbR44CngYAP1Sd9oCq9P2FOox4FZffzJuZI2mHOB7q5gJBVnOiLF5y3moVGZ7u2bYt7+yPAgcEQ==}
|
||||
peerDependencies:
|
||||
@ -5855,11 +5794,6 @@ packages:
|
||||
peerDependencies:
|
||||
svelte: ^3.19.0 || ^4.0.0
|
||||
|
||||
svelte-loadable-store@2.0.1:
|
||||
resolution: {integrity: sha512-qmkgJuo3kcPtt9EG7ZocBXL7plkEHNnNkqtEhRVCHCv3RywpnUF5BoU3VCbG8aYjsQESlI8INHkOlfnr9RpJZQ==}
|
||||
peerDependencies:
|
||||
svelte: 3.x.x || 4.x.x
|
||||
|
||||
svelte-preprocess@5.1.3:
|
||||
resolution: {integrity: sha512-xxAkmxGHT+J/GourS5mVJeOXZzne1FR5ljeOUAMXUkfEhkLEllRreXpbl3dIYJlcJRfL1LO1uIAPpBpBfiqGPw==}
|
||||
engines: {node: '>= 16.0.0', pnpm: ^8.0.0}
|
||||
@ -5897,9 +5831,6 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
svelte-resize-observer@2.0.0:
|
||||
resolution: {integrity: sha512-hMG30MeUFiVhAeAGWoasBGNAFWa/K8mAIvbpjdaYRqNcU5nkxvjZYhzOhQ8rYbHSd2Hflk2s21yFR7CNKEHZpw==}
|
||||
|
||||
svelte-writable-derived@3.1.0:
|
||||
resolution: {integrity: sha512-cTvaVFNIJ036vSDIyPxJYivKC7ZLtcFOPm1Iq6qWBDo1fOHzfk6ZSbwaKrxhjgy52Rbl5IHzRcWgos6Zqn9/rg==}
|
||||
peerDependencies:
|
||||
@ -5936,9 +5867,6 @@ packages:
|
||||
resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
|
||||
engines: {node: '>=10'}
|
||||
|
||||
tauri-plugin-context-menu@0.7.0:
|
||||
resolution: {integrity: sha512-NtFyhP2lQrUqs2ZWxw5j75p0K/3+5xPAckKh8yvpn0Bjq6WpKpBRli5chmcP44ltUoHBfXl2yRnpU14G1G5ucg==}
|
||||
|
||||
tauri-plugin-log-api@https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/2bb26e22f7f7b4f164bad02f0ae4085796f77fff:
|
||||
resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/2bb26e22f7f7b4f164bad02f0ae4085796f77fff}
|
||||
version: 0.0.0
|
||||
@ -7656,17 +7584,6 @@ snapshots:
|
||||
|
||||
'@eslint/object-schema@2.1.4': {}
|
||||
|
||||
'@floating-ui/core@1.5.2':
|
||||
dependencies:
|
||||
'@floating-ui/utils': 0.1.6
|
||||
|
||||
'@floating-ui/dom@1.5.3':
|
||||
dependencies:
|
||||
'@floating-ui/core': 1.5.2
|
||||
'@floating-ui/utils': 0.1.6
|
||||
|
||||
'@floating-ui/utils@0.1.6': {}
|
||||
|
||||
'@fontsource/fira-mono@4.5.10': {}
|
||||
|
||||
'@humanwhocodes/config-array@0.9.5':
|
||||
@ -8981,16 +8898,12 @@ snapshots:
|
||||
dependencies:
|
||||
'@types/node': 20.14.13
|
||||
|
||||
'@types/crypto-js@4.2.2': {}
|
||||
|
||||
'@types/culori@2.1.1': {}
|
||||
|
||||
'@types/deep-equal@1.0.4': {}
|
||||
|
||||
'@types/diff-match-patch@1.0.36': {}
|
||||
|
||||
'@types/diff@5.2.1': {}
|
||||
|
||||
'@types/emscripten@1.39.13': {}
|
||||
|
||||
'@types/eslint@8.56.10':
|
||||
@ -11400,8 +11313,6 @@ snapshots:
|
||||
strip-ansi: 6.0.1
|
||||
wrap-ansi: 6.2.0
|
||||
|
||||
inter-ui@4.0.2: {}
|
||||
|
||||
internal-slot@1.0.7:
|
||||
dependencies:
|
||||
es-errors: 1.3.0
|
||||
@ -12675,8 +12586,6 @@ snapshots:
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
resize-observer-polyfill@1.5.1: {}
|
||||
|
||||
resolve-alpn@1.2.1: {}
|
||||
|
||||
resolve-from@4.0.0: {}
|
||||
@ -13142,11 +13051,6 @@ snapshots:
|
||||
optionalDependencies:
|
||||
svelte: 5.0.0-next.196
|
||||
|
||||
svelte-floating-ui@1.5.8:
|
||||
dependencies:
|
||||
'@floating-ui/core': 1.5.2
|
||||
'@floating-ui/dom': 1.5.3
|
||||
|
||||
svelte-french-toast@1.2.0(svelte@5.0.0-next.196):
|
||||
dependencies:
|
||||
svelte: 5.0.0-next.196
|
||||
@ -13156,10 +13060,6 @@ snapshots:
|
||||
dependencies:
|
||||
svelte: 5.0.0-next.196
|
||||
|
||||
svelte-loadable-store@2.0.1(svelte@5.0.0-next.196):
|
||||
dependencies:
|
||||
svelte: 5.0.0-next.196
|
||||
|
||||
svelte-preprocess@5.1.3(@babel/core@7.24.7)(postcss-load-config@5.1.0(postcss@8.4.39))(postcss@8.4.39)(svelte@5.0.0-next.196)(typescript@5.4.5):
|
||||
dependencies:
|
||||
'@types/pug': 2.0.6
|
||||
@ -13174,10 +13074,6 @@ snapshots:
|
||||
postcss-load-config: 5.1.0(postcss@8.4.39)
|
||||
typescript: 5.4.5
|
||||
|
||||
svelte-resize-observer@2.0.0:
|
||||
dependencies:
|
||||
resize-observer-polyfill: 1.5.1
|
||||
|
||||
svelte-writable-derived@3.1.0(svelte@5.0.0-next.196):
|
||||
dependencies:
|
||||
svelte: 5.0.0-next.196
|
||||
@ -13244,10 +13140,6 @@ snapshots:
|
||||
mkdirp: 1.0.4
|
||||
yallist: 4.0.0
|
||||
|
||||
tauri-plugin-context-menu@0.7.0:
|
||||
dependencies:
|
||||
'@tauri-apps/api': 1.6.0
|
||||
|
||||
tauri-plugin-log-api@https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/2bb26e22f7f7b4f164bad02f0ae4085796f77fff:
|
||||
dependencies:
|
||||
'@tauri-apps/api': 1.6.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user