Merge branch 'master' into public-types

sveltejs · Feb 21, 2022 · 4aba92f · 4aba92f
2 parents a1db92b + 1264c46
commit 4aba92f
Show file tree

Hide file tree

Showing 17 changed files with 62 additions and 8 deletions.
diff --git a/.changeset/forty-seahorses-rest.md b/.changeset/forty-seahorses-rest.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Allow the `transformPage` resolve option to return a promise
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -298,6 +298,7 @@
     "large-icons-complain",
     "large-kangaroos-remain",
     "large-lies-reply",
+    "late-bobcats-brake",
     "late-cats-care",
     "late-foxes-clean",
     "late-glasses-sin",
@@ -457,6 +458,7 @@
     "pretty-snakes-burn",
     "proud-bananas-love",
     "proud-buses-hug",
+    "proud-cooks-relax",
     "proud-goats-hide",
     "proud-hairs-chew",
     "proud-needles-shake",

diff --git a/packages/adapter-auto/CHANGELOG.md b/packages/adapter-auto/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @sveltejs/adapter-auto
 
+## 1.0.0-next.24
+
+### Patch Changes
+
+- Updated dependencies [[`f223f91a`](/~https://github.com/sveltejs/kit/commit/f223f91ab8346fb8fc376393603956e72baa6369)]:
+  - @sveltejs/adapter-cloudflare@1.0.0-next.12
+  - @sveltejs/adapter-netlify@1.0.0-next.46
+  - @sveltejs/adapter-vercel@1.0.0-next.44
+
 ## 1.0.0-next.23
 
 ### Patch Changes

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.23",
+	"version": "1.0.0-next.24",
 	"repository": {
 		"type": "git",
 		"url": "/~https://github.com/sveltejs/kit",

diff --git a/packages/adapter-cloudflare-workers/CHANGELOG.md b/packages/adapter-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/adapter-cloudflare-workers
 
+## 1.0.0-next.34
+
+### Patch Changes
+
+- [breaking] rename `app.render` to `server.respond` ([#4034](/~https://github.com/sveltejs/kit/pull/4034))
+
 ## 1.0.0-next.33
 
 ### Patch Changes

diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-cloudflare-workers",
-	"version": "1.0.0-next.33",
+	"version": "1.0.0-next.34",
 	"repository": {
 		"type": "git",
 		"url": "/~https://github.com/sveltejs/kit",

diff --git a/packages/adapter-cloudflare/CHANGELOG.md b/packages/adapter-cloudflare/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/adapter-cloudflare
 
+## 1.0.0-next.12
+
+### Patch Changes
+
+- [breaking] rename `app.render` to `server.respond` ([#4034](/~https://github.com/sveltejs/kit/pull/4034))
+
 ## 1.0.0-next.11
 
 ### Patch Changes

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

diff --git a/packages/adapter-netlify/CHANGELOG.md b/packages/adapter-netlify/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/adapter-netlify
 
+## 1.0.0-next.46
+
+### Patch Changes
+
+- [breaking] rename `app.render` to `server.respond` ([#4034](/~https://github.com/sveltejs/kit/pull/4034))
+
 ## 1.0.0-next.45
 
 ### Patch Changes

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

diff --git a/packages/adapter-node/CHANGELOG.md b/packages/adapter-node/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/adapter-node
 
+## 1.0.0-next.69
+
+### Patch Changes
+
+- [breaking] rename `app.render` to `server.respond` ([#4034](/~https://github.com/sveltejs/kit/pull/4034))
+
 ## 1.0.0-next.68
 
 ### Patch Changes

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

diff --git a/packages/adapter-vercel/CHANGELOG.md b/packages/adapter-vercel/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/adapter-vercel
 
+## 1.0.0-next.44
+
+### Patch Changes
+
+- [breaking] rename `app.render` to `server.respond` ([#4034](/~https://github.com/sveltejs/kit/pull/4034))
+
 ## 1.0.0-next.43
 
 ### Patch Changes

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

diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sveltejs/kit
 
+## 1.0.0-next.280
+
+### Patch Changes
+
+- [breaking] rename `app.render` to `server.respond` ([#4034](/~https://github.com/sveltejs/kit/pull/4034))
+
+* [breaking] allow providing `Params` type argument for `RequestHandler` ([#3989](/~https://github.com/sveltejs/kit/pull/3989))
+
 ## 1.0.0-next.279
 
 ### 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.279",
+	"version": "1.0.0-next.280",
 	"repository": {
 		"type": "git",
 		"url": "/~https://github.com/sveltejs/kit",

diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
@@ -299,7 +299,7 @@ export async function render_response({
 	const assets =
 		options.paths.assets || (segments.length > 0 ? segments.map(() => '..').join('/') : '.');
 
-	const html = resolve_opts.transformPage({
+	const html = await resolve_opts.transformPage({
 		html: options.template({ head, body, assets, nonce: /** @type {string} */ (csp.nonce) })
 	});