From d87a044374ac3025641e1383a5a3b37a9807fbea Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 19 May 2025 12:31:11 +0200 Subject: [PATCH 1/2] fix: build settings not populated --- package.json | 2 +- pnpm-lock.yaml | 23 ++++++++---- .../sites/create-site/configuration.svelte | 36 ++++++++++--------- 3 files changed, 38 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index e919b9ca66..99a3e173f2 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "^2.0.0-RC.2", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5aca249", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0a0dbd0363..8ceb043ad3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,8 +27,8 @@ importers: specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: ^2.0.0-RC.2 - version: 2.0.0-RC.2(svelte@5.25.3) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5aca249 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5aca249(svelte@5.25.3) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -263,6 +263,12 @@ packages: peerDependencies: svelte: ^4.0.0 + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5aca24915ff47f6af3f1664a10ebdceab8d105f4': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5aca24915ff47f6af3f1664a10ebdceab8d105f4} + version: 2.0.0-RC.1 + peerDependencies: + svelte: ^4.0.0 + '@appwrite.io/pink-icons@0.25.0': resolution: {integrity: sha512-0O3i2oEuh5mWvjO80i+X6rbzrWLJ1m5wmv2/M3a1p2PyBJsFxN8xQMTEmTn3Wl/D26SsM7SpzbdW6gmfgoVU9Q==} @@ -272,8 +278,9 @@ packages: '@appwrite.io/pink-legacy@1.0.3': resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==} - '@appwrite.io/pink-svelte@2.0.0-RC.2': - resolution: {integrity: sha512-tVu78j67K22HvtLjsi3n7qAz8Yhx7AtHSKhwTU5WwpuZ9hXDoJ8Qoh/IIiS7s1b8lP0Ckth0jO2yDb202o85DA==} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5aca249': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5aca249} + version: 2.0.0-RC.2 peerDependencies: svelte: ^4.0.0 @@ -3614,6 +3621,10 @@ snapshots: dependencies: svelte: 5.25.3 + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5aca24915ff47f6af3f1664a10ebdceab8d105f4(svelte@5.25.3)': + dependencies: + svelte: 5.25.3 + '@appwrite.io/pink-icons@0.25.0': {} '@appwrite.io/pink-icons@1.0.0': {} @@ -3623,9 +3634,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@2.0.0-RC.2(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5aca249(svelte@5.25.3)': dependencies: - '@appwrite.io/pink-icons-svelte': 2.0.0-RC.1(svelte@5.25.3) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5aca24915ff47f6af3f1664a10ebdceab8d105f4(svelte@5.25.3) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.6(svelte@5.25.3))(svelte@5.25.3) '@melt-ui/svelte': 0.86.6(svelte@5.25.3) diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/configuration.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/configuration.svelte index cc3e4cf163..53da4ad96e 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/configuration.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/configuration.svelte @@ -37,7 +37,9 @@ export let frameworks: Models.Framework[]; export let selectedFramework: Models.Framework; $: frameworkData = frameworks.find((framework) => framework.key === selectedFramework?.key); - $: ssr = frameworkData?.adapters.find((adapter) => adapter.key === 'ssr'); + $: adapterData = + frameworkData?.adapters.find((adapter) => adapter.key === 'ssr') ?? + frameworkData?.adapters.find((adapter) => adapter.key === 'static'); export let variables: Partial[] = []; export let installCommand = ''; @@ -55,16 +57,18 @@ let frameworkId = selectedFramework.key; $: if (!installCommand || !buildCommand || !outputDirectory) { - installCommand ||= ssr?.installCommand; - buildCommand ||= ssr?.buildCommand; - outputDirectory ||= ssr?.outputDirectory; + installCommand ||= adapterData?.installCommand; + buildCommand ||= adapterData?.buildCommand; + outputDirectory ||= adapterData?.outputDirectory; } $: if (frameworkData) { - installCommand = ssr?.installCommand; - buildCommand = ssr?.buildCommand; - outputDirectory = ssr?.outputDirectory; + installCommand = adapterData?.installCommand; + buildCommand = adapterData?.buildCommand; + outputDirectory = adapterData?.outputDirectory; } + + $: console.log(frameworkData);
@@ -93,12 +97,12 @@ id="installCommand" label="Install command" bind:value={installCommand} - placeholder={ssr?.installCommand} /> + placeholder={adapterData?.installCommand} /> @@ -107,12 +111,12 @@ id="buildCommand" label="Build command" bind:value={buildCommand} - placeholder={ssr?.buildCommand} /> + placeholder={adapterData?.buildCommand} /> @@ -121,12 +125,12 @@ id="outputDirectory" label="Output directory" bind:value={outputDirectory} - placeholder={ssr?.outputDirectory} /> + placeholder={adapterData?.outputDirectory} /> From dd86626d3664ba2c118dbb08c132c0ed8d1564ab Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 19 May 2025 12:35:27 +0200 Subject: [PATCH 2/2] chore: remove log --- .../sites/create-site/configuration.svelte | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/configuration.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/configuration.svelte index 53da4ad96e..0e8b26ceff 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/configuration.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/configuration.svelte @@ -67,8 +67,6 @@ buildCommand = adapterData?.buildCommand; outputDirectory = adapterData?.outputDirectory; } - - $: console.log(frameworkData);