fix: enable workers.dev route (#135)

Author: ephraimduncan

apps/web/.env.development.example

@@ -4,7 +4,6 @@
 # Drizzle / libSQL (local sqlite)
 DATABASE_URL=file:./local.db
 TURSO_AUTH_TOKEN=
-NEXT_PUBLIC_APP_URL=http://localhost:3000
 BETTER_AUTH_SECRET=dev-secret-please-change-dev-secret-32ch
 
 # OAuth (optional)

apps/web/.env.production.example

@@ -4,7 +4,6 @@
 # Drizzle / libSQL (Turso)
 DATABASE_URL=libsql://<db-name>-<org>.turso.io
 TURSO_AUTH_TOKEN=
-NEXT_PUBLIC_APP_URL=https://<your-domain>
 BETTER_AUTH_SECRET=
 
 # OAuth (optional)

apps/web/next.config.js

@@ -2,21 +2,6 @@ import { initOpenNextCloudflareForDev } from '@opennextjs/cloudflare';
 
 initOpenNextCloudflareForDev();
 
-const appUrl = process.env.NEXT_PUBLIC_APP_URL
-  ? new URL(process.env.NEXT_PUBLIC_APP_URL)
-  : null;
-
-const appImageRemotePatterns = appUrl
-  ? [
-      {
-        protocol: appUrl.protocol.replace(':', ''),
-        hostname: appUrl.hostname,
-        port: appUrl.port,
-        pathname: '/api/files/**',
-      },
-    ]
-  : [];
-
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
@@ -30,7 +15,6 @@ const nextConfig = {
         protocol: 'http',
         hostname: 'localhost',
       },
-      ...appImageRemotePatterns,
     ],
   },
   transpilePackages: [

apps/web/package.json

@@ -4,13 +4,13 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "next build",
-    "build:worker": "opennextjs-cloudflare build",
+    "build": "SKIP_ENV_VALIDATION=true next build",
+    "build:worker": "SKIP_ENV_VALIDATION=true opennextjs-cloudflare build",
     "cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts",
-    "deploy": "opennextjs-cloudflare build && opennextjs-cloudflare deploy",
+    "deploy": "SKIP_ENV_VALIDATION=true opennextjs-cloudflare build && opennextjs-cloudflare deploy",
     "dev": "next dev -p 3000",
     "lint": "eslint . --cache --max-warnings 0",
-    "preview": "opennextjs-cloudflare build && opennextjs-cloudflare preview",
+    "preview": "SKIP_ENV_VALIDATION=true opennextjs-cloudflare build && opennextjs-cloudflare preview",
     "start": "next start",
     "typecheck": "tsc --noEmit --tsBuildInfoFile .tsbuildinfo"
   },

apps/web/src/app/(landing)/layout.tsx

