From be8d28f4445e8fd1aa308aaa13954f92c0602cb4 Mon Sep 17 00:00:00 2001
From: Rune Harlyk <rune@harlyk.dk>
Date: Mon, 4 Mar 2024 17:57:18 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=9F=E2=80=8D=E2=99=80=EF=B8=8F=20Updat?=
 =?UTF-8?q?e=20vite=20config=20to=20use=20env=20variables?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/package.json   |  1 -
 app/pnpm-lock.yaml |  8 --------
 app/vite.config.ts | 44 +++++++++++++++++++++++---------------------
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/app/package.json b/app/package.json
index 8a702fd..d30cc2d 100644
--- a/app/package.json
+++ b/app/package.json
@@ -23,7 +23,6 @@
 		"@typescript-eslint/parser": "^6.20.0",
 		"autoprefixer": "^10.4.17",
 		"cross-env": "^7.0.3",
-		"dotenv": "^16.4.5",
 		"husky": "^9.0.7",
 		"lint-staged": "^15.2.0",
 		"postcss": "^8.4.33",
diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml
index 0ce9279..9b33dc4 100644
--- a/app/pnpm-lock.yaml
+++ b/app/pnpm-lock.yaml
@@ -49,9 +49,6 @@ devDependencies:
   cross-env:
     specifier: ^7.0.3
     version: 7.0.3
-  dotenv:
-    specifier: ^16.4.5
-    version: 16.4.5
   husky:
     specifier: ^9.0.7
     version: 9.0.7
@@ -1171,11 +1168,6 @@ packages:
       esutils: 2.0.3
     dev: true
 
-  /dotenv@16.4.5:
-    resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==}
-    engines: {node: '>=12'}
-    dev: true
-
   /electron-to-chromium@1.4.649:
     resolution: {integrity: sha512-dq/owIaALxZGqWm5RXpKQ4baX6aDC19e2Z16c8SXYN+I71PyEKjbVqQUgm7kcuk8CRqljTKXbolo0XXDjxnh2w==}
     dev: true
diff --git a/app/vite.config.ts b/app/vite.config.ts
index 27804f8..c74de77 100644
--- a/app/vite.config.ts
+++ b/app/vite.config.ts
@@ -1,28 +1,30 @@
-import { defineConfig } from 'vite';
+import { defineConfig, loadEnv } from 'vite';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import { viteSingleFile } from 'vite-plugin-singlefile';
 import viteCompression from 'vite-plugin-compression';
 import path from 'path';
-import 'dotenv/config';
-
-const embeddedBuild = process.env.VITE_EMBEDDED_BUILD == 'true';
 
 // https://vitejs.dev/config/
-export default defineConfig({
-	plugins: [
-		svelte(),
-		...(embeddedBuild ? [viteSingleFile(), viteCompression({ deleteOriginFile: true })] : [])
-	],
-	build: {
-		outDir: embeddedBuild ? '../data' : './build',
-		emptyOutDir: true
-	},
-	resolve: {
-		alias: {
-			$lib: path.resolve('./src/lib/'),
-			$components: path.resolve('./src/components'),
-			$utils: path.resolve('./src/utils'),
-			$stores: path.resolve('./src/stores')
+export default ({ mode }) => {
+	process.env = { ...process.env, ...loadEnv(mode, process.cwd()) };
+	const embeddedBuild = process.env.VITE_EMBEDDED_BUILD == 'true';
+
+	return defineConfig({
+		plugins: [
+			svelte(),
+			...(embeddedBuild ? [viteSingleFile(), viteCompression({ deleteOriginFile: true })] : [])
+		],
+		build: {
+			outDir: embeddedBuild ? '../esp32/data' : './build',
+			emptyOutDir: true
+		},
+		resolve: {
+			alias: {
+				$lib: path.resolve('./src/lib/'),
+				$components: path.resolve('./src/components'),
+				$utils: path.resolve('./src/utils'),
+				$stores: path.resolve('./src/stores')
+			}
 		}
-	}
-});
+	});
+};