Merge pull request #6516 from getkirby/v5/fix/vite-env

getkirby · Jun 28, 2024 · 5d84c2d · 5d84c2d
2 parents 23a46e5 + c1a1da3
commit 5d84c2d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/panel/.env.example b/panel/.env.example
@@ -1 +1 @@
-VUE_APP_DEV_SERVER = "http://sandbox.test"
+SERVER = "http://sandbox.test"
diff --git a/panel/vite.config.mjs b/panel/vite.config.mjs
@@ -1,7 +1,7 @@
 /* eslint-env node */
 import path from "path";
 
-import { defineConfig, splitVendorChunkPlugin } from "vite";
+import { defineConfig, loadEnv, splitVendorChunkPlugin } from "vite";
 import vue from "@vitejs/plugin-vue2";
 import { viteStaticCopy } from "vite-plugin-static-copy";
 import externalize from "rollup-plugin-external-globals";
@@ -21,7 +21,7 @@ function createAliases() {
  */
 function createServer() {
 	const proxy = {
-		target: process.env.VUE_APP_DEV_SERVER ?? "http://sandbox.test",
+		target: process.env.SERVER ?? "http://sandbox.test",
 		changeOrigin: true,
 		secure: false
 	};
@@ -99,7 +99,14 @@ function createTest() {
 /**
  * Returns the Vite configuration
  */
-export default defineConfig(({ command }) => {
+export default defineConfig(({ command, mode }) => {
+	// Load env file based on `mode` in the current working directory.
+	// Set the third parameter to '' to load all env regardless of the `VITE_` prefix.
+	process.env = {
+		...process.env,
+		...loadEnv(mode, process.cwd(), '')
+	};
+
 	return {
 		plugins: createPlugins(command),
 		define: {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		VUE_APP_DEV_SERVER = "http://sandbox.test"
		SERVER = "http://sandbox.test"