@@ -10,9 +10,9 @@ async function LandingPageLayout({ children }: { children: ReactNode }) {
   const databaseUrl = process.env['DATABASE_URL'];
   const hasSessionRuntimeEnv =
     !!databaseUrl &&
-    (!databaseUrl.startsWith('libsql://') || !!process.env['TURSO_AUTH_TOKEN']) &&
+    (!databaseUrl.startsWith('libsql://') ||
+      !!process.env['TURSO_AUTH_TOKEN']) &&
     !!process.env['BETTER_AUTH_SECRET'] &&
-    !!process.env['NEXT_PUBLIC_APP_URL'] &&
     !!process.env['ALLOW_SIGNIN_SIGNUP'];
   let isLoggedIn = false;
 

apps/web/src/app/(main)/dashboard/page.tsx

@@ -1,16 +1,13 @@
 import * as React from 'react';
 import { type Metadata } from 'next';
 
-import { env } from '@formbase/env';
-
 import { api } from '~/lib/trpc/server';
 
 import { Forms } from './_components/forms';
 import { CreateFormDialog } from './_components/new-form-dialog';
 import { FormsSkeleton } from './_components/posts-skeleton';
 
 export const metadata: Metadata = {
-  metadataBase: new URL(env.NEXT_PUBLIC_APP_URL),
   title: 'Forms',
   description: 'Manage your form endpoints',
 };

apps/web/src/app/(main)/dashboard/settings/api-keys/page.tsx

@@ -3,13 +3,11 @@ import { redirect } from 'next/navigation';
 import type { Metadata } from 'next';
 
 import { getSession } from '@formbase/auth/server';
-import { env } from '@formbase/env';
 import { Separator } from '@formbase/ui/primitives/separator';
 
 import { ApiKeysSection } from './api-keys-section';
 
 export const metadata: Metadata = {
-  metadataBase: new URL(env.NEXT_PUBLIC_APP_URL),
   title: 'API Keys | Formbase',
   description: 'Manage your API keys for programmatic access',
 };

apps/web/src/app/(main)/dashboard/settings/page.tsx

@@ -3,13 +3,11 @@ import { redirect } from 'next/navigation';
 import type { Metadata } from 'next';
 
 import { getSession } from '@formbase/auth/server';
-import { env } from '@formbase/env';
 import { Separator } from '@formbase/ui/primitives/separator';
 
 import { ProfileForm } from './profile-form';
 
 export const metadata: Metadata = {
-  metadataBase: new URL(env.NEXT_PUBLIC_APP_URL),
   title: 'Settings | Formbase',
   description: 'Manage your account settings',
 };

apps/web/src/app/api/s/[id]/route.ts

@@ -1,7 +1,6 @@
 import { userAgent } from 'next/server';
 
 import { type RouterOutputs } from '@formbase/api';
-import { env } from '@formbase/env';
 
 import { sendMail } from '~/lib/email/mailer';
 import { renderNewSubmissionEmail } from '~/lib/email/templates/new-submission';
@@ -64,14 +63,15 @@ async function getFormData(request: Request): Promise<FormDataResult> {
 async function processFileUploads(
   formData: Record<string, Blob | string | undefined>,
   formDataFromRequest: FormData,
+  requestOrigin: string,
 ) {
   const fileKeys = Object.keys(formData).filter(
     (key) => formData[key] instanceof Blob,
   );
 
   for (const key of fileKeys) {
     const file = formDataFromRequest.get(key) as File;
-    const fileUrl = await uploadFileFromBlob({ file });
+    const fileUrl = await uploadFileFromBlob({ file, origin: requestOrigin });
     assignFileOrImage({ formData, key, fileUrl });
   }
 }
@@ -103,6 +103,7 @@ export async function POST(
     const { id } = await params;
 
     const formId = id;
+    const requestOrigin = new URL(request.url).origin;
     const form = await api.form.getFormById({ formId });
     if (!form) {
       return new Response('Form not found', {
@@ -117,7 +118,11 @@ export async function POST(
     const { data: formData } = formDataResult;
 
     if (formDataResult.source === 'formData') {
-      await processFileUploads(formData, formDataResult.rawFormData);
+      await processFileUploads(
+        formData,
+        formDataResult.rawFormData,
+        requestOrigin,
+      );
     }
 
     const honeypotField = form.honeypotField;
@@ -158,7 +163,7 @@ export async function POST(
     return new Response(null, {
       status: 303,
       headers: {
-        Location: `${env.NEXT_PUBLIC_APP_URL}/s/${formId}`,
+        Location: new URL(`/s/${formId}`, requestOrigin).toString(),
         ...CORS_HEADERS,
       },
     });

apps/web/src/app/api/v1/openapi.json/route.ts

@@ -1,15 +1,14 @@
 import { generateOpenApiDocument } from 'trpc-to-openapi';
 
 import { apiV1Router } from '@formbase/api/routers/api-v1';
-import { env } from '@formbase/env';
 
 export const dynamic = 'force-dynamic';
 
-export function GET() {
+export function GET(request: Request) {
   const openApiDocument = generateOpenApiDocument(apiV1Router, {
     title: 'Formbase API',
     version: '1.0.0',
-    baseUrl: `${env.NEXT_PUBLIC_APP_URL}/api/v1`,
+    baseUrl: `${new URL(request.url).origin}/api/v1`,
     description: 'Public REST API for managing forms and submissions.',
     securitySchemes: {
       bearerAuth: {