feat: use $env/static/public for env variables

TorstenDittmann · TorstenDittmann · commit 57aee7dc866e · 2024-07-18T22:51:30.000+02:00
diff --git a/.env.example b/.env.example
@@ -1,5 +1,4 @@
-VITE_APPWRITE_ENDPOINT=http://localhost/v1
-VITE_APPWRITE_GROWTH_ENDPOINT= 
-VITE_GA_PROJECT=
-VITE_CONSOLE_MODE=self-hosted
-VITE_STRIPE_PUBLIC_KEY=
+PUBLIC_APPWRITE_ENDPOINT=https://localhost/v1
+PUBLIC_CONSOLE_MODE=self-hosted
+PUBLIC_STRIPE_KEY=
+PUBLIC_GROWTH_ENDPOINT=
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -38,5 +38,5 @@ jobs:
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}
                   build-args: |
-                      "VITE_CONSOLE_MODE=self-hosted"
-                      "VITE_APPWRITE_GROWTH_ENDPOINT=${{ secrets.VITE_APPWRITE_GROWTH_ENDPOINT }}"
+                      "PUBLIC_CONSOLE_MODE=self-hosted"
+                      "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ on:
             - 'static/**/*'
 
 env:
-    VITE_APPWRITE_ENDPOINT: http://appwrite.test/v1
+    PUBLIC_APPWRITE_ENDPOINT: http://appwrite.test/v1
 
 jobs:
     build:
diff --git a/Dockerfile b/Dockerfile
@@ -18,15 +18,15 @@ ADD ./vite.config.ts /app/vite.config.ts
 ADD ./src /app/src
 ADD ./static /app/static
 
-ARG VITE_CONSOLE_MODE
-ARG VITE_APPWRITE_ENDPOINT
-ARG VITE_APPWRITE_GROWTH_ENDPOINT
-ARG VITE_STRIPE_PUBLIC_KEY
-
-ENV VITE_APPWRITE_ENDPOINT=$VITE_APPWRITE_ENDPOINT
-ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT
-ENV VITE_CONSOLE_MODE=$VITE_CONSOLE_MODE
-ENV VITE_STRIPE_PUBLIC_KEY=$VITE_STRIPE_PUBLIC_KEY
+ARG PUBLIC_CONSOLE_MODE
+ARG PUBLIC_APPWRITE_ENDPOINT
+ARG PUBLIC_APPWRITE_GROWTH_ENDPOINT
+ARG PUBLIC_STRIPE_KEY
+
+ENV PUBLIC_APPWRITE_ENDPOINT=$PUBLIC_APPWRITE_ENDPOINT
+ENV PUBLIC_APPWRITE_GROWTH_ENDPOINT=$PUBLIC_APPWRITE_GROWTH_ENDPOINT
+ENV PUBLIC_CONSOLE_MODE=$PUBLIC_CONSOLE_MODE
+ENV PUBLIC_STRIPE_KEY=$PUBLIC_STRIPE_KEY
 
 RUN pnpm run sync && pnpm run build
 
