From 924c62c7b2163e41e9bf3ff10b3e10211e54f82c Mon Sep 17 00:00:00 2001
From: Merilynn Bandy <31383109+furudean@users.noreply.github.com>
Date: Sat, 21 May 2022 11:43:39 -0600
Subject: [PATCH 1/4] remove handling of floc

---
 documentation/docs/14-configuration.md          | 13 -------------
 packages/kit/src/core/build/build_server.js     |  1 -
 packages/kit/src/core/config/index.spec.js      |  1 -
 packages/kit/src/core/config/options.js         |  2 --
 packages/kit/src/core/dev/plugin.js             |  1 -
 packages/kit/src/runtime/server/page/render.js  |  4 ----
 packages/kit/test/apps/basics/test/test.js      |  6 ------
 packages/kit/test/apps/options/svelte.config.js |  1 -
 packages/kit/test/apps/options/test/test.js     |  8 --------
 packages/kit/types/index.d.ts                   |  1 -
 packages/kit/types/internal.d.ts                |  1 -
 11 files changed, 39 deletions(-)

diff --git a/documentation/docs/14-configuration.md b/documentation/docs/14-configuration.md
index ac2053fcb6fc..4835378a02e7 100644
--- a/documentation/docs/14-configuration.md
+++ b/documentation/docs/14-configuration.md
@@ -38,7 +38,6 @@ const config = {
 			serviceWorker: 'src/service-worker',
 			template: 'src/app.html'
 		},
