fix: resolve assets.directory path from wrangler config (#14036)

* fix(adapter-cloudflare): resolve paths from wrangler config

* Create new-donkeys-approve.md

* my bad

Co-authored-by: Ben McCann <[email protected]>

* cleanup

---------

Co-authored-by: Ben McCann <[email protected]>
Co-authored-by: Chew Tee Ming <[email protected]>

Author: 3 people

.changeset/new-donkeys-approve.md

@@ -0,0 +1,5 @@
+---
+"@sveltejs/adapter-cloudflare": patch
+---
+
+fix: resolve the absolute path of the Wrangler config setting `assets.directory` in case the config file is in a different directory than the root project

packages/adapter-cloudflare/index.js

@@ -1,9 +1,10 @@
 import { VERSION } from '@sveltejs/kit';
 import { copyFileSync, existsSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
+import process from 'node:process';
 import { fileURLToPath } from 'node:url';
-import { is_building_for_cloudflare_pages, validate_worker_settings } from './utils.js';
 import { getPlatformProxy, unstable_readConfig } from 'wrangler';
+import { is_building_for_cloudflare_pages, validate_worker_settings } from './utils.js';
 
 const name = '@sveltejs/adapter-cloudflare';
 const [kit_major, kit_minor] = VERSION.split('.');
@@ -32,6 +33,7 @@ export default function (options = {}) {
 			}
 
 			const wrangler_config = validate_wrangler_config(options.config);
+
 			const building_for_cloudflare_pages = is_building_for_cloudflare_pages(wrangler_config);
 
 			let dest = builder.getBuildDirectory('cloudflare');
@@ -48,7 +50,12 @@ export default function (options = {}) {
 					worker_dest = wrangler_config.main;
 				}
 				if (wrangler_config.assets?.directory) {
-					dest = wrangler_config.assets.directory;
+					// wrangler doesn't resolve `assets.directory` to an absolute path unlike
+					// `main` and `pages_build_output_dir` so we need to do it ourselves here
+					const parent_dir = wrangler_config.configPath
+						? path.dirname(path.resolve(wrangler_config.configPath))
+						: process.cwd();
+					dest = path.resolve(parent_dir, wrangler_config.assets.directory);
 				}
 				if (wrangler_config.assets?.binding) {
 					assets_binding = wrangler_config.assets.binding;

packages/adapter-cloudflare/test/apps/workers/config/wrangler.jsonc

@@ -0,0 +1,10 @@
+// we've moved the wrangler config away from the root of the project
+// to test that the adapter still resolves the paths correctly
+{
+	"$schema": "../node_modules/wrangler/config-schema.json",
+	"main": "../dist/index.js",
+	"assets": {
+		"directory": "../dist/public",
+		"binding": "ASSETS"
+	}
+}

packages/adapter-cloudflare/test/apps/workers/svelte.config.js

@@ -3,7 +3,9 @@ import adapter from '../../../index.js';
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
 	kit: {
-		adapter: adapter()
+		adapter: adapter({
+			config: 'config/wrangler.jsonc'
+		})
 	}
 };