From e3692a425d94a9854f29be9c0209233aff7c7ab3 Mon Sep 17 00:00:00 2001
From: Riley <rileyg98@users.noreply.github.com>
Date: Thu, 6 Mar 2025 23:43:51 +1000
Subject: [PATCH] Add cloudflare adapter detection and path generation (#15603)

Before submitting a pull request, please take a look at our

[Contributing](https://github.com/getsentry/sentry-javascript/blob/master/CONTRIBUTING.md)
guidelines and verify:

- [x] If you've added code that should be tested, please add tests.
- [x] Ensure your code lints and the test suite passes (`yarn lint`) &
(`yarn test`).

This PR expands upon #14672 by adding detection of the
@sveltejs/adapter-cloudflare adapter and defining it's output directory
(cloudflare as opposed to output). I've tested it with a Cloudflare
Pages project and it was successful in building and uploading
sourcemaps, whereas relying on 'other' caused an infinite loop and an
OOM when trying to upload sourcemaps.
---
 packages/sveltekit/src/vite/detectAdapter.ts       | 4 +++-
 packages/sveltekit/src/vite/svelteConfig.ts        | 4 ++++
 packages/sveltekit/test/vite/detectAdapter.test.ts | 6 +++++-
 packages/sveltekit/test/vite/svelteConfig.test.ts  | 5 +++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/sveltekit/src/vite/detectAdapter.ts b/packages/sveltekit/src/vite/detectAdapter.ts
index e979eb0c43e4..85b794575c93 100644
--- a/packages/sveltekit/src/vite/detectAdapter.ts
+++ b/packages/sveltekit/src/vite/detectAdapter.ts
@@ -5,7 +5,7 @@ import type { Package } from '@sentry/core';
 /**
  * Supported @sveltejs/adapters-[adapter] SvelteKit adapters
  */
-export type SupportedSvelteKitAdapters = 'node' | 'auto' | 'vercel' | 'other';
+export type SupportedSvelteKitAdapters = 'node' | 'auto' | 'vercel' | 'cloudflare' | 'other';
 
 /**
  * Tries to detect the used adapter for SvelteKit by looking at the dependencies.
@@ -21,6 +21,8 @@ export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKit
     adapter = 'vercel';
   } else if (allDependencies['@sveltejs/adapter-node']) {
     adapter = 'node';
+  } else if (allDependencies['@sveltejs/adapter-cloudflare']) {
+    adapter = 'cloudflare';
   } else if (allDependencies['@sveltejs/adapter-auto']) {
     adapter = 'auto';
   }
diff --git a/packages/sveltekit/src/vite/svelteConfig.ts b/packages/sveltekit/src/vite/svelteConfig.ts
index 02edad15382e..274da0e5215d 100644
--- a/packages/sveltekit/src/vite/svelteConfig.ts
+++ b/packages/sveltekit/src/vite/svelteConfig.ts
@@ -52,6 +52,10 @@ export async function getAdapterOutputDir(svelteConfig: Config, adapter: Support
   if (adapter === 'node') {
     return getNodeAdapterOutputDir(svelteConfig);
   }
+  if (adapter === 'cloudflare') {
+    // Cloudflare outputs to outDir\cloudflare as the output dir
+    return path.join(svelteConfig.kit?.outDir || '.svelte-kit', 'cloudflare');
+  }
 
   // Auto and Vercel adapters simply use config.kit.outDir
   // Let's also use this directory for the 'other' case
diff --git a/packages/sveltekit/test/vite/detectAdapter.test.ts b/packages/sveltekit/test/vite/detectAdapter.test.ts
index a934a9ee06e6..52364e3012e4 100644
--- a/packages/sveltekit/test/vite/detectAdapter.test.ts
+++ b/packages/sveltekit/test/vite/detectAdapter.test.ts
@@ -27,7 +27,7 @@ describe('detectAdapter', () => {
   const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
   const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 
-  it.each(['auto', 'vercel', 'node'])(
+  it.each(['auto', 'vercel', 'node', 'cloudflare'])(
     'returns the adapter name (adapter %s) and logs it to the console',
     async adapter => {
       pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
@@ -68,6 +68,7 @@ describe('detectAdapter', () => {
     pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
     pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
     pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
+    pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';
 
     const detectedAdapter = await detectAdapter();
     expect(detectedAdapter).toEqual('vercel');
@@ -75,5 +76,8 @@ describe('detectAdapter', () => {
     delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
     const detectedAdapter2 = await detectAdapter();
     expect(detectedAdapter2).toEqual('node');
+    delete pkgJson.dependencies['@sveltejs/adapter-node'];
+    const detectedAdapter3 = await detectAdapter();
+    expect(detectedAdapter3).toEqual('cloudflare');
   });
 });
diff --git a/packages/sveltekit/test/vite/svelteConfig.test.ts b/packages/sveltekit/test/vite/svelteConfig.test.ts
index 35e32ce8ac4d..a567407b6623 100644
--- a/packages/sveltekit/test/vite/svelteConfig.test.ts
+++ b/packages/sveltekit/test/vite/svelteConfig.test.ts
@@ -68,6 +68,11 @@ describe('getAdapterOutputDir', () => {
     expect(outputDir).toEqual('customBuildDir');
   });
 
+  it('returns the output directory of the Cloudflare adapter', async () => {
+    const outputDir = await getAdapterOutputDir({ kit: { outDir: 'customOutDir' } }, 'cloudflare');
+    expect(outputDir).toEqual('customOutDir/cloudflare');
+  });
+
   it.each(['vercel', 'auto', 'other'] as SupportedSvelteKitAdapters[])(
     'returns the config.kit.outdir directory for adapter-%s',
     async adapter => {