-		floc: false,
 		inlineStyleThreshold: 0,
 		methodOverride: {
 			parameter: '_method',
@@ -149,18 +148,6 @@ An object containing zero or more of the following `string` values:
 - `serviceWorker` — the location of your service worker's entry point (see [Service workers](/docs/service-workers))
 - `template` — the location of the template for HTML responses
 
-### floc
-
-Google's [FLoC](https://github.com/WICG/floc) is a technology for targeted advertising that the [Electronic Frontier Foundation](https://www.eff.org/) has deemed [harmful](https://www.eff.org/deeplinks/2021/03/googles-floc-terrible-idea) to user privacy. [Browsers other than Chrome](https://www.theverge.com/2021/4/16/22387492/google-floc-ad-tech-privacy-browsers-brave-vivaldi-edge-mozilla-chrome-safari) have declined to implement it.
-
-In common with services like [GitHub Pages](https://github.blog/changelog/2021-04-27-github-pages-permissions-policy-interest-cohort-header-added-to-all-pages-sites/), SvelteKit protects your users by automatically opting out of FLoC. It adds the following header to responses unless `floc` is `true`:
-
-```
-Permissions-Policy: interest-cohort=()
-```
-
-> This only applies to server-rendered responses — headers for prerendered pages (e.g. created with [adapter-static](https://github.com/sveltejs/kit/tree/master/packages/adapter-static)) are determined by the hosting platform.
-
 ### inlineStyleThreshold
 
 Inline CSS inside a `<style>` block at the head of the HTML. This option is a number that specifies the maximum length of a CSS file to be inlined. All CSS files needed for the page and smaller than this value are merged and inlined in a `<style>` block.
diff --git a/packages/kit/src/core/build/build_server.js b/packages/kit/src/core/build/build_server.js
index d711b95d9c83..4f2da77c73f1 100644
--- a/packages/kit/src/core/build/build_server.js
+++ b/packages/kit/src/core/build/build_server.js
@@ -49,7 +49,6 @@ export class Server {
 		this.options = {
 			csp: ${s(config.kit.csp)},
 			dev: false,
-			floc: ${config.kit.floc},
 			get_stack: error => String(error), // for security
 			handle_error: (error, event) => {
 				this.options.hooks.handleError({
diff --git a/packages/kit/src/core/config/index.spec.js b/packages/kit/src/core/config/index.spec.js
index 81ad6ffad2ef..b8cf5ee406fc 100644
--- a/packages/kit/src/core/config/index.spec.js
+++ b/packages/kit/src/core/config/index.spec.js
@@ -64,7 +64,6 @@ const get_defaults = (prefix = '') => ({
 			serviceWorker: join(prefix, 'src/service-worker'),
 			template: join(prefix, 'src/app.html')
 		},
-		floc: false,
 		headers: undefined,
 		host: undefined,
 		hydrate: undefined,
diff --git a/packages/kit/src/core/config/options.js b/packages/kit/src/core/config/options.js
index 2286e4ab39d3..67b25afc2f5c 100644
--- a/packages/kit/src/core/config/options.js
+++ b/packages/kit/src/core/config/options.js
@@ -115,8 +115,6 @@ const options = object(
 				template: string(join('src', 'app.html'))
 			}),
 
-			floc: boolean(false),
-
 			// TODO: remove this for the 1.0 release
 			headers: error(
 				(keypath) =>
diff --git a/packages/kit/src/core/dev/plugin.js b/packages/kit/src/core/dev/plugin.js
index ea900c7a0dcc..6df78f6cc415 100644
--- a/packages/kit/src/core/dev/plugin.js
+++ b/packages/kit/src/core/dev/plugin.js
@@ -280,7 +280,6 @@ export async function create_plugin(config, cwd) {
 							{
 								csp: config.kit.csp,
 								dev: true,
-								floc: config.kit.floc,
 								get_stack: (error) => {
 									return fix_stack_trace(error);
 								},
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
index c3156d8c978b..35b25f4b1107 100644
--- a/packages/kit/src/runtime/server/page/render.js
+++ b/packages/kit/src/runtime/server/page/render.js
@@ -291,10 +291,6 @@ export async function render_response({
 		headers.set('cache-control', `${is_private ? 'private' : 'public'}, max-age=${cache.maxage}`);
 	}
 
-	if (!options.floc) {
-		headers.set('permissions-policy', 'interest-cohort=()');
-	}
-
 	if (!state.prerender) {
 		const csp_header = csp.get_header();
 		if (csp_header) {
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index faae28cd8396..8730a7d0d1e8 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -1157,12 +1157,6 @@ test.describe.parallel('ETags', () => {
 });
 
 test.describe.parallel('Headers', () => {
-	test('disables floc by default', async ({ page }) => {
-		const response = await page.goto('/headers');
-		const headers = /** @type {Response} */ (response).headers();
-		expect(headers['permissions-policy']).toBe('interest-cohort=()');
-	});
-
 	test('allows headers to be sent as a Headers class instead of a POJO', async ({ page }) => {
 		await page.goto('/headers/class');
 		expect(await page.innerHTML('p')).toBe('bar');
diff --git a/packages/kit/test/apps/options/svelte.config.js b/packages/kit/test/apps/options/svelte.config.js
index 569ef37d3af6..0104f8b88314 100644
--- a/packages/kit/test/apps/options/svelte.config.js
+++ b/packages/kit/test/apps/options/svelte.config.js
@@ -18,7 +18,6 @@ const config = {
 			serviceWorker: 'source/service-worker'
 		},
 		appDir: '_wheee',
-		floc: true,
 		inlineStyleThreshold: 1024,
 		outDir: '.custom-out-dir',
 		trailingSlash: 'always',
diff --git a/packages/kit/test/apps/options/test/test.js b/packages/kit/test/apps/options/test/test.js
index ea535ff83eda..ecc1e4af2780 100644
--- a/packages/kit/test/apps/options/test/test.js
+++ b/packages/kit/test/apps/options/test/test.js
@@ -130,14 +130,6 @@ test.describe.parallel('Custom extensions', () => {
 	});
 });
 
-test.describe.parallel('Headers', () => {
-	test('enables floc', async ({ page }) => {
-		const response = await page.goto('/path-base');
-		const headers = /** @type {Response} */ (response).headers();
-		expect(headers['permissions-policy']).toBeUndefined();
-	});
-});
-
 test.describe.parallel('trailingSlash', () => {
 	test('adds trailing slash', async ({ baseURL, page, clicknav }) => {
 		await page.goto('/path-base/slash');
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index 302020246fbb..18042db24827 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -112,7 +112,6 @@ export interface Config {
 			serviceWorker?: string;
 			template?: string;
 		};
-		floc?: boolean;
 		inlineStyleThreshold?: number;
 		methodOverride?: {
 			parameter?: string;
diff --git a/packages/kit/types/internal.d.ts b/packages/kit/types/internal.d.ts
index 3d7e7b7de021..b4121b3dd9fe 100644
--- a/packages/kit/types/internal.d.ts
+++ b/packages/kit/types/internal.d.ts
@@ -242,7 +242,6 @@ export type SSRNodeLoader = () => Promise<SSRNode>;
 export interface SSROptions {
 	csp: ValidatedConfig['kit']['csp'];
 	dev: boolean;
-	floc: boolean;
 	get_stack: (error: Error) => string | undefined;
 	handle_error(error: Error & { frame?: string }, event: RequestEvent): void;
 	hooks: Hooks;

From 564464f5ca83b3cfacff3ac7ab7e2186018215dd Mon Sep 17 00:00:00 2001
From: Merilynn Bandy <31383109+furudean@users.noreply.github.com>
Date: Sat, 21 May 2022 11:45:05 -0600
Subject: [PATCH 2/4] changeset

---
 .changeset/friendly-eggs-cry.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/friendly-eggs-cry.md

diff --git a/.changeset/friendly-eggs-cry.md b/.changeset/friendly-eggs-cry.md
new file mode 100644
index 000000000000..228b850967e1
--- /dev/null
+++ b/.changeset/friendly-eggs-cry.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+remove floc

From 180ae5f0fbab9b34ed6a4d1942e9eadb09b6e902 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 6 Jul 2022 14:44:15 -0400
Subject: [PATCH 3/4] remove floc reference

---
 packages/kit/src/vite/dev/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index faed5764384b..c6a5258239a4 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -295,7 +295,6 @@ export async function dev(vite, svelte_config) {
 					{
 						csp: svelte_config.kit.csp,
 						dev: true,
-						floc: svelte_config.kit.floc,
 						get_stack: (error) => {
 							return fix_stack_trace(error);
 						},

From dd4efb8337716d989dfa046436051ca5f657f26c Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 6 Jul 2022 14:45:29 -0400
Subject: [PATCH 4/4] Update .changeset/friendly-eggs-cry.md

---
 .changeset/friendly-eggs-cry.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/friendly-eggs-cry.md b/.changeset/friendly-eggs-cry.md
index 228b850967e1..3a560a9b6033 100644
--- a/.changeset/friendly-eggs-cry.md
+++ b/.changeset/friendly-eggs-cry.md
@@ -2,4 +2,4 @@
 '@sveltejs/kit': patch
 ---
 
-remove floc
+remove FLoC protection, now that we vanquished Google