Merge branch 'master' into enhance-update

Author: Rich-Harris

.changeset/proud-peas-matter.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+[breaking] remove global fetch override when prerendering

.changeset/twenty-monkeys-glow.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Improve error message when prefetching fails

package.json

@@ -36,7 +36,7 @@
 		"turbo": "^1.3.4",
 		"typescript": "^4.8.2"
 	},
-	"packageManager": "[email protected].5",
+	"packageManager": "[email protected].6",
 	"engines": {
 		"pnpm": "^7.0.0"
 	},

packages/adapter-auto/package.json

@@ -26,7 +26,7 @@
 	],
 	"scripts": {
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
-		"format": "npm run lint -- --write",
+		"format": "pnpm lint --write",
 		"check": "tsc"
 	},
 	"dependencies": {

packages/adapter-cloudflare-workers/package.json

@@ -25,7 +25,7 @@
 	],
 	"scripts": {
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
-		"format": "npm run lint -- --write",
+		"format": "pnpm lint --write",
 		"check": "tsc"
 	},
 	"dependencies": {

packages/adapter-cloudflare/package.json

@@ -27,9 +27,9 @@
 	"scripts": {
 		"build": "esbuild src/worker.js --bundle --outfile=files/worker.js --external:SERVER --external:MANIFEST --format=esm",
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
-		"format": "npm run lint -- --write",
+		"format": "pnpm lint --write",
 		"check": "tsc --skipLibCheck",
-		"prepublishOnly": "npm run build"
+		"prepublishOnly": "pnpm build"
 	},
 	"dependencies": {
 		"@cloudflare/workers-types": "^3.14.0",

packages/adapter-netlify/package.json

@@ -28,8 +28,8 @@
 		"test": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\"",
 		"check": "tsc",
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
-		"format": "npm run lint -- --write",
-		"prepublishOnly": "npm run build"
+		"format": "pnpm lint --write",
+		"prepublishOnly": "pnpm build"
 	},
 	"dependencies": {
 		"@iarna/toml": "^2.2.5",

packages/adapter-node/package.json

@@ -28,8 +28,8 @@
 		"test": "echo \"tests temporarily disabled\" # c8 uvu tests",
 		"check": "tsc",
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
-		"format": "npm run lint -- --write",
-		"prepublishOnly": "npm run build"
+		"format": "pnpm lint --write",
+		"prepublishOnly": "pnpm build"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",

packages/adapter-static/package.json

@@ -21,7 +21,7 @@
 	"scripts": {
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
 		"check": "tsc",
-		"format": "npm run lint -- --write",
+		"format": "pnpm lint --write",
 		"test": "uvu test test.js"
 	},
 	"devDependencies": {

packages/adapter-vercel/package.json

@@ -24,7 +24,7 @@
 	],
 	"scripts": {
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
-		"format": "npm run lint -- --write",
+		"format": "pnpm lint --write",
 		"check": "tsc"
 	},
 	"dependencies": {

packages/amp/package.json

@@ -23,6 +23,6 @@
 	],
 	"scripts": {
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
-		"format": "npm run lint -- --write"
+		"format": "pnpm lint --write"
 	}
 }

packages/create-svelte/package.json

@@ -31,11 +31,11 @@
 	},
 	"scripts": {
 		"build": "node scripts/build-templates",
-		"test": "npm run build && uvu test",
+		"test": "pnpm build && uvu test",
 		"check": "tsc",
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path ../../.gitignore --ignore-path .gitignore --plugin prettier-plugin-svelte --plugin-search-dir=.",
-		"format": "npm run lint -- --write",
-		"prepublishOnly": "npm run build",
+		"format": "pnpm lint --write",
+		"prepublishOnly": "pnpm build",
 		"postpublish": "echo \"Updating template repo\" && bash ./scripts/update-template-repo.sh"
 	},
 	"files": [

packages/create-svelte/test/check.js

@@ -112,7 +112,7 @@ for (const template of fs.readdirSync('templates')) {
 			console.group(`${template}-${types}`);
 			for (const script of scripts_to_test.filter((s) => !!pkg.scripts[s])) {
 				try {
-					execSync(`pnpm run ${script}`, { cwd, stdio: 'pipe' });
+					execSync(`pnpm ${script}`, { cwd, stdio: 'pipe' });
 					console.log(`✅ ${script}`);
 				} catch (e) {
 					console.error(`❌ ${script}`);

packages/kit/package.json

@@ -57,14 +57,14 @@
 		"scripts/special-types"
 	],
 	"scripts": {
-		"build": "npm run types",
+		"build": "pnpm types",
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
 		"check": "tsc",
 		"check:all": "tsc && pnpm -r --filter=\"./**\" check",
-		"format": "npm run lint -- --write",
-		"prepublishOnly": "npm run build",
-		"test": "npm run test:unit && npm run test:integration",
-		"test:integration": "pnpm run -r --workspace-concurrency 1 --filter=\"./test/**\" test",
+		"format": "pnpm lint --write",
+		"prepublishOnly": "pnpm build",
+		"test": "pnpm test:unit && pnpm test:integration",
+		"test:integration": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test",
 		"test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\"",
 		"types": "node scripts/extract-types.js",
 		"postinstall": "node postinstall.js"

packages/kit/src/core/prerender/prerender.js

@@ -102,54 +102,15 @@ export async function prerender() {
 	});
 
 	installPolyfills();
+
+	// TODO remove this for 1.0
 	const { fetch } = globalThis;
 	globalThis.fetch = async (info, init) => {
-		/** @type {string} */
-		let url;
-
-		/** @type {RequestInit} */
-		let opts = {};
-
-		if (info instanceof Request) {
-			url = info.url;
-
-			opts = {
-				method: info.method,
-				headers: info.headers,
-				body: info.body,
-				mode: info.mode,
-				credentials: info.credentials,
-				cache: info.cache,
-				redirect: info.redirect,
-				referrer: info.referrer,
-				integrity: info.integrity
-			};
-		} else {
-			url = info.toString();
-		}
+		const url = info instanceof Request ? info.url : info.toString();
 
 		if (url.startsWith(config.prerender.origin + '/')) {
-			const request = new Request(url, opts);
-			const response = await server.respond(request, {
-				getClientAddress,
-				prerendering: {
-					dependencies: new Map()
-				}
-			});
-
-			const decoded = new URL(url).pathname;
-
-			save(
-				'dependencies',
-				response,
-				Buffer.from(await response.clone().arrayBuffer()),
-				decoded,
-				encodeURI(decoded),
-				null,
-				'fetched'
-			);
-
-			return response;
+			const sliced = url.slice(config.prerender.origin.length);
+			throw new Error(`Use \`event.fetch('${sliced}')\` instead of the global \`fetch('${url}')\``);
 		}
 
 		return fetch(info, init);

packages/kit/src/runtime/client/client.js

@@ -199,7 +199,7 @@ export function create_client({ target, base, trailing_slash }) {
 		const intent = get_navigation_intent(url, false);
 
 		if (!intent) {
-			throw new Error('Attempted to prefetch a URL that does not belong to this app');
+			throw new Error(`Attempted to prefetch a URL that does not belong to this app: ${url}`);
 		}
 
 		load_cache = { id: intent.id, promise: load_route(intent) };

packages/kit/src/runtime/server/fetch.js

@@ -16,9 +16,6 @@ export function create_fetch({ event, options, state, get_cookie_header }) {
 
 		const request_body = init?.body;
 
-		/** @type {import('types').PrerenderDependency} */
-		let dependency;
-
 		return await options.hooks.handleFetch({
 			event,
 			request,
@@ -135,11 +132,6 @@ export function create_fetch({ event, options, state, get_cookie_header }) {
 
 				response = await respond(request, options, state);
 
-				if (state.prerendering) {
-					dependency = { response, body: null };
-					state.prerendering.dependencies.set(url.pathname, dependency);
-				}
-
 				const set_cookie = response.headers.get('set-cookie');
 				if (set_cookie) {
 					for (const str of set_cookie_parser.splitCookiesString(set_cookie)) {

packages/kit/src/runtime/server/page/load_data.js

@@ -106,8 +106,13 @@ export async function load_data({
 			const url = new URL(input instanceof Request ? input.url : input, event.url);
 			const same_origin = url.origin === event.url.origin;
 
-			const request_body = init?.body;
-			const dependency = same_origin && state.prerendering?.dependencies.get(url.pathname);
+			/** @type {import('types').PrerenderDependency} */
+			let dependency;
+
+			if (same_origin && state.prerendering) {
+				dependency = { response, body: null };
+				state.prerendering.dependencies.set(url.pathname, dependency);
+			}
 
 			const proxy = new Proxy(response, {
 				get(response, key, _receiver) {
@@ -127,7 +132,7 @@ export async function load_data({
 							fetched.push({
 								url: same_origin ? url.href.slice(event.url.origin.length) : url.href,
 								method: event.request.method,
-								request_body: /** @type {string | ArrayBufferView | undefined} */ (request_body),
+								request_body: /** @type {string | ArrayBufferView | undefined} */ (init?.body),
 								response_body: body,
 								response: response
 							});
@@ -165,8 +170,6 @@ export async function load_data({
 						};
 					}
 
-					// TODO arrayBuffer?
-
 					return Reflect.get(response, key, response);
 				}
 			});

packages/kit/test/apps/amp/package.json

@@ -7,7 +7,7 @@
 		"build": "vite build",
 		"preview": "vite preview",
 		"check": "svelte-kit sync && tsc && svelte-check",
-		"test": "npm run test:dev && npm run test:build",
+		"test": "pnpm test:dev && pnpm test:build",
 		"test:dev": "cross-env DEV=true playwright test",
 		"test:build": "playwright test"
 	},

packages/kit/test/apps/basics/package.json

@@ -7,7 +7,7 @@
 		"build": "vite build",
 		"preview": "vite preview",
 		"check": "svelte-kit sync && tsc && svelte-check",
-		"test": "node test/setup.js && npm run test:dev && npm run test:build",
+		"test": "node test/setup.js && pnpm test:dev && pnpm test:build",
 		"test:dev": "rimraf test/errors.json && cross-env DEV=true playwright test",
 		"test:build": "rimraf test/errors.json && playwright test"
 	},

packages/kit/test/apps/basics/src/routes/prerendering/mutative-endpoint/+page.server.ts

@@ -1,3 +1 @@
-export const actions = () => {
-	return {};
-};
+export const actions = {};

packages/kit/test/apps/options-2/package.json

@@ -7,7 +7,7 @@
 		"build": "vite build",
 		"preview": "vite preview",
 		"check": "svelte-kit sync && tsc && svelte-check",
-		"test": "npm run test:dev && npm run test:build",
+		"test": "pnpm test:dev && pnpm test:build",
 		"test:dev": "cross-env DEV=true playwright test",
 		"test:build": "playwright test"
 	},

packages/kit/test/apps/options/package.json

@@ -7,7 +7,7 @@
 		"build": "vite build -c vite.custom.config.js --mode custom",
 		"preview": "vite preview -c vite.custom.config.js",
 		"check": "svelte-kit sync && tsc && svelte-check",
-		"test": "npm run test:dev && npm run test:build",
+		"test": "pnpm test:dev && pnpm test:build",
 		"test:dev": "cross-env DEV=true playwright test",
 		"test:build": "playwright test"
 	},

packages/kit/test/apps/writes/package.json

@@ -7,7 +7,7 @@
 		"build": "vite build",
 		"preview": "vite preview",
 		"check": "svelte-kit sync && tsc && svelte-check",
-		"test": "npm run test:dev && npm run test:build",
+		"test": "pnpm test:dev && pnpm test:build",
 		"test:dev": "rimraf test/errors.json && cross-env DEV=true playwright test",
 		"test:build": "rimraf test/errors.json && playwright test"
 	},

packages/kit/test/prerendering/basics/package.json

@@ -7,7 +7,7 @@
 		"build": "vite build",
 		"preview": "vite preview",
 		"check": "svelte-kit sync && tsc && svelte-check",
-		"test": "svelte-kit sync && npm run build && uvu test"
+		"test": "svelte-kit sync && pnpm build && uvu test"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",

packages/kit/test/prerendering/basics/src/routes/origin/+page.server.js

@@ -1,7 +1,7 @@
 export const prerender = true;
 
-export async function load({ url }) {
-	const res = await fetch(new URL('/origin/message.json', url.origin).href);
+export async function load({ fetch }) {
+	const res = await fetch('/origin/message.json');
 	const { message } = await res.json();
 
 	return {

packages/kit/test/prerendering/fallback/package.json

@@ -7,7 +7,7 @@
 		"build": "vite build",
 		"preview": "vite preview",
 		"check": "svelte-kit sync && tsc && svelte-check",
-		"test": "svelte-kit sync && npm run build"
+		"test": "svelte-kit sync && pnpm build"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",

packages/kit/test/prerendering/options/package.json

@@ -7,7 +7,7 @@
 		"build": "vite build",
 		"preview": "vite preview",
 		"check": "svelte-kit sync && tsc && svelte-check",
-		"test": "svelte-kit sync && npm run build && uvu test"
+		"test": "svelte-kit sync && pnpm build && uvu test"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",

packages/kit/test/prerendering/paths-base/package.json

@@ -7,7 +7,7 @@
 		"build": "vite build",
 		"preview": "vite preview",
 		"check": "svelte-kit sync && tsc && svelte-check",
-		"test": "svelte-kit sync && npm run build && uvu test"
+		"test": "svelte-kit sync && pnpm build && uvu test"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",

packages/kit/test/prerendering/trailing-slash/package.json

@@ -7,7 +7,7 @@
 		"build": "vite build",
 		"preview": "vite preview",
 		"check": "svelte-kit sync && tsc && svelte-check",
-		"test": "svelte-kit sync && npm run build && uvu test"
+		"test": "svelte-kit sync && pnpm build && uvu test"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",

packages/kit/test/utils.js

@@ -137,7 +137,7 @@ export const config = {
 	// generous timeouts on CI
 	timeout: process.env.CI ? 45000 : 15000,
 	webServer: {
-		command: process.env.DEV ? 'npm run dev' : 'npm run build && npm run preview',
+		command: process.env.DEV ? 'pnpm dev' : 'pnpm build && pnpm preview',
 		port: process.env.DEV ? 5173 : 4173
 	},
 	retries: process.env.CI ? 5 : 0,

packages/package/package.json

@@ -36,7 +36,7 @@
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
 		"check": "tsc",
 		"check:all": "tsc && pnpm -r --filter=\"./**\" check",
-		"format": "npm run lint -- --write",
+		"format": "pnpm lint --write",
 		"test": "uvu test \"^index.js$\""
 	},
 	"exports": {