From 459250f951e5b86409be642ad1c4c6a526658f63 Mon Sep 17 00:00:00 2001 From: Eduardo San Martin Morote Date: Fri, 16 Jul 2021 14:55:44 +0200 Subject: [PATCH] chore: remove old code --- src/hmr.ts | 62 ---------------------------------------------------- src/store.ts | 5 +++-- 2 files changed, 3 insertions(+), 64 deletions(-) diff --git a/src/hmr.ts b/src/hmr.ts index ae2cd6a3..ecd1cf1a 100644 --- a/src/hmr.ts +++ b/src/hmr.ts @@ -1,68 +1,6 @@ import { Pinia } from './rootStore' import { Store, StoreDefinition, _Method } from './types' -/** - * Setups the hot module replacement for a `useStore` in a Vite environment. - * - * @param useStore - function created by defineStore - */ -export function setupViteHMR( - useStore: StoreDefinition, - acceptUpdate: _Method, - invalidateUpdate: _Method, - data: any -) { - const initialUseStore = useStore - // @ts-ignore: this would require importing vite types - // import.meta.hot.accept((newModule) => { - - acceptUpdate((newModule) => { - // @ts-ignore - // if (!import.meta.hot) { - // throw new Error('import.meta.hot disappeared') - // } - - const pinia: Pinia | undefined = - (import.meta as any).hot.data.pinia || initialUseStore._pinia - - if (!pinia) { - // this store is still not used - return - } - - // preserve the pinia instance across loads - // @ts-ignore - // import.meta.hot.data.pinia = pinia - data.pinia = pinia - - // console.log('got data', newStore) - for (const exportName in newModule) { - const useStore = newModule[exportName] - // console.log('checking for', exportName) - if (isUseStore(useStore) && pinia._s.has(useStore.$id)) { - // console.log('Accepting update for', useStore.$id) - const id = useStore.$id - - if (id !== initialUseStore.$id) { - console.warn( - `The id of the store changed from "${initialUseStore.$id}" to "${id}". Reloading.` - ) - // @ts-ignore - // return import.meta.hot.invalidate() - return invalidateUpdate() - } - - const existingStore: Store = pinia._s.get(id)! - if (!existingStore) { - console.log(`skipping hmr because store doesn't exist yet`) - return - } - useStore(pinia, existingStore) - } - } - }) -} - export const isUseStore = (fn: any): fn is StoreDefinition => { return typeof fn === 'function' && typeof fn.$id === 'string' } diff --git a/src/store.ts b/src/store.ts index 83defd63..3e15d7c9 100644 --- a/src/store.ts +++ b/src/store.ts @@ -389,8 +389,9 @@ function createSetupStore< } // action } else if (typeof prop === 'function') { - // @ts-expect-error: we are overriding the function - // we avoid wrapping if this a hot module replacement store + // @ts-expect-error: we are overriding the function we avoid wrapping if + // this a hot module replacement store because the hotUpdate method needs + // to do it with the right context setupStore[key] = __DEV__ && hot ? prop : wrapAction(key, prop) if (__DEV__) { -- 2.47.2