fix: install devtools plugin after app is set, but revert change for …

…other plugins
vuejs · Jun 25, 2022 · 9ea96a4 · 9ea96a4
1 parent 4c45ec0
commit 9ea96a4
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 36 deletions.
diff --git a/packages/pinia/src/createPinia.ts b/packages/pinia/src/createPinia.ts
@@ -18,7 +18,7 @@ export function createPinia(): Pinia {
   let _p: Pinia['_p'] = []
   // plugins added before calling app.use(pinia)
   let toBeInstalled: PiniaPlugin[] = []
-  let afterInitializeCallbacks: ((app: App) => void)[] = []
+  let onInstallCallbacks: ((app: App) => void)[] = []
   let _a: App | null = null
 
   const pinia: Pinia = markRaw({
@@ -57,16 +57,16 @@ export function createPinia(): Pinia {
       _a = app
 
       if (app) {
-        afterInitializeCallbacks.forEach((cb) => cb(app))
-        afterInitializeCallbacks = []
+        onInstallCallbacks.forEach((cb) => cb(app))
+        onInstallCallbacks = []
       }
     },
 
-    afterAppInit(cb: (app: App) => void) {
+    onInstall(cb: (app: App) => void) {
       if (_a) {
         cb(_a)
       } else {
-        afterInitializeCallbacks.push(cb)
+        onInstallCallbacks.push(cb)
       }
     },
 

diff --git a/packages/pinia/src/devtools/plugin.ts b/packages/pinia/src/devtools/plugin.ts
@@ -521,7 +521,7 @@ export function devtoolsPlugin<
   S extends StateTree = StateTree,
   G /* extends GettersTree<S> */ = _GettersTree<S>,
   A /* extends ActionsTree */ = _ActionsTree
->({ app, store, options }: PiniaPluginContext<Id, S, G, A>) {
+>({ store, options, pinia }: PiniaPluginContext<Id, S, G, A>) {
   // HMR module
   if (store.$id.startsWith('__hot:')) {
     return
@@ -553,9 +553,11 @@ export function devtoolsPlugin<
     }
   }
 
-  addStoreToDevtools(
-    app,
-    // FIXME: is there a way to allow the assignment from Store<Id, S, G, A> to StoreGeneric?
-    store as StoreGeneric
+  pinia.onInstall((app) =>
+    addStoreToDevtools(
+      app,
+      // FIXME: is there a way to allow the assignment from Store<Id, S, G, A> to StoreGeneric?
+      store as StoreGeneric
+    )
   )
 }
diff --git a/packages/pinia/src/rootStore.ts b/packages/pinia/src/rootStore.ts
@@ -58,12 +58,12 @@ export interface Pinia {
   use(plugin: PiniaPlugin): Pinia
 
   /**
-   * Executes callback after pinia._a is set, or immediately, if it is set already
+   * Executes callback after Pinia is installed into Vue app
    *
    * @internal
    * @param cb - callback to execute
    */
-  afterAppInit(cb: (app: App) => void): void
+  onInstall(cb: (app: App) => void): void
 
   /**
    * Installed store plugins

diff --git a/packages/pinia/src/store.ts b/packages/pinia/src/store.ts
@@ -676,36 +676,34 @@ function createSetupStore<
   }
 
   // apply all plugins
-  pinia.afterAppInit((app) => {
-    pinia._p.forEach((extender) => {
-      /* istanbul ignore else */
-      if (__DEV__ && IS_CLIENT) {
-        const extensions = scope.run(() =>
+  pinia._p.forEach((extender) => {
+    /* istanbul ignore else */
+    if (__DEV__ && IS_CLIENT) {
+      const extensions = scope.run(() =>
+        extender({
+          store,
+          app: pinia._a,
+          pinia,
+          options: optionsForPlugin,
+        })
+      )!
+      Object.keys(extensions || {}).forEach((key) =>
+        store._customProperties.add(key)
+      )
+      assign(store, extensions)
+    } else {
+      assign(
+        store,
+        scope.run(() =>
           extender({
             store,
-            app,
+            app: pinia._a,
             pinia,
             options: optionsForPlugin,
           })
         )!
-        Object.keys(extensions || {}).forEach((key) =>
-          store._customProperties.add(key)
-        )
-        assign(store, extensions)
-      } else {
-        assign(
-          store,
-          scope.run(() =>
-            extender({
-              store,
-              app,
-              pinia,
-              options: optionsForPlugin,
-            })
-          )!
-        )
-      }
-    })
+      )
+    }
   })
 
   if (