diff --git a/.gitignore b/.gitignore index b8a795f1..e65071e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Env .env +.env.local # Vite vite.config.js.timestamp-* diff --git a/build.sh b/build.sh index 1b632f25..dc48ea9d 100755 --- a/build.sh +++ b/build.sh @@ -5,8 +5,8 @@ temp_env=$(declare -p -x) if [ -f .env.template ]; then source .env.template fi -if [ -f .env ]; then - source .env +if [ -f .env.local ]; then + source .env.local fi # Avoid overwriting env vars provided directly diff --git a/pwa-assets.config.js b/pwa-assets.config.js index 6502ddb4..38d3c1c4 100644 --- a/pwa-assets.config.js +++ b/pwa-assets.config.js @@ -1,7 +1,7 @@ import dotenv from "dotenv" import {defineConfig, minimalPreset as preset} from "@vite-pwa/assets-generator/config" -dotenv.config({path: ".env"}) +dotenv.config({path: ".env.local"}) dotenv.config({path: ".env.template"}) export default defineConfig({ diff --git a/src/app/components/SignUpEmail.svelte b/src/app/components/SignUpEmail.svelte index 6d7e62fb..6171371d 100644 --- a/src/app/components/SignUpEmail.svelte +++ b/src/app/components/SignUpEmail.svelte @@ -59,7 +59,8 @@ const setupRes = await client.setupRecovery(email, password) if (!setupRes.ok) { - const message = setupRes.messages.find(m => m.res && !m.res?.ok)?.res?.message || "Please try again." + const message = + setupRes.messages.find(m => m.res && !m.res?.ok)?.res?.message || "Please try again." return pushToast({ theme: "error", diff --git a/tailwind.config.js b/tailwind.config.js index 650dc9fd..5b540056 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -2,7 +2,7 @@ import {config} from "dotenv" import daisyui from "daisyui" import themes from "daisyui/src/theming/themes" -config({path: ".env"}) +config({path: ".env.local"}) config({path: ".env.template"}) /** @type {import('tailwindcss').Config} */ diff --git a/vite.config.ts b/vite.config.ts index a6bcb04c..72d86f22 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -4,7 +4,7 @@ import {SvelteKitPWA} from "@vite-pwa/sveltekit" import {sveltekit} from "@sveltejs/kit/vite" import svg from "@poppanator/sveltekit-svg" -config({path: ".env"}) +config({path: ".env.local"}) config({path: ".env.template"}) export default defineConfig({