Merge pull request #352 from TaloDev/protected-env-sub

Use protected flag to prevent non-env-vars from being overwritten

Author: tudddorrr

.env.production

@@ -1,4 +1,4 @@
-VITE_API_URL=$API_URL
+VITE_API_URL=${API_URL}
 
-VITE_SENTRY_DSN=$SENTRY_DSN
+VITE_SENTRY_DSN=${SENTRY_DSN}
 VITE_SENTRY_ENV=prod

config/entrypoint.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 for filename in /srv/assets/*.js; do
-  envsub --syntax dollar-basic $filename $filename
+  envsub --protect $filename $filename
 done
 
 caddy run --config /etc/caddy/Caddyfile

src/index.tsx

@@ -10,10 +10,12 @@ import { BrowserRouter } from 'react-router-dom'
 import * as Sentry from '@sentry/react'
 import ToastProvider from './components/toast/ToastProvider'
 
-Sentry.init({
-  dsn: import.meta.env.VITE_SENTRY_DSN,
-  environment: import.meta.env.VITE_SENTRY_ENV
-})
+if (import.meta.env.VITE_SENTRY_DSN?.startsWith('http')) {
+  Sentry.init({
+    dsn: import.meta.env.VITE_SENTRY_DSN,
+    environment: import.meta.env.VITE_SENTRY_ENV
+  })
+}
 
 const root = createRoot(document.getElementById('root')!)
 root.render(

src/utils/canPerformAction.ts

@@ -1,5 +1,4 @@
-import { User } from '@sentry/react'
-import { UserType } from '../entities/user'
+import { User, UserType } from '../entities/user'
 
 export enum PermissionBasedAction {
   DELETE_LEADERBOARD,

src/utils/canViewPage.ts

@@ -1,6 +1,5 @@
-import { User } from '@sentry/react'
 import routes from '../constants/routes'
-import { UserType } from '../entities/user'
+import { User, UserType } from '../entities/user'
 
 export default function canViewPage(user: User | null, route: string) {
   if (!user) return false