Skip to content

Commit 8263e73

Browse files
committed
Merge branch 'main' into fix-upload-context-switches
2 parents 9ad3fd6 + c0783f2 commit 8263e73

File tree

12 files changed

+889
-843
lines changed

12 files changed

+889
-843
lines changed

package.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"@appwrite.io/pink": "0.25.0",
2424
"@appwrite.io/pink-icons": "0.25.0",
2525
"@popperjs/core": "^2.11.8",
26-
"@sentry/sveltekit": "^8.26.0",
26+
"@sentry/sveltekit": "^8.31.0",
2727
"@stripe/stripe-js": "^3.5.0",
2828
"ai": "^2.2.37",
2929
"analytics": "^0.8.14",
3030
"cron-parser": "^4.9.0",
31-
"dayjs": "^1.11.12",
31+
"dayjs": "^1.11.13",
3232
"deep-equal": "^2.2.3",
3333
"echarts": "^5.5.1",
3434
"envfile": "^7.1.0",
@@ -42,35 +42,35 @@
4242
"devDependencies": {
4343
"@melt-ui/pp": "^0.3.2",
4444
"@melt-ui/svelte": "^0.83.0",
45-
"@playwright/test": "^1.46.0",
46-
"@sveltejs/adapter-static": "^3.0.4",
47-
"@sveltejs/kit": "^2.5.22",
48-
"@sveltejs/vite-plugin-svelte": "^3.1.1",
45+
"@playwright/test": "^1.47.2",
46+
"@sveltejs/adapter-static": "^3.0.5",
47+
"@sveltejs/kit": "^2.5.28",
48+
"@sveltejs/vite-plugin-svelte": "^3.1.2",
4949
"@testing-library/dom": "^10.4.0",
50-
"@testing-library/jest-dom": "^6.4.8",
50+
"@testing-library/jest-dom": "^6.5.0",
5151
"@testing-library/svelte": "^5.2.1",
5252
"@testing-library/user-event": "^14.5.2",
5353
"@types/deep-equal": "^1.0.4",
5454
"@types/prismjs": "^1.26.4",
5555
"@typescript-eslint/eslint-plugin": "^7.18.0",
5656
"@typescript-eslint/parser": "^7.18.0",
5757
"@vitest/ui": "^1.6.0",
58-
"eslint": "^8.57.0",
58+
"eslint": "^8.57.1",
5959
"eslint-config-prettier": "^9.1.0",
60-
"eslint-plugin-svelte": "^2.43.0",
60+
"eslint-plugin-svelte": "^2.44.0",
6161
"jsdom": "^22.1.0",
6262
"kleur": "^4.1.5",
6363
"prettier": "^3.3.3",
6464
"prettier-plugin-svelte": "^3.2.6",
65-
"sass": "^1.77.8",
66-
"svelte": "^4.2.18",
67-
"svelte-check": "^3.8.5",
65+
"sass": "^1.79.3",
66+
"svelte": "^4.2.19",
67+
"svelte-check": "^3.8.6",
6868
"svelte-jester": "^2.3.2",
6969
"svelte-preprocess": "^6.0.2",
7070
"svelte-sequential-preprocessor": "^2.0.1",
71-
"tslib": "^2.6.3",
72-
"typescript": "^5.5.4",
73-
"vite": "^5.4.0",
71+
"tslib": "^2.7.0",
72+
"typescript": "^5.6.2",
73+
"vite": "^5.4.7",
7474
"vitest": "^1.6.0"
7575
},
7676
"type": "module",

pnpm-lock.yaml

+847-813
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
await sdk.forProject.databases.updateBooleanAttribute(
2727
databaseId,
2828
collectionId,
29-
data.key,
29+
originalKey,
3030
data.required,
3131
data.default,
3232
data.key !== originalKey ? data.key : undefined

src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
await sdk.forProject.databases.updateDatetimeAttribute(
2828
databaseId,
2929
collectionId,
30-
data.key,
30+
originalKey,
3131
data.required,
3232
data.default,
3333
data.key !== originalKey ? data.key : undefined

src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte

+10-6
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,16 @@
5252
}
5353
}
5454
55-
$: if (showEdit) {
56-
currentAttr ??= { ...selectedAttribute };
57-
originalKey = currentAttr.key;
58-
error = null;
59-
} else {
60-
currentAttr = null;
55+
$: onShow(showEdit);
56+
57+
function onShow(show: boolean) {
58+
if (show) {
59+
currentAttr ??= { ...selectedAttribute };
60+
originalKey = currentAttr.key;
61+
error = null;
62+
} else {
63+
currentAttr = null;
64+
}
6165
}
6266
</script>
6367

src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
await sdk.forProject.databases.updateEmailAttribute(
2929
databaseId,
3030
collectionId,
31-
data.key,
31+
originalKey,
3232
data.required,
3333
data.default,
3434
data.key !== originalKey ? data.key : undefined

src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
await sdk.forProject.databases.updateEnumAttribute(
2929
databaseId,
3030
collectionId,
31-
data.key,
31+
originalKey,
3232
data.elements,
3333
data.required,
3434
data.default,

src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
await sdk.forProject.databases.updateFloatAttribute(
3030
databaseId,
3131
collectionId,
32-
data.key,
32+
originalKey,
3333
data.required,
3434
data.min,
3535
data.max,

src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
await sdk.forProject.databases.updateIntegerAttribute(
3030
databaseId,
3131
collectionId,
32-
data.key,
32+
originalKey,
3333
data.required,
3434
data.min,
3535
data.max,

src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
await sdk.forProject.databases.updateIpAttribute(
2727
databaseId,
2828
collectionId,
29-
data.key,
29+
originalKey,
3030
data.required,
3131
data.default,
3232
data.key !== originalKey ? data.key : undefined

src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
await sdk.forProject.databases.updateUrlAttribute(
2828
databaseId,
2929
collectionId,
30-
data.key,
30+
originalKey,
3131
data.required,
3232
data.default,
3333
data.key !== originalKey ? data.key : undefined

svelte.config.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,18 @@ import { preprocessMeltUI, sequence } from '@melt-ui/pp';
44

55
/** @type {import('@sveltejs/kit').Config} */
66
const config = {
7-
preprocess: sequence([sveltePreprocess(), preprocessMeltUI()]),
7+
preprocess: sequence([
8+
sveltePreprocess({
9+
scss: {
10+
silenceDeprecations: ['legacy-js-api']
11+
}
12+
}),
13+
preprocessMeltUI()
14+
]),
815
compilerOptions: {
916
accessors: !!process.env.VITEST
1017
},
18+
1119
kit: {
1220
alias: {
1321
$routes: './src/routes'

0 commit comments

Comments
 (0)