.changeset/few-hornets-joke.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Respect `export const prerender = false` in `+page.server.js`

.changeset/gold-rocks-hang.md

@@ -0,0 +1,5 @@
+---
+'create-svelte': patch
+---
+
+update `app.d.ts` for library skeleton template

.changeset/pre.json

@@ -256,6 +256,7 @@
     "few-buses-argue",
     "few-carrots-sell",
     "few-cobras-switch",
+    "few-hornets-joke",
     "few-points-taste",
     "few-rockets-sort",
     "few-rockets-think",
@@ -335,6 +336,7 @@
     "gold-carrots-sniff",
     "gold-colts-train",
     "gold-moles-hunt",
+    "gold-rocks-hang",
     "gold-spies-fail",
     "gold-trains-dream",
     "good-beans-invite",

documentation/docs/15-configuration.md

@@ -72,9 +72,6 @@ const config = {
 		}
 	},
 
-	// options passed to svelte.preprocess (https://svelte.dev/docs#compile-time-svelte-preprocess)
-	preprocess: null,
-
 	// options passed to @sveltejs/package
 	package: {
 		source: 'value of kit.files.lib, if available, else src/lib',
@@ -83,7 +80,10 @@ const config = {
 		// excludes all .d.ts and files starting with _ as the name
 		exports: (filepath) => !/^_|\/_|\.d\.ts$/.test(filepath),
 		files: () => true
-	}
+	},
+
+	// options passed to svelte.preprocess (https://svelte.dev/docs#compile-time-svelte-preprocess)
+	preprocess: null
 };
 
 export default config;

packages/create-svelte/CHANGELOG.md

@@ -1,5 +1,11 @@
 # create-svelte
 
+## 2.0.0-next.156
+
+### Patch Changes
+
+- update `app.d.ts` for library skeleton template ([#6020](https://github.com/sveltejs/kit/pull/6020))
+
 ## 2.0.0-next.155
 
 ### Patch Changes

packages/create-svelte/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-svelte",
-	"version": "2.0.0-next.155",
+	"version": "2.0.0-next.156",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",

packages/create-svelte/templates/libskeleton/src/app.d.ts

@@ -6,6 +6,6 @@
 declare namespace App {
 	// interface Locals {}
 	// interface Platform {}
-	// interface Session {}
-	// interface Stuff {}
+	// interface PrivateEnv {}
+	// interface PublicEnv {}
 }

packages/kit/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @sveltejs/kit
 
+## 1.0.0-next.421
+
+### Patch Changes
+
+- Respect `export const prerender = false` in `+page.server.js` ([#6012](https://github.com/sveltejs/kit/pull/6012))
+
 ## 1.0.0-next.420
 
 ### Patch Changes

packages/kit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.0.0-next.420",
+	"version": "1.0.0-next.421",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",

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

@@ -117,7 +117,8 @@ export async function render_page(event, route, options, state, resolve_opts) {
 			});
 		}
 
-		const should_prerender = leaf_node.shared?.prerender ?? options.prerender.default;
+		const should_prerender =
+			leaf_node.shared?.prerender ?? leaf_node.server?.prerender ?? options.prerender.default;
 		if (should_prerender) {
 			const mod = leaf_node.server;
 			if (mod && (mod.POST || mod.PUT || mod.DELETE || mod.PATCH)) {

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

@@ -0,0 +1 @@
+export const prerender = false;

packages/kit/test/prerendering/basics/src/routes/page-server-options/+page.svelte

@@ -0,0 +1 @@
+<h1>This should not be visible</h1>

packages/kit/test/prerendering/basics/test/test.js

@@ -99,6 +99,11 @@ test('does not prerender page with shadow endpoint with non-load handler', () =>
 	assert.ok(!fs.existsSync(`${build}/shadowed-post/__data.json`));
 });
 
+test('does not prerender page with prerender = false in +page.server.js', () => {
+	assert.ok(!fs.existsSync(`${build}/page-server-options.html`));
+	assert.ok(!fs.existsSync(`${build}/page-server-options/__data.json`));
+});
+
 test('decodes paths when writing files', () => {
 	let content = read('encoding/path with spaces.html');
 	assert.ok(content.includes('<p id="a">path with spaces</p>'));

packages/kit/types/index.d.ts

@@ -106,14 +106,14 @@ export interface Config {
 	compilerOptions?: CompileOptions;
 	extensions?: string[];
 	kit?: KitConfig;
-	preprocess?: any;
 	package?: {
 		source?: string;
 		dir?: string;
 		emitTypes?: boolean;
 		exports?: (filepath: string) => boolean;
 		files?: (filepath: string) => boolean;
 	};
+	preprocess?: any;
 	[key: string]: any;
 }
 

packages/kit/types/internal.d.ts

@@ -211,12 +211,11 @@ export interface SSRNode {
 		hydrate?: boolean;
 		prerender?: boolean;
 		router?: boolean;
-		ssr?: boolean;
 	};
 
 	server: {
 		load?: ServerLoad;
-		HEAD?: ServerLoad;
+		prerender?: boolean;
 		POST?: Action;
 		PATCH?: Action;
 		PUT?: Action;

packages/package/src/types.d.ts

@@ -18,10 +18,10 @@ export type RecursiveRequired<T> = {
 };
 
 export interface ValidatedConfig {
-	preprocess?: any;
 	extensions: string[];
-	package: RecursiveRequired<PackageConfig>;
 	kit?: any;
+	package: RecursiveRequired<PackageConfig>;
+	preprocess?: any;
 }
 
 export type Validator<T = any> = (input: T, keypath: string) => T;

packages/package/types/index.d.ts

@@ -29,6 +29,6 @@ export interface Config {
 	compilerOptions?: CompileOptions;
 	extensions?: string[];
 	kit?: any;
-	preprocess?: any;
 	package?: PackageConfig;
+	preprocess?: any;
 }