diff --git a/build.js b/build.js
@@ -23,9 +23,9 @@ async function main() {
     log();
     log(bold().magenta('APPWRITE CONSOLE'));
     log();
-    logEnv('CONSOLE MODE', env?.VITE_CONSOLE_MODE);
-    logEnv('APPWRITE ENDPOINT', env?.VITE_APPWRITE_ENDPOINT, 'relative');
-    logEnv('GROWTH ENDPOINT', env?.VITE_APPWRITE_GROWTH_ENDPOINT);
+    logEnv('CONSOLE MODE', env?.PUBLIC_CONSOLE_MODE);
+    logEnv('APPWRITE ENDPOINT', env?.PUBLIC_APPWRITE_ENDPOINT, 'relative');
+    logEnv('GROWTH ENDPOINT', env?.PUBLIC_GROWTH_ENDPOINT);
     log();
     logDelimiter();
     await build();
diff --git a/compose.yml b/compose.yml
@@ -4,10 +4,10 @@ services:
         build:
             context: .
             args:
-                VITE_CONSOLE_MODE: ${VITE_CONSOLE_MODE}
-                VITE_APPWRITE_ENDPOINT: ${VITE_APPWRITE_ENDPOINT}
-                VITE_APPWRITE_GROWTH_ENDPOINT: ${VITE_APPWRITE_GROWTH_ENDPOINT}
-                VITE_STRIPE_PUBLIC_KEY: ${VITE_STRIPE_PUBLIC_KEY}
+                PUBLIC_CONSOLE_MODE: ${PUBLIC_CONSOLE_MODE}
+                PUBLIC_APPWRITE_ENDPOINT: ${PUBLIC_APPWRITE_ENDPOINT}
+                PUBLIC_APPWRITE_GROWTH_ENDPOINT: ${PUBLIC_GROWTH_ENDPOINT}
+                PUBLIC_STRIPE_KEY: ${PUBLIC_STRIPE_KEY}
         develop:
             watch:
                 - action: rebuild
@@ -18,9 +18,9 @@ services:
                       - node_modules/
                       - build/
         environment:
-            - VITE_CONSOLE_MODE
-            - VITE_APPWRITE_ENDPOINT
-            - VITE_APPWRITE_GROWTH_ENDPOINT
-            - VITE_STRIPE_PUBLIC_KEY
+            - PUBLIC_CONSOLE_MODE
+            - PUBLIC_APPWRITE_ENDPOINT
+            - PUBLIC_GROWTH_ENDPOINT
+            - PUBLIC_STRIPE_KEY
         ports:
             - '3000:80'
diff --git a/playwright.config.ts b/playwright.config.ts
@@ -12,9 +12,9 @@ const config: PlaywrightTestConfig = {
     webServer: {
         timeout: 120000,
         env: {
-            VITE_APPWRITE_ENDPOINT: 'http://console-tests.appwrite.org/v1',
-            VITE_CONSOLE_MODE: 'cloud',
-            VITE_STRIPE_PUBLIC_KEY:
+            PUBLIC_APPWRITE_ENDPOINT: 'http://console-tests.appwrite.org/v1',
+            PUBLIC_CONSOLE_MODE: 'cloud',
+            PUBLIC_STRIPE_KEY:
                 'pk_test_51LT5nsGYD1ySxNCyd7b304wPD8Y1XKKWR6hqo6cu3GIRwgvcVNzoZv4vKt5DfYXL1gRGw4JOqE19afwkJYJq1g3K004eVfpdWn'
         },
         command: 'pnpm run build && pnpm run preview',
diff --git a/src/lib/system.ts b/src/lib/system.ts
@@ -1,15 +1,20 @@
-export enum Mode {
+import {
+    PUBLIC_APPWRITE_ENDPOINT,
+    PUBLIC_CONSOLE_MODE,
+    PUBLIC_GROWTH_ENDPOINT,
+    PUBLIC_STRIPE_KEY
+} from '$env/static/public';
+
+export const enum Mode {
     CLOUD = 'cloud',
     SELF_HOSTED = 'self-hosted'
 }
 
 export const VARS = {
-    APPWRITE_ENDPOINT: import.meta.env?.VITE_APPWRITE_ENDPOINT?.toString() as string | undefined,
-    GROWTH_ENDPOINT: import.meta.env?.VITE_APPWRITE_GROWTH_ENDPOINT?.toString() as
-        | string
-        | undefined,
-    CONSOLE_MODE: import.meta.env?.VITE_CONSOLE_MODE?.toString() as string | undefined,
-    STRIPE_PUBLIC_KEY: import.meta.env?.VITE_STRIPE_PUBLIC_KEY?.toString() as string | undefined
+    APPWRITE_ENDPOINT: PUBLIC_APPWRITE_ENDPOINT,
+    GROWTH_ENDPOINT: PUBLIC_GROWTH_ENDPOINT,
+    CONSOLE_MODE: PUBLIC_CONSOLE_MODE as Mode,
+    PUBLIC_STRIPE_KEY: PUBLIC_STRIPE_KEY
 };
 
 export const ENV = {
@@ -22,5 +27,5 @@ export const ENV = {
 export const MODE = VARS.CONSOLE_MODE === Mode.CLOUD ? Mode.CLOUD : Mode.SELF_HOSTED;
 export const isCloud = MODE === Mode.CLOUD;
 export const isSelfHosted = MODE !== Mode.CLOUD;
-export const hasStripePublicKey = !!VARS.STRIPE_PUBLIC_KEY;
+export const hasStripePublicKey = !!VARS.PUBLIC_STRIPE_KEY;
 export const GRACE_PERIOD_OVERRIDE = false;
diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte
@@ -247,7 +247,7 @@
         if (isCloud && hasStripePublicKey) {
             const loadStripe = (await import('@stripe/stripe-js')).loadStripe;
 
-            $stripe = await loadStripe(VARS.STRIPE_PUBLIC_KEY);
+            $stripe = await loadStripe(VARS.PUBLIC_STRIPE_KEY);
             await checkForMissingPaymentMethod();
         }
     });
diff --git a/src/routes/(console)/apply-credit/+page.ts b/src/routes/(console)/apply-credit/+page.ts
@@ -3,8 +3,9 @@ import type { Coupon } from '$lib/sdk/billing.js';
 import { campaigns } from '$lib/stores/campaigns.js';
 import { sdk } from '$lib/stores/sdk.js';
 import { redirect } from '@sveltejs/kit';
+import type { PageLoad } from './$types';
 
-export const load = async ({ url }) => {
+export const load: PageLoad = async ({ url }) => {
     // Has promo code
     if (url.searchParams.has('code')) {
         let couponData: Coupon;
diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.ts b/src/routes/(console)/organization-[organization]/change-plan/+page.ts
@@ -1,6 +1,7 @@
 import { Dependencies } from '$lib/constants';
+import type { PageLoad } from './$types';
 
-export const load = async ({ depends, parent }) => {
+export const load: PageLoad = async ({ depends, parent }) => {
     const { members } = await parent();
     depends(Dependencies.ORGANIZATION);
 
diff --git a/src/routes/(console)/project-[project]/auth/templates/+page.ts b/src/routes/(console)/project-[project]/auth/templates/+page.ts
@@ -1,6 +1,7 @@
 import { sdk } from '$lib/stores/sdk';
+import type { PageLoad } from './$types';
 
-export const load = async () => {
+export const load: PageLoad = async () => {
     const codes = await sdk.forProject.locale.listCodes();
     return {
         localeCodes: codes.localeCodes
diff --git a/src/routes/(console)/project-[project]/messaging/providers/+page.ts b/src/routes/(console)/project-[project]/messaging/providers/+page.ts
@@ -11,8 +11,9 @@ import {
 } from '$lib/helpers/load';
 import { Dependencies, PAGE_LIMIT } from '$lib/constants';
 import { queries, queryParamToMap } from '$lib/components/filters';
+import type { PageLoad } from './$types';
 
-export const load = async ({ depends, url, route }) => {
+export const load: PageLoad = async ({ depends, url, route }) => {
     depends(Dependencies.MESSAGING_PROVIDERS);
 
     const page = getPage(url);
diff --git a/src/routes/(console)/project-[project]/messaging/topics/+page.ts b/src/routes/(console)/project-[project]/messaging/topics/+page.ts
@@ -3,8 +3,9 @@ import { sdk } from '$lib/stores/sdk';
 import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpers/load';
 import { Dependencies, PAGE_LIMIT } from '$lib/constants';
 import { queryParamToMap, queries } from '$lib/components/filters';
+import type { PageLoad } from './$types';
 
-export const load = async ({ depends, url, route }) => {
+export const load: PageLoad = async ({ depends, url, route }) => {
     depends(Dependencies.MESSAGING_TOPICS);
     const page = getPage(url);
     const search = getSearch(url);
diff --git a/src/routes/(public)/(guest)/login/+page.ts b/src/routes/(public)/(guest)/login/+page.ts
@@ -2,8 +2,9 @@ import { base } from '$app/paths';
 import { campaigns } from '$lib/stores/campaigns';
 import { sdk } from '$lib/stores/sdk';
 import { redirect } from '@sveltejs/kit';
+import type { PageLoad } from './$types';
 
-export const load = async ({ url }) => {
+export const load: PageLoad = async ({ url }) => {
     if (url.searchParams.has('code')) {
         const code = url.searchParams.get('code');
         try {
diff --git a/src/routes/(public)/(guest)/register/+page.ts b/src/routes/(public)/(guest)/register/+page.ts
@@ -2,8 +2,9 @@ import { base } from '$app/paths';
 import { campaigns } from '$lib/stores/campaigns.js';
 import { sdk } from '$lib/stores/sdk';
 import { redirect } from '@sveltejs/kit';
+import type { PageLoad } from './$types';
 
-export const load = async ({ url }) => {
+export const load: PageLoad = async ({ url }) => {
     if (url.searchParams.has('code')) {
         const code = url.searchParams.get('code');
         try {

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@`
`247`	`247`	`if (isCloud && hasStripePublicKey) {`
`248`	`248`	`const loadStripe = (await import('@stripe/stripe-js')).loadStripe;`
`249`	`249`
`250`		`- $stripe = await loadStripe(VARS.STRIPE_PUBLIC_KEY);`
	`250`	`+ $stripe = await loadStripe(VARS.PUBLIC_STRIPE_KEY);`
`251`	`251`	`await checkForMissingPaymentMethod();`
`252`	`252`	`}`
`253`	`253`	`});`