Merge branch 'main' into fix-implicit-download-before-navigate

.changeset/dry-mirrors-shout.md

@@ -0,0 +1,6 @@
+---
+"@sveltejs/adapter-cloudflare-workers": patch
+"@sveltejs/adapter-cloudflare": patch
+---
+
+fix: correctly return static assets if base path is set

.changeset/lucky-lobsters-serve.md

@@ -0,0 +1,5 @@
+---
+'create-svelte': patch
+---
+
+chore: upgrade to vitest 2

.changeset/slow-beans-develop.md

@@ -0,0 +1,5 @@
+---
+"create-svelte": patch
+---
+
+fix: remove unnecessary `tslib` dependency

.changeset/ten-shirts-add.md

@@ -0,0 +1,5 @@
+---
+"@sveltejs/adapter-cloudflare": minor
+---
+
+feat: generate static `_redirects` for Cloudflare Pages

.github/workflows/ci.yml

@@ -59,6 +59,8 @@ jobs:
       - run: pnpm playwright install ${{ matrix.e2e-browser }}
       - run: pnpm run sync-all
       - run: pnpm test:kit
+      - name: Print flaky test report
+        run: node scripts/print-flaky-test-report.js
       - name: Archive test results
         if: failure()
         shell: bash
@@ -115,6 +117,8 @@ jobs:
       - run: pnpm playwright install ${{ matrix.e2e-browser }}
       - run: pnpm run sync-all
       - run: pnpm test:cross-platform:${{ matrix.mode }}
+      - name: Print flaky test report
+        run: node scripts/print-flaky-test-report.js
       - name: Archive test results
         if: failure()
         shell: bash

documentation/docs/10-getting-started/index.md

@@ -0,0 +1,3 @@
+---
+title: Getting started
+---

documentation/docs/20-core-concepts/index.md

@@ -0,0 +1,3 @@
+---
+title: Core concepts
+---

documentation/docs/25-build-and-deploy/index.md

@@ -0,0 +1,3 @@
+---
+title: Build and deploy
+---

documentation/docs/30-advanced/index.md

@@ -0,0 +1,3 @@
+---
+title: Advanced
+---

documentation/docs/40-best-practices/index.md

@@ -0,0 +1,3 @@
+---
+title: Best practices
+---

documentation/docs/50-reference/index.md

@@ -0,0 +1,3 @@
+---
+title: Reference
+---

documentation/docs/60-appendix/index.md

@@ -0,0 +1,3 @@
+---
+title: Appendix
+---

documentation/docs/index.md

@@ -0,0 +1,3 @@
+---
+title: SvelteKit
+---

packages/adapter-cloudflare-workers/files/entry.js

@@ -1,5 +1,5 @@
 import { Server } from 'SERVER';
-import { manifest, prerendered } from 'MANIFEST';
+import { manifest, prerendered, base_path } from 'MANIFEST';
 import { getAssetFromKV, mapRequestToAsset } from '@cloudflare/kv-asset-handler';
 import static_asset_manifest_json from '__STATIC_CONTENT_MANIFEST';
 const static_asset_manifest = JSON.parse(static_asset_manifest_json);
