diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f8ed5a167..4ffde2176 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,14 +15,14 @@ importers: specifier: 0.25.0 version: 0.25.0 '@appwrite.io/pink-icons-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@525e5be8 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@525e5be8(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a0 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a0(svelte@4.2.19) '@appwrite.io/pink-legacy': specifier: ^1.0.2 version: 1.0.2 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@30b0f25 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@30b0f25(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3fd919a0 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3fd919a0(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -215,14 +215,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@30b0f25a639a53ffae787fda44a57e1335cc2d1c': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@30b0f25a639a53ffae787fda44a57e1335cc2d1c} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a0': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a0} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@525e5be8': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@525e5be8} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a00b71d85d8b630f22953d28aa28ae0050': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a00b71d85d8b630f22953d28aa28ae0050} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -236,8 +236,8 @@ packages: '@appwrite.io/pink-legacy@1.0.2': resolution: {integrity: sha512-1AYNcfbV+x0Tyj56CoieSq5g7+u+7F5/LDVN/z+Hx1kp9gj7xc1eT39Dy832xxfihImF6ksjp0FXEMVSBR8cew==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@30b0f25': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@30b0f25} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3fd919a0': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3fd919a0} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4099,11 +4099,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@30b0f25a639a53ffae787fda44a57e1335cc2d1c(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a0(svelte@4.2.19)': dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@525e5be8(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a00b71d85d8b630f22953d28aa28ae0050(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4116,9 +4116,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@30b0f25(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3fd919a0(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@30b0f25a639a53ffae787fda44a57e1335cc2d1c(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a00b71d85d8b630f22953d28aa28ae0050(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.3(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.3(svelte@4.2.19) diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/store.ts b/src/routes/(console)/project-[project]/sites/site-[site]/settings/store.ts index 7b0c5c905..d903d3239 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/store.ts +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/store.ts @@ -1,3 +1,93 @@ import { writable } from 'svelte/store'; export const showConnectRepo = writable(false); + +export const adapterDataList = [ + { + framework: 'sveltekit', + ssr: { + desc: 'Use $ adapter in $ file.', + code: ['@sveltejs/adapter-node', 'svelte.config.js'], + url: 'https://kit.svelte.dev/docs#adapter-node' + }, + static: { + desc: 'Use $ adapter in $ file.', + code: ['@sveltejs/adapter-static', 'svelte.config.js'], + url: 'https://kit.svelte.dev/docs#adapter-static' + } + }, + { + framework: 'astro', + ssr: { + desc: 'Use $ adapter in $ file.', + code: ['@astro/node', 'astro.config.mjs'], + url: 'https://docs.astro.build/en/guides/server-side-rendering/' + }, + static: { + desc: "Ensure you don't set $ adapter in $ file.", + code: ['adapter', 'astro.config.mjs'], + url: 'https://docs.astro.build/en/guides/deploy/' + } + }, + { + framework: 'remix', + ssr: { + desc: 'Ensure $ file uses $ package.', + code: ['entry.server.tsx', '@remix-run/node'] + }, + static: { + desc: 'Set $ in $ plugin in $ file.', + code: ['ssr: false', 'remix', 'vite.config.ts'] + } + }, + { + framework: 'nuxt', + ssr: { + desc: 'Set build command to $ in site settings.', + code: ['npm run build'], + url: 'https://nuxt.com/docs/getting-started/deployment' + }, + static: { + desc: 'Set build command to $ in site settings.', + code: ['npm run generate'], + url: 'https://nuxt.com/docs/getting-started/deployment#static-hosting' + } + }, + { + framework: 'next', + ssr: { + desc: "Ensure you don't set $ in $ file.", + code: ['output', 'next.config.js'], + url: 'https://nextjs.org/docs/pages/building-your-application/deploying' + }, + static: { + desc: 'Set $ in $ file', + code: ["output: 'export'", 'next.config.js'], + url: 'https://nextjs.org/docs/pages/building-your-application/deploying/static-exports' + } + }, + { + framework: 'analog', + ssr: { + desc: 'Set $ in $ plugin in $', + code: ['ssr: true', 'analog', 'vite.config.ts'], + url: 'https://analogjs.org/docs/features/server/server-side-rendering' + }, + static: { + desc: 'Set $ in $ plugin in $', + code: ['static: true', 'analog', 'vite.config.ts'], + url: 'https://analogjs.org/docs/features/server/static-site-generation' + } + }, + { + framework: 'angular', + ssr: { + desc: 'Ensure $ file uses $ package.', + code: ['src/server.ts', '@angular/ssr/node'], + url: 'https://angular.dev/guide/ssr' + }, + static: { + desc: "Angular's default build is static. No further action needed." + } + } +]; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte index 93bfad25d..2609399f0 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte @@ -13,24 +13,25 @@ import { getFrameworkIcon } from '../../store'; import { Link } from '$lib/elements'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; + import { adapterDataList } from './store'; export let site: Models.Site; export let frameworks: Models.Framework[]; - let selectedFramework: Models.Framework = null; + let selectedFramework: Models.Framework = frameworks.find( + (framework) => framework.key === site.framework + ); + let frameworkKey = site.framework; + let adapter: Adapter = site.adapter as Adapter; let installCommand = undefined; let buildCommand = undefined; let outputDirectory = undefined; - let frameworkKey = site.framework; - let adapter: Adapter = site.adapter as Adapter; let fallback = site.fallbackFile; let isButtonDisabled = true; let showFallback = site.adapter === Adapter.Static; onMount(async () => { - selectedFramework ??= frameworks.find((framework) => framework.key === site.framework); - - installCommand = - site?.installCommand ?? selectedFramework.adapters[site.adapter].defaultInstallCommand; + installCommand ??= installCommand = + site?.installCommand ?? selectedFramework.adapters[site.adapter].installCommand; buildCommand = site?.buildCommand ?? selectedFramework.adapters[site.adapter].defaultBuildCommand; outputDirectory = @@ -73,7 +74,6 @@ } } - $: frameworkData = frameworks.find((framework) => framework.key === frameworkKey); $: if ( installCommand === site?.installCommand && buildCommand === site?.buildCommand && @@ -89,17 +89,28 @@ $: if (adapter === Adapter.Static) { showFallback = true; + fallback ||= selectedFramework.adapters.static.fallbackFile; + console.log(fallback, selectedFramework.adapters.static); } else { showFallback = false; + fallback = undefined; } $: if (fallback === '') { fallback = null; } - $: frameworkDataAdapter = frameworkData.adapters?.length - ? frameworkData.adapters[site.adapter] + $: frameworkDataAdapter = selectedFramework.adapters?.length + ? selectedFramework.adapters[site.adapter] : frameworks[0].adapters[site.adapter]; + + //TODO: fix after backend type is fixed + $: if (selectedFramework?.adapters?.length <= 1 || !selectedFramework?.adapters?.ssr?.key) { + adapter = Adapter.Static; + } + $: if (selectedFramework?.adapters?.length <= 1 || !selectedFramework?.adapters?.static?.key) { + adapter = Adapter.Ssr; + }