refactor: run nested scopes within pinia

diff --git a/packages/pinia/src/store.ts b/packages/pinia/src/store.ts
index 3faa689aa8bafbb0b21233055aa2d09ad59c6ced..a540e1d973eeb7efe17f3e7fbdb31f6d0605c8cc 100644 (file)
--- a/packages/pinia/src/store.ts
+++ b/packages/pinia/src/store.ts
@@ -479,10 +479,9 @@ function createSetupStore<
     (pinia._a && pinia._a.runWithContext) || fallbackRunWithContext
 
   // TODO: idea create skipSerialize that marks properties as non serializable and they are skipped
-  const setupStore = pinia._e.run(() => {
-    scope = effectScope()
-    return runWithContext(() => scope.run(setup))
-  })!
+  const setupStore = runWithContext(() =>
+    pinia._e.run(() => (scope = effectScope()).run(setup)!)
+  )!
 
   // overwrite existing actions to support $onAction
   for (const key in setupStore) {