From 28e5e45c6f78473ed822832364c6a8a45babf790 Mon Sep 17 00:00:00 2001
From: Ivan Hofer <ivan.hofer@outlook.com>
Date: Tue, 29 Jun 2021 07:56:57 +0200
Subject: [PATCH] fix rebasing

---
 src/compiler/compile/render_dom/index.ts |  3 +--
 src/runtime/internal/dev.ts              | 20 +++-----------------
 src/runtime/internal/utils.ts            |  3 +--
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/compiler/compile/render_dom/index.ts b/src/compiler/compile/render_dom/index.ts
index b57ea867b9..b9d68a56e1 100644
--- a/src/compiler/compile/render_dom/index.ts
+++ b/src/compiler/compile/render_dom/index.ts
@@ -543,8 +543,7 @@ export default function dom(
 			class ${name} extends ${superclass} {
 				constructor(options) {
 					super(${options.dev && 'options'});
-					${should_add_css && b`if (!@_document.getElementById("${component.stylesheet.id}-style")) ${add_css}();`}
-					@init(this, options, ${definition}, ${has_create_fragment ? 'create_fragment' : 'null'}, ${not_equal}, ${prop_indexes}, ${dirty});
+					@init(this, options, ${definition}, ${has_create_fragment ? 'create_fragment' : 'null'}, ${not_equal}, ${prop_indexes}, ${optionalParameters});
 					${options.dev && b`@dispatch_dev("SvelteRegisterComponent", { component: this, tagName: "${name.name}", options, id: create_fragment.name });`}
 
 					${dev_props_check}
diff --git a/src/runtime/internal/dev.ts b/src/runtime/internal/dev.ts
index d6a47b57e4..722972b1bf 100644
--- a/src/runtime/internal/dev.ts
+++ b/src/runtime/internal/dev.ts
@@ -105,7 +105,7 @@ export interface SvelteComponentDev {
 	[accessor: string]: any;
 }
 interface IComponentOptions<Props extends Record<string, any> = Record<string, any>> {
-	target: Element;
+	target: Element|ShadowRoot;
 	anchor?: Element;
 	props?: Props;
 	context?: Map<any, any>;
@@ -140,14 +140,7 @@ export class SvelteComponentDev extends SvelteComponent {
 	 */
 	$$slot_def: any;
 
-	constructor(options: {
-		target: Element|ShadowRoot;
-		anchor?: Element;
-		props?: Props;
-		hydrate?: boolean;
-		intro?: boolean;
-		$$inline?: boolean;
-    }) {
+	constructor(options: IComponentOptions) {
 		if (!options || (!options.target && !options.$$inline)) {
 			throw new Error("'target' is a required option");
 		}
@@ -239,14 +232,7 @@ export class SvelteComponentTyped<
 	 */
 	$$slot_def: Slots;
 
-	constructor(options: {
-		target: Element|ShadowRoot;
-		anchor?: Element;
-		props?: Props;
-		hydrate?: boolean;
-		intro?: boolean;
-		$$inline?: boolean;
-    }) {
+	constructor(options: IComponentOptions) {
 		super(options);
 	}
 }
diff --git a/src/runtime/internal/utils.ts b/src/runtime/internal/utils.ts
index cca72f8e9f..4fb10cd5d4 100644
--- a/src/runtime/internal/utils.ts
+++ b/src/runtime/internal/utils.ts
@@ -80,10 +80,9 @@ export function create_slot(definition, ctx, $$scope, fn) {
 }
 
 function get_slot_context(definition, ctx, $$scope, fn) {
-	const context = definition[1] && fn
+	return definition[1] && fn
 		? assign($$scope.ctx.slice(), definition[1](fn(ctx)))
 		: $$scope.ctx;
-	return context;
 }
 
 export function get_slot_changes(definition, $$scope, dirty, fn) {