From 4c8f151af8973ee0f9e952e201b3f2ffc9dfd9a5 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 28 Jan 2026 11:32:41 -0500
Subject: [PATCH] feat: allow use of createContext when instantiating
 components programmatically

---
 .changeset/orange-ants-greet.md               |  5 +++++
 packages/svelte/src/internal/client/render.js | 12 ++++-------
 .../svelte/src/internal/server/renderer.js    | 12 ++++-------
 .../create-context-programmatic/Child.svelte  |  7 +++++++
 .../create-context-programmatic/_config.js    |  8 ++++++++
 .../create-context-programmatic/main.svelte   | 20 +++++++++++++++++++
 6 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/orange-ants-greet.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/create-context-programmatic/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/create-context-programmatic/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/create-context-programmatic/main.svelte

diff --git a/.changeset/orange-ants-greet.md b/.changeset/orange-ants-greet.md
new file mode 100644
index 0000000000..6f7c684fee
--- /dev/null
+++ b/.changeset/orange-ants-greet.md
@@ -0,0 +1,5 @@
+---
+'svelte': minor
+---
+
+feat: allow use of createContext when instantiating components programmatically
diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js
index c76f0b1ce7..c09f5fdd05 100644
--- a/packages/svelte/src/internal/client/render.js
+++ b/packages/svelte/src/internal/client/render.js
@@ -208,11 +208,9 @@ function _mount(Component, { target, anchor, props = {}, events, context, intro
 				pending: () => {}
 			},
 			(anchor_node) => {
-				if (context) {
-					push({});
-					var ctx = /** @type {ComponentContext} */ (component_context);
-					ctx.c = context;
-				}
+				push({});
+				var ctx = /** @type {ComponentContext} */ (component_context);
+				if (context) ctx.c = context;
 
 				if (events) {
 					// We can't spread the object or else we'd lose the state proxy stuff, if it is one
@@ -241,9 +239,7 @@ function _mount(Component, { target, anchor, props = {}, events, context, intro
 					}
 				}
 
-				if (context) {
-					pop();
-				}
+				pop();
 			}
 		);
 
diff --git a/packages/svelte/src/internal/server/renderer.js b/packages/svelte/src/internal/server/renderer.js
index 4da0b05cfd..17899899ae 100644
--- a/packages/svelte/src/internal/server/renderer.js
+++ b/packages/svelte/src/internal/server/renderer.js
@@ -611,18 +611,14 @@ export class Renderer {
 
 		renderer.push(BLOCK_OPEN);
 
-		if (options.context) {
-			push();
-			/** @type {SSRContext} */ (ssr_context).c = options.context;
-			/** @type {SSRContext} */ (ssr_context).r = renderer;
-		}
+		push();
+		if (options.context) /** @type {SSRContext} */ (ssr_context).c = options.context;
+		/** @type {SSRContext} */ (ssr_context).r = renderer;
 
 		// @ts-expect-error
 		component(renderer, options.props ?? {});
 
-		if (options.context) {
-			pop();
-		}
+		pop();
 
 		renderer.push(BLOCK_CLOSE);
 
diff --git a/packages/svelte/tests/runtime-runes/samples/create-context-programmatic/Child.svelte b/packages/svelte/tests/runtime-runes/samples/create-context-programmatic/Child.svelte
new file mode 100644
index 0000000000..3e39d5043e
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/create-context-programmatic/Child.svelte
@@ -0,0 +1,7 @@
+<script>
+	import { get } from './main.svelte';
+
+	const message = get();
+</script>
+
+<h1>{message}</h1>
diff --git a/packages/svelte/tests/runtime-runes/samples/create-context-programmatic/_config.js b/packages/svelte/tests/runtime-runes/samples/create-context-programmatic/_config.js
new file mode 100644
index 0000000000..f4374c8759
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/create-context-programmatic/_config.js
@@ -0,0 +1,8 @@
+import { test } from '../../test';
+
+export default test({
+	ssrHtml: `<div></div>`,
+	html: `<div><h1>hello</h1></div>`,
+
+	test() {}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/create-context-programmatic/main.svelte b/packages/svelte/tests/runtime-runes/samples/create-context-programmatic/main.svelte
new file mode 100644
index 0000000000..3c42dbf180
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/create-context-programmatic/main.svelte
@@ -0,0 +1,20 @@
+<script module>
+	import { createContext, mount } from 'svelte';
+	import Child from './Child.svelte';
+
+	/** @type {ReturnType<typeof createContext<string>>} */
+	const [get, set] = createContext();
+
+	export { get };
+
+	function Wrapper(Component) {
+		return (...args) => {
+			set('hello');
+			return Component(...args);
+		};
+	}
+</script>
+
+<div {@attach (target) => {
+	mount(Wrapper(Child), { target });
+}}></div>