fixup! chore(mapswipe-deployment): Update environment variables

Author: barshathakuri

.env

@@ -1,6 +1,6 @@
-VITE_BASE_URL='https://mapswipe.org/privacy'
+VITE_BASE_URL=
 VITE_PRIVACY_POLICY_URL='https://mapswipe.org/privacy/'
-VITE_IMPRINT_URL="https://mapswipe.org/privacy/"
+VITE_IMPRINT_URL=
 VITE_APP_LOGO='./img/mapswipe-white.svg'
 VITE_PROJECTS_FALLBACK_IMAGE="./img/map-pin-600x400.jpg"
 VITE_ALLOW_UNVERIFIED_USERS=true
@@ -24,5 +24,5 @@ VITE_THEME_LIGHT_NEUTRAL="#272727"
 # App Attribution
 VITE_APP_NAME="MapSwipe"
 VITE_APP_WEBSITE_URL="https://mapswipe.org"
-VITE_APP_ATTRIBUTION_TITLE="MapSwipe"
-VITE_APP_ATTRIBUTION_URL="https://mapswipe.org/privacy/"
+VITE_APP_ATTRIBUTION_TITLE=
+VITE_APP_ATTRIBUTION_URL=

.gitignore

@@ -4,7 +4,7 @@ logs
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-yarn-debug.log*
+pnpm-debug.log*
 lerna-debug.log*
 
 node_modules

Dockerfile

@@ -5,8 +5,7 @@ FROM node:22-bullseye AS dev
 RUN apt-get update -y \
     && apt-get install -y --no-install-recommends git \
     && rm -rf /var/lib/apt/lists/* \
-    # NOTE: yarn > 1.22.19 breaks yarn-install invoked by yarn
-    && npm install -g [email protected] [email protected] --force \
+    && npm install -g [email protected] --force \
     && git config --global --add safe.directory /code
 
 WORKDIR /code
@@ -19,16 +18,17 @@ COPY ./package.json ./yarn.lock /code/
 RUN yarn install
 COPY . /code/
 
-ENV VITE_FIREBASE_API_KEY=12
-ENV VITE_FIREBASE_AUTH_DOMAIN=1234
-ENV VITE_FIREBASE_DATABASE_URL=https://mapswipe.org
-ENV VITE_FIREBASE_PROJECT_ID=1235
-ENV VITE_FIREBASE_STORAGE_BUCKET=1245
-ENV VITE_FIREBASE_MESSAGING_SENDER_ID=124
-ENV VITE_FIREBASE_APP_ID=134
+ENV VITE_FIREBASE_API_KEY=ExampleF1rebaseAP1k3y
+ENV VITE_FIREBASE_AUTH_DOMAIN=example-key.firebaseapp.com
+ENV VITE_FIREBASE_DATABASE_URL=https://example-database.firebaseio.com
+ENV VITE_FIREBASE_PROJECT_ID=example
+ENV VITE_FIREBASE_STORAGE_BUCKET=example.appspot.com
+ENV VITE_FIREBASE_MESSAGING_SENDER_ID=123123456123
+ENV VITE_FIREBASE_APP_ID=1:23456789:web:1abc234def567
 ENV VITE_COMMUNITY_DASHBOARD_URL=https://mapswipe.org
 
 ENV VITE_FIREBASE_MEASUREMENT_ID=
+ENV VITE_MAPILLARY_API_KEY=
 ENV VITE_BASE_URL=https://mapswipe.org/privacy
 ENV VITE_PRIVACY_POLICY_URL=https://mapswipe.org/privacy/
 ENV VITE_IMPRINT_URL=https://mapswipe.org/privacy/
@@ -57,19 +57,14 @@ ENV VITE_APP_ATTRIBUTION_URL=https://mapswipe.org/privacy/
 
 RUN WEB_APP_SERVE_ENABLED=true yarn build-only --outDir=/code/build
 
-# FROM web-app-serve AS web-app-serve-example
-
-# LABEL maintainer="Togglecorp"
 FROM ghcr.io/toggle-corp/web-app-serve:v0.1.2 AS web-app-serve
 
 LABEL org.opencontainers.image.source="github.com/mapswipe/mapswipe-web"
 LABEL org.opencontainers.image.authors="[email protected]"
 
-# Env for apply-config script
 ENV APPLY_CONFIG__SOURCE_DIRECTORY=/code/build/
 
 COPY ./web-app-serve/web-app-apply-config.sh /code/
 ENV APPLY_CONFIG__APPLY_CONFIG_PATH=/code/web-app-apply-config.sh
-RUN ls /code/
 
 COPY --from=web-app-serve-build /code/build "$APPLY_CONFIG__SOURCE_DIRECTORY"

env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

env.ts

@@ -26,14 +26,15 @@ export default defineConfig({
         VITE_FIREBASE_APP_ID: Schema.string.optional(),
         VITE_FIREBASE_MEASUREMENT_ID: Schema.string.optional(),
         VITE_BASE_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
+        VITE_PRIVACY_POLICY_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
         VITE_IMPRINT_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
         VITE_APP_NAME: Schema.string.optional(),
         VITE_APP_ATTRIBUTION_TITLE: Schema.string.optional(),
         VITE_APP_ATTRIBUTION_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
         VITE_APP_WEBSITE_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
-        VITE_APP_LOG: Schema.string.optional(),
+        VITE_APP_LOGO: Schema.string.optional(),
         VITE_PROJECTS_FALLBACK_IMAGE: Schema.string.optional(),
-        VITE_ALLOW_UNVERIFIED_USERS: Schema.string.optional(),
+        VITE_ALLOW_UNVERIFIED_USERS: Schema.boolean(),
 
         VITE_DEFAULT_LOCALE: Schema.string.optional(),
         VITE_FALLBACK_LOCALE: Schema.string.optional(),

package.json

@@ -19,7 +19,6 @@
     "@intlify/unplugin-vue-i18n": "^6.0.8",
     "@togglecorp/fujs": "^2.2.0",
     "@turf/bbox": "^7.2.0",
-    "@julr/vite-plugin-validate-env": "git+https://github.com/toggle-corp/vite-plugin-validate-env#v2.2.0-tc.1",
     "base-64": "^1.0.0",
     "firebase": "^11.8.1",
     "mapillary-js": "^4.1.2",
@@ -64,6 +63,5 @@
     "vite": "^6.3.5",
     "vitest": "^3.1.4",
     "vue-tsc": "^2.2.10"
-  },
-  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  }
 }

web-app-serve/.gitignore

@@ -11,5 +11,4 @@ build/
 generated/
 coverage/
 stats.html
-.env
-.env
+.env

web-app-serve/web-app-apply-config.sh

@@ -3,6 +3,7 @@
 set -xe
 
 while IFS='=' read -r KEY VALUE; do
-    # FIXME: If js and value is empty string, replace it with undefined?
-    find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<WEB_APP_SERVE_PLACEHOLDER__$KEY\>|$VALUE|g" {} +
+    REPLACEMENT="${VALUE:-undefined}"
+    find "$DESTINATION_DIRECTORY" -type f \
+        -exec sed -i "s|\<WEB_APP_SERVE_PLACEHOLDER__$KEY\>|$REPLACEMENT|g" {} +
 done < <(env | grep '^VITE_')