diff --git a/package.json b/package.json index a4c17ce..8576233 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ ], "devDependencies": { "@sveltejs/adapter-auto": "^3.0.0", - "@sveltejs/adapter-netlify": "^4.2.0", + "@sveltejs/adapter-static": "^3.0.2", "@sveltejs/kit": "^2.0.0", "@sveltejs/vite-plugin-svelte": "^3.0.0", "@teapotlabs/identeapots": "^1.0.8", diff --git a/src/routes/countdown/+page.svelte b/src/routes/countdown/+page.svelte index 4c3c6e4..34cfe21 100644 --- a/src/routes/countdown/+page.svelte +++ b/src/routes/countdown/+page.svelte @@ -2,6 +2,15 @@ import CountdownTimer from "$lib/components/CountdownTimer.svelte"; import BackgroundOverlay from "$lib/components/BackgroundOverlay.svelte"; import BlurryBg from "$lib/components/BlurryBg.svelte"; + import {onMount} from "svelte"; + import {isLive} from "$lib"; + import {goto} from "$app/navigation"; + + onMount(() => { + if(isLive()){ + goto('/') + } + })
@@ -9,4 +18,4 @@ -
\ No newline at end of file + diff --git a/src/routes/countdown/+page.ts b/src/routes/countdown/+page.ts deleted file mode 100644 index 4596597..0000000 --- a/src/routes/countdown/+page.ts +++ /dev/null @@ -1,10 +0,0 @@ -import {redirect} from "@sveltejs/kit"; -import {isLive} from "$lib"; - -export function load({ params }) { - - if(isLive()){ - return redirect(304, '/'); - } - return {}; -} \ No newline at end of file diff --git a/svelte.config.js b/svelte.config.js index d50ed9e..813143a 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,4 +1,4 @@ -import adapter from '@sveltejs/adapter-netlify'; +import adapter from '@sveltejs/adapter-static'; import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'; /** @type {import('@sveltejs/kit').Config} */ @@ -11,7 +11,14 @@ const config = { // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list. // If your environment is not supported, or you settled on a specific environment, switch out the adapter. // See https://kit.svelte.dev/docs/adapters for more information about adapters. - adapter: adapter() + // adapter: adapter() + adapter: adapter({ + pages: 'build', + assets: 'build', + fallback: 'index.html', + precompress: false, + strict: true + }) } }; diff --git a/yarn.lock b/yarn.lock index 1ad128f..4e2401e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -145,11 +145,6 @@ dependencies: tslib "^2.1.0" -"@iarna/toml@^2.2.5": - version "2.2.5" - resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c" - integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg== - "@isaacs/cliui@^8.0.2": version "8.0.2" resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" @@ -312,14 +307,10 @@ dependencies: import-meta-resolve "^4.1.0" -"@sveltejs/adapter-netlify@^4.2.0": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@sveltejs/adapter-netlify/-/adapter-netlify-4.3.0.tgz#8ad42bb4c406c43d6e26446eb7410008876cb39f" - integrity sha512-lSO3Agv/jPy93KKsj3HSrrBaG1vHe63z+p31l12yGUc2v/jGN94cSnynm540OHMo9ZoFV30H/SbE+lfgxfL2KA== - dependencies: - "@iarna/toml" "^2.2.5" - esbuild "^0.21.5" - set-cookie-parser "^2.6.0" +"@sveltejs/adapter-static@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@sveltejs/adapter-static/-/adapter-static-3.0.2.tgz#b505c429616c3319d40d293b741f6915da143f49" + integrity sha512-/EBFydZDwfwFfFEuF1vzUseBoRziwKP7AoHAwv+Ot3M084sE/HTVBHf9mCmXfdM9ijprY5YEugZjleflncX5fQ== "@sveltejs/kit@^2.0.0": version "2.5.18" @@ -966,7 +957,7 @@ es6-promise@^3.1.2: resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613" integrity sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg== -esbuild@^0.21.3, esbuild@^0.21.5: +esbuild@^0.21.3: version "0.21.5" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d" integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==