@sveltejs/kit 1.0.0-next.419 → 1.0.0-next.421

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.419",
+  "version": "1.0.0-next.421",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -39,11 +39,11 @@
     "tiny-glob": "^0.2.9",
     "typescript": "^4.7.4",
     "uvu": "^0.5.3",
-    "vite": "3.0.2"
+    "vite": "^3.0.8"
   },
   "peerDependencies": {
     "svelte": "^3.44.0",
-    "vite": "3.0.2"
+    "vite": "^3.0.0"
   },
   "bin": {
     "svelte-kit": "svelte-kit.js"

package/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)) {

package/src/vite/build/build_server.js

@@ -4,7 +4,7 @@ import { mkdirp, posixify } from '../../utils/filesystem.js';
 import { get_vite_config, merge_vite_configs, resolve_entry } from '../utils.js';
 import { load_template } from '../../core/config/index.js';
 import { runtime_directory } from '../../core/utils.js';
-import { create_build, find_deps, get_default_config, is_http_method } from './utils.js';
+import { create_build, find_deps, get_default_build_config, is_http_method } from './utils.js';
 import { s } from '../../utils/misc.js';
 
 /**
@@ -205,7 +205,7 @@ export async function build_server(options, client) {
 	);
 
 	const merged_config = merge_vite_configs(
-		get_default_config({ config, input, ssr: true, outDir: `${output_dir}/server` }),
+		get_default_build_config({ config, input, ssr: true, outDir: `${output_dir}/server` }),
 		await get_vite_config(vite_config, vite_config_env)
 	);
 

package/src/vite/build/utils.js

@@ -87,7 +87,7 @@ export function find_deps(manifest, entry, add_dynamic_css) {
  * }} options
  * @return {import('vite').UserConfig}
  */
-export const get_default_config = function ({ config, input, ssr, outDir }) {
+export function get_default_build_config({ config, input, ssr, outDir }) {
 	const prefix = `${config.kit.appDir}/immutable`;
 
 	return {
@@ -135,7 +135,7 @@ export const get_default_config = function ({ config, input, ssr, outDir }) {
 			}
 		}
 	};
-};
+}
 
 /**
  * @param {import('types').ValidatedKitConfig} config

package/src/vite/index.js

@@ -12,7 +12,7 @@ import { load_config } from '../core/config/index.js';
 import { dev } from './dev/index.js';
 import { generate_manifest } from '../core/generate_manifest/index.js';
 import { runtime_directory, logger } from '../core/utils.js';
-import { find_deps, get_default_config as get_default_build_config } from './build/utils.js';
+import { find_deps, get_default_build_config } from './build/utils.js';
 import { preview } from './preview/index.js';
 import { get_aliases, resolve_entry, prevent_illegal_rollup_imports, get_env } from './utils.js';
 import { fileURLToPath } from 'node:url';
@@ -266,6 +266,13 @@ function kit() {
 							`${posixify(svelte_config.kit.outDir)}/!(generated)`
 						]
 					}
+				},
+				ssr: {
+					// Without this, Vite will treat `@sveltejs/kit` as noExternal if it's
+					// a linked dependency, and that causes modules to be imported twice
+					// under different IDs, which breaks a bunch of stuff
+					// https://github.com/vitejs/vite/pull/9296
+					external: ['@sveltejs/kit']
 				}
 			};
 

package/types/index.d.ts

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

package/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;