[breaking] remove writeStatic to align with Vite

Author: benmccann

.changeset/smooth-cars-reflect.md

@@ -0,0 +1,11 @@
+---
+'@sveltejs/adapter-cloudflare': patch
+'@sveltejs/adapter-cloudflare-workers': patch
+'@sveltejs/adapter-netlify': patch
+'@sveltejs/adapter-node': patch
+'@sveltejs/adapter-static': patch
+'@sveltejs/adapter-vercel': patch
+'@sveltejs/kit': patch
+---
+
+[breaking] remove writeStatic to align with Vite

packages/adapter-cloudflare-workers/index.js

@@ -74,7 +74,6 @@ export default function () {
 
 			builder.log.minor('Copying assets...');
 			builder.writeClient(site.bucket);
-			builder.writeStatic(site.bucket);
 			builder.writePrerendered(site.bucket);
 		}
 	};

packages/adapter-cloudflare/index.js

@@ -23,7 +23,6 @@ export default function () {
 			builder.rimraf(tmp);
 			builder.mkdirp(tmp);
 
-			builder.writeStatic(dest);
 			builder.writeClient(dest);
 			builder.writePrerendered(dest);
 

packages/adapter-netlify/index.js

@@ -55,7 +55,6 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 			builder.log.minor(`Publishing to "${publish}"`);
 
 			builder.log.minor('Copying assets...');
-			builder.writeStatic(publish);
 			builder.writeClient(publish);
 			builder.writePrerendered(publish);
 
@@ -232,7 +231,7 @@ async function generate_lambda_functions({ builder, publish, split, esm }) {
 		redirects.push('* /.netlify/functions/render 200');
 	}
 
-	// this should happen at the end, after builder.writeStatic(...),
+	// this should happen at the end, after builder.writeClient(...),
 	// so that generated redirects are appended to custom redirects
 	// rather than replaced by them
 	builder.log.minor('Writing redirects...');

packages/adapter-node/index.js

@@ -30,7 +30,6 @@ export default function (opts = {}) {
 			builder.log.minor('Copying assets');
 			builder.writeClient(`${out}/client`);
 			builder.writeServer(`${out}/server`);
-			builder.writeStatic(`${out}/static`);
 			builder.writePrerendered(`${out}/prerendered`);
 
 			writeFileSync(

packages/adapter-static/index.js

@@ -43,7 +43,6 @@ export default function (options) {
 			builder.rimraf(assets);
 			builder.rimraf(pages);
 
-			builder.writeStatic(assets);
 			builder.writeClient(assets);
 			builder.writePrerendered(pages, { fallback });
 

packages/adapter-vercel/index.js

@@ -236,7 +236,6 @@ export default function ({ external = [], edge, split } = {}) {
 
 			builder.log.minor('Copying assets...');
 
-			builder.writeStatic(dirs.static);
 			builder.writeClient(dirs.static);
 			builder.writePrerendered(dirs.static);
 

packages/kit/src/core/adapt/builder.js

@@ -122,7 +122,10 @@ export function create_builder({ config, build_data, prerendered, log }) {
 		},
 
 		writeClient(dest) {
-			return copy(`${config.kit.outDir}/output/client`, dest);
+			return [
+				...copy(`${config.kit.outDir}/output/client`, dest),
+				...copy(config.kit.files.assets, dest)
+			];
 		},
 
 		writePrerendered(dest, { fallback } = {}) {
@@ -141,8 +144,13 @@ export function create_builder({ config, build_data, prerendered, log }) {
 			return copy(`${config.kit.outDir}/output/server`, dest);
 		},
 
+		// TODO remove these methods for 1.0
 		writeStatic(dest) {
-			return copy(config.kit.files.assets, dest);
+			throw new Error(
+				`writeStatic has been removed. Please ensure you are using the latest version of ${
+					config.kit.adapter.name || 'your adapter'
+				}`
+			);
 		},
 
 		// @ts-expect-error

packages/kit/src/core/adapt/builder.spec.js

@@ -39,22 +39,17 @@ test('copy files', () => {
 
 	const dest = join(__dirname, 'output');
 
-	rmSync(dest, { recursive: true, force: true });
-	builder.writeStatic(dest);
-
-	assert.equal(
-		glob('**', {
-			cwd: /** @type {import('types').ValidatedConfig} */ (mocked).kit.files.assets,
-			dot: true
-		}),
-		glob('**', { cwd: dest, dot: true })
-	);
-
 	rmSync(dest, { recursive: true, force: true });
 	builder.writeClient(dest);
 
 	assert.equal(
-		glob('**', { cwd: `${outDir}/output/client`, dot: true }),
+		[
+			...glob('**', {
+				cwd: /** @type {import('types').ValidatedConfig} */ (mocked).kit.files.assets,
+				dot: true
+			}),
+			...glob('**', { cwd: `${outDir}/output/client`, dot: true })
+		],
 		glob('**', { cwd: dest, dot: true })
 	);
 

packages/kit/types/index.d.ts

@@ -65,11 +65,6 @@ export interface Builder {
 	 * @returns an array of paths corresponding to the files that have been created by the copy
 	 */
 	writeServer(dest: string): string[];
-	/**
-	 * @param dest the destination folder to which files should be copied
-	 * @returns an array of paths corresponding to the files that have been created by the copy
-	 */
-	writeStatic(dest: string): string[];
 	/**
 	 * @param from the source file or folder
 	 * @param to the destination file or folder