Merge pull request #336 from preactjs/suspense-rethrow

fix: suspended error not re-thrown

Author: marvinhagemeister

.changeset/cuddly-spoons-impress.md

@@ -0,0 +1,5 @@
+---
+'preact-render-to-string': patch
+---
+
+Fix error thrown after suspending not being rethrown.

src/index.js

@@ -467,6 +467,8 @@ function _renderToString(
 				try {
 					return renderChildren();
 				} catch (e) {
+					if (!e || typeof e.then !== 'function') throw e;
+
 					return e.then(
 						() => renderChildren(),
 						() => renderNestedChildren()

test/compat/async.test.js

@@ -137,4 +137,32 @@ describe('Async renderToString', () => {
 
 		expect(rendered).to.equal(expected);
 	});
+
+	it('should rethrow error thrown after suspending', async () => {
+		const { suspended, getResolved } = createSuspender();
+
+		function Suspender() {
+			if (!getResolved()) {
+				throw suspended.promise;
+			}
+
+			throw new Error('fail');
+		}
+
+		const promise = renderToStringAsync(
+			<Suspense fallback={<div>loading...</div>}>
+				<Suspender />
+			</Suspense>
+		);
+
+		let msg = '';
+		try {
+			suspended.resolve();
+			await promise;
+		} catch (err) {
+			msg = err.message;
+		}
+
+		expect(msg).to.equal('fail');
+	});
 });

test/utils.js

@@ -27,6 +27,9 @@ export function createSuspender() {
 	}
 
 	return {
+		getResolved() {
+			return resolved;
+		},
 		suspended: deferred,
 		Suspender
 	};