Merge branch 'master' into client-address

sveltejs · Mar 14, 2022 · a548fa8 · a548fa8
2 parents e5475bc + c3c700f
commit a548fa8
Show file tree

Hide file tree

Showing 29 changed files with 199 additions and 54 deletions.
diff --git a/.changeset/cool-crabs-listen.md b/.changeset/cool-crabs-listen.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Allow adapter.adapt to be synchronous
diff --git a/.changeset/early-pants-unite.md b/.changeset/early-pants-unite.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Make `manifest.mimeTypes` part of the public API
diff --git a/.changeset/long-guests-trade.md b/.changeset/long-guests-trade.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Allow routes with the same name as fallback components
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -57,6 +57,7 @@
     "brave-toys-joke",
     "brave-turkeys-bathe",
     "brave-weeks-allow",
+    "breezy-ears-fetch",
     "breezy-games-count",
     "breezy-onions-remember",
     "breezy-sheep-dress",
@@ -113,6 +114,7 @@
     "cold-pants-unite",
     "cold-tables-shake",
     "cool-bananas-share",
+    "cool-crabs-listen",
     "cool-ducks-cheat",
     "cool-hounds-divide",
     "cool-spoons-dress",
@@ -148,6 +150,7 @@
     "early-clocks-sneeze",
     "early-lemons-collect",
     "early-news-taste",
+    "early-pants-unite",
     "early-snakes-peel",
     "early-wasps-obey",
     "eight-birds-run",
@@ -295,6 +298,7 @@
     "honest-jars-report",
     "honest-singers-guess",
     "hot-bags-jump",
+    "hot-clouds-work",
     "hot-dogs-fry",
     "hot-keys-walk",
     "hot-kings-confess",
@@ -355,6 +359,7 @@
     "little-shirts-happen",
     "little-tables-decide",
     "long-bulldogs-invent",
+    "long-guests-trade",
     "long-hotels-hunt",
     "long-moles-fold",
     "loud-dancers-cough",
@@ -657,6 +662,7 @@
     "spotty-parents-love",
     "spotty-ties-love",
     "spotty-timers-fix",
+    "stale-crabs-carry",
     "stale-dodos-type",
     "stale-geckos-call",
     "stale-glasses-brake",
@@ -701,6 +707,7 @@
     "tasty-cars-love",
     "tasty-donkeys-wait",
     "tasty-islands-drive",
+    "tasty-squids-share",
     "ten-hairs-perform",
     "ten-mice-kneel",
     "ten-plants-sleep",
@@ -817,6 +824,7 @@
     "wild-pumas-jam",
     "wise-bees-juggle",
     "wise-bugs-run",
+    "wise-pens-ring",
     "wise-rules-cry",
     "witty-bottles-press",
     "witty-eyes-relax",

diff --git a/.changeset/stale-crabs-carry.md b/.changeset/stale-crabs-carry.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+load hooks after server initialisation, to ensure `prerendering` is correct
diff --git a/.changeset/stale-dogs-rule.md b/.changeset/stale-dogs-rule.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Return 404 when fetching missing data during prerender
diff --git a/.changeset/tasty-squids-share.md b/.changeset/tasty-squids-share.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-auto': patch
+---
+
+Select adapter immediately
diff --git a/.changeset/wise-pens-ring.md b/.changeset/wise-pens-ring.md
@@ -0,0 +1,5 @@
+---
+'create-svelte': patch
+---
+
+[fix] check for app.d.ts rather than global.d.ts
diff --git a/packages/adapter-auto/CHANGELOG.md b/packages/adapter-auto/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @sveltejs/adapter-auto
 
