Fix unowned roots having owner in dev (#1456)

* Fix unowned roots having owner in dev * add changeset Co-authored-by: Ryan Carniato <[email protected]>
solidjs · Jan 3, 2023 · 1384496 · 1384496
1 parent c4ac14c
commit 1384496
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/.changeset/khaki-ducks-yawn.md b/.changeset/khaki-ducks-yawn.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+Fix unowned roots having owner in dev
diff --git a/packages/solid/src/reactive/signal.ts b/packages/solid/src/reactive/signal.ts
@@ -110,10 +110,11 @@ export function createRoot<T>(fn: RootFunction<T>, detachedOwner?: Owner): T {
   const listener = Listener,
     owner = Owner,
     unowned = fn.length === 0,
-    root: Owner =
-      unowned && !"_SOLID_DEV_"
-        ? UNOWNED
-        : { owned: null, cleanups: null, context: null, owner: detachedOwner || owner },
+    root: Owner = unowned
+      ? "_SOLID_DEV_"
+        ? { owned: null, cleanups: null, context: null, owner: null }
+        : UNOWNED
+      : { owned: null, cleanups: null, context: null, owner: detachedOwner || owner },
     updateFn = unowned
       ? "_SOLID_DEV_"
         ? () =>

diff --git a/packages/solid/test/signals.spec.ts b/packages/solid/test/signals.spec.ts
@@ -17,7 +17,7 @@ import {
   createContext,
   useContext,
   getOwner,
-  runWithOwner,
+  runWithOwner
 } from "../src";
 
 import "./MessageChannel";
@@ -305,7 +305,6 @@ describe("Effect grouping of signals", () => {
         try {
           setA(1);
           throw new Error("test");
-          setB(1);
         } catch (e) {
           error = e as Error;
         }
@@ -660,6 +659,22 @@ describe("create and use context", () => {
   });
 });
 
+describe("createRoot", () => {
+  test("roots with dispose function unused are unowned", () => {
+    createRoot(_ => {
+      const root1 = getOwner()!;
+      createRoot(_ => {
+        const root2 = getOwner()!;
+        createRoot(() => {
+          const root3 = getOwner()!;
+          expect(root2.owner).toBe(root1);
+          expect(root3.owner).toBe(null);
+        });
+      });
+    });
+  });
+});
+
 describe("runWithOwner", () => {
   test("Top level owner execute and disposal", () => {
     let effectRun = false;