fix: copy _headers and _redirects from project root instead of /static (#13227)

* docs

* fix

* fix again

* add service worker link

* grammar

* try to fix docs deployment

* copy files from project root instead of /static

* Update .changeset/few-apricots-study.md

* add error message to netlify adapter

Author: eltigerchino

.changeset/afraid-rules-fold.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-netlify': major
+---
+
+fix: error if the `_headers` and `_redirects` files are in the `/static` directory instead of the project root

.changeset/few-apricots-study.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-cloudflare': major
+---
+
+fix: copy the `_headers` and `_redirects` files from the project root instead of the `/static` directory

documentation/docs/25-build-and-deploy/60-adapter-cloudflare.md

@@ -111,7 +111,7 @@ For testing the build, you should use [Wrangler](https://developers.cloudflare.c
 
 Functions contained in the [`/functions` directory](https://developers.cloudflare.com/pages/functions/routing/) at the project's root will _not_ be included in the deployment. Instead, functions should be implemented as [server endpoints](routing#server) in your SvelteKit app, which is compiled to a [single `_worker.js` file](https://developers.cloudflare.com/pages/functions/advanced-mode/).
 
-The [`_headers`](https://developers.cloudflare.com/pages/configuration/headers/) and [`_redirects`](https://developers.cloudflare.com/pages/configuration/redirects/) files specific to Cloudflare Pages can be used for static asset responses (like images) by putting them into the `/static` folder.
+The [`_headers`](https://developers.cloudflare.com/pages/configuration/headers/) and [`_redirects`](https://developers.cloudflare.com/pages/configuration/redirects/) files specific to Cloudflare Pages can be used for static asset responses (like images) by putting them into the project root folder.
 
 However, they will have no effect on responses dynamically rendered by SvelteKit, which should return custom headers or redirect responses from [server endpoints](routing#server) or with the [`handle`](hooks#Server-hooks-handle) hook.
 

documentation/docs/25-build-and-deploy/80-adapter-netlify.md

@@ -70,6 +70,10 @@ export default {
 
 You may build your app using functionality provided directly by SvelteKit without relying on any Netlify functionality. Using the SvelteKit versions of these features will allow them to be used in dev mode, tested with integration tests, and to work with other adapters should you ever decide to switch away from Netlify. However, in some scenarios you may find it beneficial to use the Netlify versions of these features. One example would be if you're migrating an app that's already hosted on Netlify to SvelteKit.
 
+### `_headers` and `_redirects`
+
+The [`_headers`](https://docs.netlify.com/routing/headers/#syntax-for-the-headers-file) and [`_redirects`](https://docs.netlify.com/routing/redirects/redirect-options/) files specific to Netlify can be used for static asset responses (like images) by putting them into the project root folder.
+
 ### Redirect rules
 
 During compilation, redirect rules are automatically appended to your `_redirects` file. (If it doesn't exist yet, it will be created.) That means:

packages/adapter-cloudflare/index.js

@@ -1,4 +1,4 @@
-import { existsSync, writeFileSync } from 'node:fs';
+import { copyFileSync, existsSync, writeFileSync } from 'node:fs';
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { getPlatformProxy } from 'wrangler';
@@ -14,6 +14,18 @@ export default function (options = {}) {
 				);
 			}
 
+			if (existsSync(`${builder.config.kit.files.assets}/_headers`)) {
+				throw new Error(
+					`The _headers file should be placed in the project root rather than the ${builder.config.kit.files.assets} directory`
+				);
+			}
+
+			if (existsSync(`${builder.config.kit.files.assets}/_redirects`)) {
+				throw new Error(
+					`The _redirects file should be placed in the project root rather than the ${builder.config.kit.files.assets} directory`
+				);
+			}
+
 			const files = fileURLToPath(new URL('./files', import.meta.url).href);
 			const dest = builder.getBuildDirectory('cloudflare');
 			const worker_dest = `${dest}/_worker.js`;
@@ -48,8 +60,16 @@ export default function (options = {}) {
 				JSON.stringify(get_routes_json(builder, written_files, options.routes ?? {}), null, '\t')
 			);
 
+			if (existsSync('_headers')) {
+				copyFileSync('_headers', `${dest}/_headers`);
+			}
+
 			writeFileSync(`${dest}/_headers`, generate_headers(builder.getAppPath()), { flag: 'a' });
 
+			if (existsSync('_redirects')) {
+				copyFileSync('_redirects', `${dest}/_redirects`);
+			}
+
 			if (builder.prerendered.redirects.size > 0) {
 				writeFileSync(`${dest}/_redirects`, generate_redirects(builder.prerendered.redirects), {
 					flag: 'a'

packages/adapter-netlify/index.js

@@ -55,6 +55,18 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 				);
 			}
 
+			if (existsSync(`${builder.config.kit.files.assets}/_headers`)) {
+				throw new Error(
+					`The _headers file should be placed in the project root rather than the ${builder.config.kit.files.assets} directory`
+				);
+			}
+
+			if (existsSync(`${builder.config.kit.files.assets}/_redirects`)) {
+				throw new Error(
+					`The _redirects file should be placed in the project root rather than the ${builder.config.kit.files.assets} directory`
+				);
+			}
+
 			const netlify_config = get_netlify_config();
 
 			// "build" is the default publish directory when Netlify detects SvelteKit
@@ -298,12 +310,12 @@ function generate_lambda_functions({ builder, publish, split }) {
 	// so that generated redirects are appended to custom redirects
 	// rather than replaced by them
 	builder.log.minor('Writing redirects...');
-	const redirect_file = join(publish, '_redirects');
+	const redirects_file = join(publish, '_redirects');
 	if (existsSync('_redirects')) {
-		builder.copy('_redirects', redirect_file);
+		builder.copy('_redirects', redirects_file);
 	}
-	builder.mkdirp(dirname(redirect_file));
-	appendFileSync(redirect_file, `\n\n${redirects.join('\n')}`);
+	builder.mkdirp(dirname(redirects_file));
+	appendFileSync(redirects_file, `\n\n${redirects.join('\n')}`);
 }
 
 function get_netlify_config() {