From c6aba7cec8e5b07ad6cdc03982e92a77dac16722 Mon Sep 17 00:00:00 2001
From: Brieuc Dubois <git@bhasher.com>
Date: Wed, 12 Feb 2025 12:23:53 +0100
Subject: [PATCH] Fix ENV in prod
---
docker-compose.yaml | 8 ++++----
frontend/package.json | 2 +-
frontend/src/lib/config.ts | 15 +++++++++++----
frontend/src/types.d.ts | 6 ++++++
frontend/tsconfig.json | 2 +-
5 files changed, 23 insertions(+), 10 deletions(-)
create mode 100644 frontend/src/types.d.ts
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 73738a46..a6850b33 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -42,10 +42,10 @@ services:
container_name: languagelab-frontend-dev
image: registry.forge.uclouvain.be/sbibauw/languagelab:frontend-dev
environment:
- - VITE_API_URL=https://beta.dev.languagelab.be/tmp-api
- - VITE_API_PROXY=https://beta.dev.languagelab.be/tmp-api
- - VITE_APP_URL=https://beta.dev.languagelab.be
- - VITE_WS_URL=wss://beta.dev.languagelab.be/tmp-api/v1/ws
+ - PUBLIC_API_URL=https://beta.dev.languagelab.be/tmp-api
+ - PUBLIC_API_PROXY=https://beta.dev.languagelab.be/tmp-api
+ - PUBLIC_APP_URL=https://beta.dev.languagelab.be
+ - PUBLIC_WS_URL=wss://beta.dev.languagelab.be/tmp-api/v1/ws
volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
diff --git a/frontend/package.json b/frontend/package.json
index f0a6699c..45926431 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -3,7 +3,7 @@
"version": "0.0.1",
"private": true,
"scripts": {
- "dev": "VITE_API_URL=http://127.0.0.1:8000/tmp-api VITE_APP_URL=http://127.0.0.1:5173 VITE_WS_URL=ws://127.0.0.1:8000/tmp-api/v1/ws vite dev --host 127.0.0.1",
+ "dev": "PUBLIC_API_URL=http://127.0.0.1:8000/tmp-api PUBLIC_APP_URL=http://127.0.0.1:5173 PUBLIC_WS_URL=ws://127.0.0.1:8000/tmp-api/v1/ws vite dev --host 127.0.0.1",
"build": "vite build",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
diff --git a/frontend/src/lib/config.ts b/frontend/src/lib/config.ts
index 84a56390..3d0e49fd 100644
--- a/frontend/src/lib/config.ts
+++ b/frontend/src/lib/config.ts
@@ -1,8 +1,15 @@
+import {
+ PUBLIC_API_URL,
+ PUBLIC_API_PROXY,
+ PUBLIC_APP_URL,
+ PUBLIC_WS_URL
+} from '$env/static/public';
+
export default {
- API_URL: import.meta.env.VITE_API_URL || 'https://languagelab.be/tmp-api',
- API_PROXY: import.meta.env.VITE_API_PROXY || 'https://languagelab.be/tmp-api',
- APP_URL: import.meta.env.VITE_APP_URL || 'https://languagelab.be',
- WS_URL: import.meta.env.VITE_WS_URL || 'wss://languagelab.be/tmp-api/v1/ws',
+ API_URL: PUBLIC_API_URL || 'https://languagelab.be/tmp-api',
+ API_PROXY: PUBLIC_API_PROXY || 'https://languagelab.be/tmp-api',
+ APP_URL: PUBLIC_APP_URL || 'https://languagelab.be',
+ WS_URL: PUBLIC_WS_URL || 'wss://languagelab.be/tmp-api/v1/ws',
// 1 week - 2 hours
WEEKLY_SURVEY_INTERVAL: (7 * 24 - 2) * 60 * 60 * 1000,
LEARNING_LANGUAGES: {
diff --git a/frontend/src/types.d.ts b/frontend/src/types.d.ts
new file mode 100644
index 00000000..970eb1bd
--- /dev/null
+++ b/frontend/src/types.d.ts
@@ -0,0 +1,6 @@
+declare module '$env/static/public' {
+ export const PUBLIC_API_URL: string;
+ export const PUBLIC_API_PROXY: string;
+ export const PUBLIC_APP_URL: string;
+ export const PUBLIC_WS_URL: string;
+}
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index a76f2ab5..a9380f39 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -15,6 +15,6 @@
"module": "ESNext",
"isolatedModules": true
},
- "include": ["src/**/*", "global.d.ts"],
+ "include": ["src/**/*", "global.d.ts", ".svelte-kit/ambient.d.ts"],
"exclude": ["node_modules", ".svelte-kit/*", "build/*"]
}
--
GitLab