+## 1.0.0-next.32
+
+### Patch Changes
+
+- Select adapter immediately ([#4299](https://github.com/sveltejs/kit/pull/4299))
+
+- Updated dependencies []:
+  - @sveltejs/adapter-netlify@1.0.0-next.50
+  - @sveltejs/adapter-vercel@1.0.0-next.46
+
 ## 1.0.0-next.31
 
 ### Patch Changes

diff --git a/packages/adapter-auto/index.js b/packages/adapter-auto/index.js
@@ -1,40 +1,52 @@
 import { adapters } from './adapters.js';
 
-/** @type {import('.')} **/
-export default function () {
-	return {
-		name: '@sveltejs/adapter-auto',
+/** @type {import('./index')} */
+let fn;
+
+for (const candidate of adapters) {
+	if (candidate.test()) {
+		/** @type {{ default: () => import('@sveltejs/kit').Adapter }} */
+		let module;
 
-		async adapt(builder) {
-			for (const candidate of adapters) {
-				if (candidate.test()) {
-					builder.log.info(`Detected environment: ${candidate.name}. Using ${candidate.module}`);
-
-					let module;
-
-					try {
-						module = await import(candidate.module);
-					} catch (error) {
-						if (
-							error.code === 'ERR_MODULE_NOT_FOUND' &&
-							error.message.startsWith(`Cannot find package '${candidate.module}'`)
-						) {
-							throw new Error(
-								`It looks like ${candidate.module} is not installed. Please install it and try building your project again.`
-							);
-						}
-
-						throw error;
+		try {
+			module = await import(candidate.module);
+
+			fn = () => {
+				const adapter = module.default();
+				return {
+					...adapter,
+					adapt: (builder) => {
+						builder.log.info(`Detected environment: ${candidate.name}. Using ${candidate.module}`);
+						return adapter.adapt(builder);
 					}
+				};
+			};
 
-					const adapter = module.default();
-					return adapter.adapt(builder);
-				}
+			break;
+		} catch (error) {
+			if (
+				error.code === 'ERR_MODULE_NOT_FOUND' &&
+				error.message.startsWith(`Cannot find package '${candidate.module}'`)
+			) {
+				throw new Error(
+					`It looks like ${candidate.module} is not installed. Please install it and try building your project again.`
+				);
 			}
 
+			throw error;
+		}
+	}
+}
+
+if (!fn) {
+	fn = () => ({
+		name: '@sveltejs/adapter-auto',
+		adapt: (builder) => {
 			builder.log.warn(
 				'Could not detect a supported production environment. See https://kit.svelte.dev/docs/adapters to learn how to configure your app to run on the platform of your choosing'
 			);
 		}
-	};
+	});
 }
+
+export default fn;
diff --git a/packages/adapter-auto/package.json b/packages/adapter-auto/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-auto",
-	"version": "1.0.0-next.31",
+	"version": "1.0.0-next.32",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",

diff --git a/packages/adapter-auto/tsconfig.json b/packages/adapter-auto/tsconfig.json
@@ -4,6 +4,9 @@
 		"checkJs": true,
 		"noEmit": true,
 		"noImplicitAny": true,
+		"module": "esnext",
+		"target": "esnext",
+		"moduleResolution": "node",
 		"baseUrl": ".",
 		"paths": {
 			"@sveltejs/kit": ["../kit/types/index"]

diff --git a/packages/adapter-netlify/index.js b/packages/adapter-netlify/index.js
@@ -69,6 +69,8 @@ export default function ({ split = false } = {}) {
 				builder.createEntries((route) => {
 					const parts = [];
 
+					// Netlify's syntax uses '*' and ':param' as "splats" and "placeholders"
+					// https://docs.netlify.com/routing/redirects/redirect-options/#splats
 					for (const segment of route.segments) {
 						if (segment.rest) {
 							parts.push('*');

diff --git a/packages/create-svelte/CHANGELOG.md b/packages/create-svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # create-svelte
 
+## 2.0.0-next.125
+
+### Patch Changes
+
+- [fix] check for app.d.ts rather than global.d.ts ([#4295](https://github.com/sveltejs/kit/pull/4295))
+
 ## 2.0.0-next.124
 
 ### Patch Changes

diff --git a/packages/create-svelte/package.json b/packages/create-svelte/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "create-svelte",
-	"version": "2.0.0-next.124",
+	"version": "2.0.0-next.125",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",

diff --git a/packages/create-svelte/scripts/build-templates.js b/packages/create-svelte/scripts/build-templates.js
@@ -66,10 +66,10 @@ async function generate_templates(shared) {
 		const js = [];
 
 		for (const file of ts) {
-			// The global.d.ts file makes TS/JS aware of some ambient modules, which are
+			// The app.d.ts file makes TS/JS aware of some ambient modules, which are
 			// also needed for JS projects if people turn on "checkJs" in their jsonfig
 			if (file.name.endsWith('.d.ts')) {
-				if (file.name.endsWith('global.d.ts')) js.push(file);
+				if (file.name.endsWith('app.d.ts')) js.push(file);
 			} else if (file.name.endsWith('.ts')) {
 				const transformed = transform(file.contents, {
 					transforms: ['typescript']

diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @sveltejs/kit
 
+## 1.0.0-next.296
+
+### Patch Changes
+
+- Allow adapter.adapt to be synchronous ([#4299](https://github.com/sveltejs/kit/pull/4299))
+
+* Make `manifest.mimeTypes` part of the public API ([#4302](https://github.com/sveltejs/kit/pull/4302))
+
+- load hooks after server initialisation, to ensure `prerendering` is correct ([#4322](https://github.com/sveltejs/kit/pull/4322))
+
+## 1.0.0-next.295
+
+### Patch Changes
+
+- fix error message for invalid request object ([#4277](https://github.com/sveltejs/kit/pull/4277))
+
+* Handle explicit redirects from endpoints ([#4260](https://github.com/sveltejs/kit/pull/4260))
+
+- Allow routes with the same name as fallback components ([#4284](https://github.com/sveltejs/kit/pull/4284))
+
 ## 1.0.0-next.294
 
 ### Patch Changes

diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.0.0-next.294",
+	"version": "1.0.0-next.296",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",

diff --git a/packages/kit/src/core/build/build_server.js b/packages/kit/src/core/build/build_server.js
@@ -35,15 +35,6 @@ let read = null;
 
 set_paths(${s(config.kit.paths)});
 
-// this looks redundant, but the indirection allows us to access
-// named imports without triggering Rollup's missing import detection
-const get_hooks = hooks => ({
-	getSession: hooks.getSession || (() => ({})),
-	handle: hooks.handle || (({ event, resolve }) => resolve(event)),
-	handleError: hooks.handleError || (({ error }) => console.error(error.stack)),
-	externalFetch: hooks.externalFetch || fetch
-});
-
 let default_protocol = 'https';
 
 // allow paths to be globally overridden
@@ -57,16 +48,14 @@ export function override(settings) {
 
 export class Server {
 	constructor(manifest) {
-		const hooks = get_hooks(user_hooks);
-
 		this.options = {
 			amp: ${config.kit.amp},
 			csp: ${s(config.kit.csp)},
 			dev: false,
 			floc: ${config.kit.floc},
 			get_stack: error => String(error), // for security
 			handle_error: (error, event) => {
-				hooks.handleError({
+				this.options.hooks.handleError({
 					error,
 					event,
 
@@ -78,7 +67,7 @@ export class Server {
 				});
 				error.stack = this.options.get_stack(error);
 			},
-			hooks,
+			hooks: null,
 			hydrate: ${s(config.kit.browser.hydrate)},
 			manifest,
 			method_override: ${s(config.kit.methodOverride)},
@@ -95,11 +84,21 @@ export class Server {
 		};
 	}
 
-	respond(request, options = {}) {
+	async respond(request, options = {}) {
 		if (!(request instanceof Request)) {
 			throw new Error('The first argument to server.respond must be a Request object. See https://github.com/sveltejs/kit/pull/3384 for details');
 		}
 
+		if (!this.options.hooks) {
+			const module = await import(${s(hooks)});
+			this.options.hooks = {
+				getSession: module.getSession || (() => ({})),
+				handle: module.handle || (({ event, resolve }) => resolve(event)),
+				handleError: module.handleError || (({ error }) => console.error(error.stack)),
+				externalFetch: module.externalFetch || fetch
+			};
+		}
+
 		return respond(request, this.options, options);
 	}
 }
@@ -160,7 +159,7 @@ export async function build_server(
 		const relative = path.relative(config.kit.files.routes, resolved);
 
 		const name = relative.startsWith('..')
-			? posixify(path.join('entries/pages', path.basename(file)))
+			? posixify(path.join('entries/fallbacks', path.basename(file)))
 			: posixify(path.join('entries/pages', relative));
 		input[name] = resolved;
 	});

diff --git a/packages/kit/src/core/dev/plugin.js b/packages/kit/src/core/dev/plugin.js
@@ -49,8 +49,8 @@ export async function create_plugin(config, cwd) {
 				manifest = {
 					appDir: config.kit.appDir,
 					assets: new Set(manifest_data.assets.map((asset) => asset.file)),
+					mimeTypes: get_mime_lookup(manifest_data),
 					_: {
-						mime: get_mime_lookup(manifest_data),
 						entry: {
 							file: `/@fs${runtime}/client/start.js`,
 							css: [],

diff --git a/packages/kit/src/core/generate_manifest/index.js b/packages/kit/src/core/generate_manifest/index.js
@@ -58,8 +58,8 @@ export function generate_manifest({ build_data, relative_path, routes, format =
 	return `{
 		appDir: ${s(build_data.app_dir)},
 		assets: new Set(${s(assets)}),
+		mimeTypes: ${s(get_mime_lookup(build_data.manifest_data))},
 		_: {
-			mime: ${s(get_mime_lookup(build_data.manifest_data))},
 			entry: ${s(build_data.client.entry)},
 			nodes: [
 				${Array.from(bundled_nodes.values()).map(node => importer(node.path)).join(',\n\t\t\t\t')}