@@ -54,7 +54,7 @@ export default {
 
 		// prerendered pages and /static files
 		let is_static_asset = false;
-		const filename = stripped_pathname.substring(1);
+		const filename = stripped_pathname.slice(base_path.length + 1);
 		if (filename) {
 			is_static_asset =
 				manifest.assets.has(filename) || manifest.assets.has(filename + '/index.html');

packages/adapter-cloudflare-workers/index.js

@@ -73,9 +73,9 @@ export default function ({ config = 'wrangler.toml', platformProxy = {} } = {})
 
 			writeFileSync(
 				`${tmp}/manifest.js`,
-				`export const manifest = ${builder.generateManifest({
-					relativePath
-				})};\n\nexport const prerendered = new Map(${JSON.stringify(prerendered_entries)});\n`
+				`export const manifest = ${builder.generateManifest({ relativePath })};\n\n` +
+					`export const prerendered = new Map(${JSON.stringify(prerendered_entries)});\n\n` +
+					`export const base_path = ${JSON.stringify(builder.config.kit.paths.base)};\n`
 			);
 
 			const external = ['__STATIC_CONTENT_MANIFEST', 'cloudflare:*'];

packages/adapter-cloudflare-workers/placeholders.d.ts

@@ -7,6 +7,7 @@ declare module 'MANIFEST' {
 
 	export const manifest: SSRManifest;
 	export const prerendered: Map<string, { file: string }>;
+	export const base_path: string;
 }
 
 declare module '__STATIC_CONTENT_MANIFEST' {

packages/adapter-cloudflare/index.js

@@ -58,7 +58,7 @@ export default function (options = {}) {
 				`${tmp}/manifest.js`,
 				`export const manifest = ${builder.generateManifest({ relativePath })};\n\n` +
 					`export const prerendered = new Set(${JSON.stringify(builder.prerendered.paths)});\n\n` +
-					`export const app_path = ${JSON.stringify(builder.getAppPath())};\n`
+					`export const base_path = ${JSON.stringify(builder.config.kit.paths.base)};\n`
 			);
 
 			writeFileSync(
@@ -68,6 +68,12 @@ export default function (options = {}) {
 
 			writeFileSync(`${dest}/_headers`, generate_headers(builder.getAppPath()), { flag: 'a' });
 
+			if (builder.prerendered.redirects.size > 0) {
+				writeFileSync(`${dest}/_redirects`, generate_redirects(builder.prerendered.redirects), {
+					flag: 'a'
+				});
+			}
+
 			builder.copy(`${files}/worker.js`, `${tmp}/_worker.js`, {
 				replace: {
 					SERVER: `${relativePath}/index.js`,
@@ -204,18 +210,11 @@ function get_routes_json(builder, assets, { include = ['/*'], exclude = ['<all>'
 								file === '_redirects'
 							)
 					)
-					.map((file) => `/${file}`);
+					.map((file) => `${builder.config.kit.paths.base}/${file}`);
 			}
 
 			if (rule === '<prerendered>') {
-				const prerendered = [];
-				for (const path of builder.prerendered.paths) {
-					if (!builder.prerendered.redirects.has(path)) {
-						prerendered.push(path);
-					}
-				}
-
-				return prerendered;
+				return builder.prerendered.paths;
 			}
 
 			return rule;
@@ -250,3 +249,17 @@ function generate_headers(app_dir) {
 # === END AUTOGENERATED SVELTE IMMUTABLE HEADERS ===
 `.trimEnd();
 }
+
+/** @param {Map<string, { status: number; location: string }>} redirects */
+function generate_redirects(redirects) {
+	const rules = Array.from(
+		redirects.entries(),
+		([path, redirect]) => `${path} ${redirect.location} ${redirect.status}`
+	).join('\n');
+
+	return `
+# === START AUTOGENERATED SVELTE PRERENDERED REDIRECTS ===
+${rules}
+# === END AUTOGENERATED SVELTE PRERENDERED REDIRECTS ===
+`.trimEnd();
+}

packages/adapter-cloudflare/placeholders.d.ts

@@ -8,4 +8,5 @@ declare module 'MANIFEST' {
 	export const manifest: SSRManifest;
 	export const prerendered: Set<string>;
 	export const app_path: string;
+	export const base_path: string;
 }

packages/adapter-cloudflare/src/worker.js

@@ -1,11 +1,13 @@
 import { Server } from 'SERVER';
-import { manifest, prerendered, app_path } from 'MANIFEST';
+import { manifest, prerendered, base_path } from 'MANIFEST';
 import * as Cache from 'worktop/cfw.cache';
 
 const server = new Server(manifest);
 
-const immutable = `/${app_path}/immutable/`;
-const version_file = `/${app_path}/version.json`;
+const app_path = `/${manifest.appPath}`;
+
+const immutable = `${app_path}/immutable/`;
+const version_file = `${app_path}/version.json`;
 
 /** @type {import('worktop/cfw').Module.Worker<{ ASSETS: import('worktop/cfw.durable').Durable.Object }>} */
 const worker = {
@@ -28,7 +30,7 @@ const worker = {
 
 		// prerendered pages and /static files
 		let is_static_asset = false;
-		const filename = stripped_pathname.substring(1);
+		const filename = stripped_pathname.slice(base_path.length + 1);
 		if (filename) {
 			is_static_asset =
 				manifest.assets.has(filename) || manifest.assets.has(filename + '/index.html');

packages/adapter-netlify/package.json

@@ -56,7 +56,7 @@
 		"@types/set-cookie-parser": "^2.4.7",
 		"rollup": "^4.14.2",
 		"typescript": "^5.3.3",
-		"vitest": "^1.6.0"
+		"vitest": "^2.0.1"
 	},
 	"peerDependencies": {
 		"@sveltejs/kit": "^2.4.0"

packages/adapter-node/package.json

@@ -48,7 +48,7 @@
 		"polka": "1.0.0-next.25",
 		"sirv": "^2.0.4",
 		"typescript": "^5.3.3",
-		"vitest": "^1.6.0"
+		"vitest": "^2.0.1"
 	},
 	"dependencies": {
 		"@rollup/plugin-commonjs": "^26.0.1",

packages/adapter-vercel/package.json

@@ -47,7 +47,7 @@
 		"@sveltejs/vite-plugin-svelte": "^3.0.1",
 		"@types/node": "^18.19.3",
 		"typescript": "^5.3.3",
-		"vitest": "^1.6.0"
+		"vitest": "^2.0.1"
 	},
 	"peerDependencies": {
 		"@sveltejs/kit": "^2.4.0"

packages/create-svelte/package.json

@@ -35,7 +35,7 @@
 		"svelte": "^4.2.10",
 		"tiny-glob": "^0.2.9",
 		"typescript": "^5.3.3",
-		"vitest": "^1.6.0"
+		"vitest": "^2.0.1"
 	},
 	"scripts": {
 		"build": "node scripts/build-templates",

packages/create-svelte/shared/+playwright+vitest/package.json

@@ -1,7 +1,7 @@
 {
 	"devDependencies": {
 		"@playwright/test": "^1.28.1",
-		"vitest": "^1.2.0"
+		"vitest": "^2.0.0"
 	},
 	"scripts": {
 		"test:integration": "playwright test",

packages/create-svelte/shared/+typescript/package.json

@@ -5,7 +5,6 @@
 	},
 	"devDependencies": {
 		"typescript": "^5.0.0",
-		"tslib": "^2.4.1",
 		"svelte-check": "^3.6.0"
 	}
 }

packages/create-svelte/shared/+vitest/package.json

@@ -1,6 +1,6 @@
 {
 	"devDependencies": {
-		"vitest": "^1.2.0"
+		"vitest": "^2.0.0"
 	},
 	"scripts": {
 		"test": "vitest"

packages/create-svelte/templates/skeletonlib/package.template.json

@@ -25,7 +25,6 @@
 		"@sveltejs/vite-plugin-svelte": "^3.0.0",
 		"publint": "^0.1.9",
 		"svelte": "^4.2.7",
-		"tslib": "^2.4.1",
 		"typescript": "^5.3.2",
 		"vite": "^5.0.11"
 	},

packages/enhanced-img/package.json

@@ -48,7 +48,7 @@
 		"svelte": "^4.2.10",
 		"typescript": "^5.3.3",
 		"vite": "^5.3.2",
-		"vitest": "^1.6.0"
+		"vitest": "^2.0.1"
 	},
 	"peerDependencies": {
 		"svelte": "^4.0.0 || ^5.0.0-next.0",

packages/kit/kit.vitest.config.js

@@ -2,6 +2,11 @@ import { defineConfig } from 'vitest/config';
 
 // this file needs a custom name so that the numerous test subprojects don't all pick it up
 export default defineConfig({
+	server: {
+		watch: {
+			ignored: ['**/node_modules/**', '**/.svelte-kit/**']
+		}
+	},
 	test: {
 		// shave a couple seconds off the tests
 		isolate: false,
@@ -16,7 +21,6 @@ export default defineConfig({
 			'**/.svelte-kit/**',
 			'**/.{idea,git,cache,output,temp}/**',
 			'**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress,tsup,build}.config.*'
-		],
-		watchExclude: ['**/node_modules/**', '**/.svelte-kit/**']
+		]
 	}
 });

packages/kit/package.json

@@ -43,7 +43,7 @@
 		"svelte-preprocess": "^6.0.0",
 		"typescript": "^5.3.3",
 		"vite": "^5.3.2",
-		"vitest": "^1.6.0"
+		"vitest": "^2.0.1"
 	},
 	"peerDependencies": {
 		"@sveltejs/vite-plugin-svelte": "^3.0.0",

packages/kit/test/apps/basics/src/routes/load/cache-control/bust/+page.svelte

@@ -11,5 +11,5 @@
 	}
 </script>
 
-<p>Count is {data.count}</p>
+<p class="counter">Count is {data.count}</p>
 <button on:click={update}>update</button>

packages/kit/test/apps/basics/src/routes/load/cache-control/bust/count/+server.js

@@ -1,8 +1,10 @@
 import { json } from '@sveltejs/kit';
-import { count } from '../state.js';
 
-export function GET({ setHeaders }) {
+export function GET({ setHeaders, cookies }) {
 	setHeaders({ 'cache-control': 'public, max-age=4', age: '2' });
+
+	const count = +(cookies.get('cache-control-bust-count') ?? 0);
+
 	return json({ count });
 }
 

packages/kit/test/apps/basics/src/routes/load/cache-control/bust/increment/+server.js

@@ -1,7 +1,11 @@
 import { json } from '@sveltejs/kit';
-import { increment } from '../state.js';
 
-export function GET() {
-	increment();
+export function GET({ cookies }) {
+	cookies.set(
+		'cache-control-bust-count',
+		+(cookies.get('cache-control-bust-count') ?? 0) + 1 + '',
+		{ path: '/' }
+	);
+
 	return json({});
 }