fix(sites): stop reading the framework start command #3156
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,12 +7,20 @@ | |
| import { addNotification } from '$lib/stores/notifications'; | ||
| import { sdk } from '$lib/stores/sdk'; | ||
| import { Adapter, BuildRuntime, Framework, type Models } from '@appwrite.io/console'; | ||
| import { | ||
| Accordion, | ||
| Card, | ||
| Fieldset, | ||
| Icon, | ||
| InlineCode, | ||
| Layout, | ||
| Tooltip | ||
| } from '@appwrite.io/pink-svelte'; | ||
| import { iconPath } from '$lib/stores/app'; | ||
| import { Link } from '$lib/elements'; | ||
| import { IconInfo } from '@appwrite.io/pink-icons-svelte'; | ||
| import { adapterDataList } from './store'; | ||
| import { getFrameworkIcon } from '$lib/stores/sites'; | ||
| import { page } from '$app/state'; | ||
|
|
||
| let { | ||
|
|
@@ -50,9 +58,8 @@ | |
| (fallback ?? '') === (site?.fallbackFile ?? '') && | ||
| (adapter ?? '') === (site?.adapter ?? '') | ||
| ); | ||
| let frameworkAdapterData = $derived( | ||
| selectedFramework.adapters.find((a) => a.key === adapter) ?? selectedFramework.adapters[0] | ||
| ); | ||
|
|
||
| $effect(() => { | ||
|
|
@@ -77,17 +84,19 @@ | |
| } | ||
|
|
||
| //Update values | ||
| const data = | ||
| selectedFramework.adapters.find((a) => a.key === adapter) ?? | ||
| selectedFramework.adapters[0]; | ||
| installCommand = data.installCommand; | ||
| buildCommand = data.buildCommand; | ||
| outputDirectory = data.outputDirectory; | ||
| adapter = data.key as Adapter; | ||
| fallback = data.fallbackFile; | ||
| startCommand = ''; | ||
| } else if (hasFrameworkSelectionChanged) { | ||
| const data = | ||
| selectedFramework.adapters.find((a) => a.key === adapter) ?? | ||
| selectedFramework.adapters[0]; | ||
| const isOriginalAdapter = adapter === site.adapter; | ||
|
|
||
| installCommand = isOriginalAdapter | ||
|
|
@@ -96,15 +105,13 @@ | |
| buildCommand = isOriginalAdapter | ||
| ? (site?.buildCommand ?? frameworkAdapterData.buildCommand) | ||
| : data.buildCommand; | ||
| outputDirectory = isOriginalAdapter | ||
| ? (site?.outputDirectory ?? frameworkAdapterData.outputDirectory) | ||
| : data.outputDirectory; | ||
| fallback = isOriginalAdapter | ||
| ? (site?.fallbackFile ?? data.fallbackFile) | ||
| : data.fallbackFile; | ||
| startCommand = isOriginalAdapter ? (site?.startCommand ?? '') : ''; | ||
|
Contributor
There was a problem hiding this comment.
When an SSR site is changed to another framework and its adapter is then changed away from and back to SSR, this branch restores Knowledge Base Used: Functions and Sites Prompt To Fix With AIThis is a comment left during a code review.
Path: src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte
Line: 114
Comment:
**Old start command gets restored**
When an SSR site is changed to another framework and its adapter is then changed away from and back to SSR, this branch restores `site.startCommand` solely because the adapter key matches the original adapter. The subsequent update submits the old framework's command for the newly selected framework, causing deployments to use an incompatible entrypoint.
**Knowledge Base Used:** [Functions and Sites](https://app.greptile.com/appwrite/-/custom-context/knowledge-base/appwrite/console/-/docs/project-functions-sites.md)
---
For each issue above, determine whether it is valid and should be fixed. If so, fix it directly. |
||
| } | ||
|
|
||
| lastFrameworkAdapterKey = `${selectedFramework.key}:${adapter ?? ''}`; | ||
|
|
@@ -162,7 +169,7 @@ | |
| timeout: site.timeout || undefined, | ||
| installCommand: installCommand || undefined, | ||
| buildCommand: buildCommand || undefined, | ||
| startCommand: adptr?.key === 'ssr' ? startCommand || undefined : undefined, | ||
| outputDirectory: outputDirectory || undefined, | ||
| buildRuntime: (site?.buildRuntime as BuildRuntime) || undefined, | ||
| adapter: (adptr?.key as Adapter) || undefined, | ||
|
|
@@ -193,17 +200,13 @@ | |
| } | ||
| } | ||
|
|
||
| function reset(type: 'installCommand' | 'buildCommand' | 'outputDirectory') { | ||
| const data = selectedFramework.adapters.find((a) => a.key === adapter); | ||
|
|
||
| if (type === 'installCommand') { | ||
| installCommand = data.installCommand; | ||
| } else if (type === 'buildCommand') { | ||
| buildCommand = data.buildCommand; | ||
| } else if (type === 'outputDirectory') { | ||
| outputDirectory = data.outputDirectory; | ||
| } | ||
|
|
@@ -332,24 +335,6 @@ | |
| Reset | ||
| </Button> | ||
| </Layout.Stack> | ||
| <Layout.Stack gap="s" direction="row" alignItems="flex-end"> | ||
| <InputText | ||
| id="outputDirectory" | ||
|
|
@@ -381,6 +366,19 @@ | |
| </Tooltip> | ||
| </InputText> | ||
| {/if} | ||
| {#if adapter === Adapter.Ssr} | ||
| <Accordion title="Advanced"> | ||
| <Layout.Stack gap="l"> | ||
| Command used to start your SSR server after a successful deploy. | ||
| Leave it empty to use the framework default. | ||
| <InputText | ||
| id="startCommand" | ||
| label="Start command" | ||
| bind:value={startCommand} | ||
| placeholder="Enter start command" /> | ||
| </Layout.Stack> | ||
| </Accordion> | ||
| {/if} | ||
| </Layout.Stack> | ||
| </Fieldset> | ||
| </Layout.Stack> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.