chore: generate multiple builds for sh-admin

Enables seamless transition to/from subpath based access

.env.example

@@ -61,4 +61,4 @@ VITE_APP_TOS_LINK=https://docs.hoppscotch.io/support/terms
 VITE_APP_PRIVACY_POLICY_LINK=https://docs.hoppscotch.io/support/privacy
 
 # Set to `true` for subpath based access
-VITE_INCLUDE_ADMIN_PREFIX=false
+ENABLE_SUBPATH_BASED_ACCESS=false

aio.Caddyfile

@@ -1,40 +1,47 @@
-# TODO: Uncomment the below lines and update the subpath-based implementation to use standard HTTP/HTTPS ports
+# TODO: Update the subpath-based implementation to use standard HTTP(S) ports
-
-# :3000 {
-#   try_files {path} /
-#   root * /site/selfhost-web
-#   file_server
-# }
-
-# :3100 {
-#   try_files {path} /
-#   root * /site/sh-admin
-#   file_server
-# }
 
 :3000 {
-    # Serve the `selfhost-web` SPA by default
+	try_files {path} /
-    root * /site/selfhost-web
+	root * /site/selfhost-web
-    file_server
+	file_server
-
+}
-    # Handle requests under `/admin*`
+
-    handle_path /admin* {
+:3100 {
-        root * /site/sh-admin
+	try_files {path} /
-        file_server
+	root * /site/sh-admin
-
+	file_server
-        # Ensures any non-existent file in the server is routed to the SPA
+}
-        try_files {path} /
+
-    }
+:8080 {
-
+	# Serve the `selfhost-web` SPA by default
-    # Handle requests under `/backend*` path
+	root * /site/selfhost-web
-    handle_path /backend* {
+	file_server
-        reverse_proxy localhost:3170
+
-    }
+	handle_path /admin* {
-
+		# Check the ENABLE_SUBPATH_BASED_ACCESS environment variable
-    # Catch-all route for unknown paths, serves `selfhost-web` SPA
+		@enabledSubpathBasedAccess {
-    handle {
+			expression {env.ENABLE_SUBPATH_BASED_ACCESS} == "true"
-        root * /site/selfhost-web
+		}
-        file_server
+
-        try_files {path} /
+		# Conditionally serve /site/sh-admin-subpath-access if ENABLE_SUBPATH_BASED_ACCESS is true
-    }
+		handle @enabledSubpathBasedAccess {
+			root * /site/sh-admin-subpath-access
+			file_server
+
+			# Ensures any non-existent file in the server is routed to the SPA
+			try_files {path} /
+		}
+	}
+
+	# Handle requests under `/backend*` path
+	handle_path /backend* {
+		reverse_proxy localhost:3170
+	}
+
+	# Catch-all route for unknown paths, serves `selfhost-web` SPA
+	handle {
+		root * /site/selfhost-web
+		file_server
+		try_files {path} /
+	}
 }

docker-compose.yml

@@ -76,6 +76,7 @@ services:
       - "3000:3000"
       - "3100:3100"
       - "3170:3170"
+      - "3500:8080"
 
   # The preset DB service, you can delete/comment the below lines if
   # you are using an external postgres instance

prod.Dockerfile

@@ -41,7 +41,9 @@ CMD ["/bin/sh", "-c", "node /usr/prod_run.mjs && caddy run --config /etc/caddy/C
 
 FROM base_builder as sh_admin_builder
 WORKDIR /usr/src/app/packages/hoppscotch-sh-admin
+# Generate two builds for `sh-admin`, one based on subpath-access and the regular build
 RUN pnpm run build
+RUN pnpm run build --outDir dist-subpath-access --base /admin/
 
 FROM caddy:2-alpine as sh_admin
 WORKDIR /site
@@ -58,6 +60,7 @@ RUN apk add caddy tini
 RUN npm install -g @import-meta-env/cli
 COPY --from=fe_builder /usr/src/app/packages/hoppscotch-selfhost-web/dist /site/selfhost-web
 COPY --from=sh_admin_builder /usr/src/app/packages/hoppscotch-sh-admin/dist /site/sh-admin
+COPY --from=sh_admin_builder /usr/src/app/packages/hoppscotch-sh-admin/dist-subpath-access /site/sh-admin-subpath-access
 COPY aio.Caddyfile /etc/caddy/Caddyfile
 ENTRYPOINT [ "tini", "--" ]
 RUN apk --no-cache add curl
@@ -67,3 +70,4 @@ CMD ["node", "/usr/src/app/aio_run.mjs"]
 EXPOSE 3170
 EXPOSE 3000
 EXPOSE 3100
+EXPOSE 3500