Merge branch 'master' into optimize-5

Author: huozhi

src/utils/cache.ts

@@ -1,6 +1,6 @@
 import { defaultConfigOptions } from './web-preset'
 import { IS_SERVER } from './env'
-import { UNDEFINED, mergeObjects } from './helper'
+import { UNDEFINED, mergeObjects, noop } from './helper'
 import { internalMutate } from './mutate'
 import { SWRGlobalState } from './global-state'
 import * as revalidateEvents from '../constants/revalidate-events'
@@ -41,6 +41,7 @@ export const initCache = <Data = any>(
     const mutate = internalMutate.bind(UNDEFINED, provider) as ScopedMutator<
       Data
     >
+    let unsubscribe = noop
 
     // Update the state if it's new, or the provider has been extended.
     SWRGlobalState.set(provider, [
@@ -55,7 +56,6 @@ export const initCache = <Data = any>(
 
     // This is a new provider, we need to initialize it and setup DOM events
     // listeners for `focus` and `reconnect` actions.
-    let unscubscibe = () => {}
     if (!IS_SERVER) {
       const releaseFocus = opts.initFocus(
         revalidateAllKeys.bind(
@@ -71,7 +71,7 @@ export const initCache = <Data = any>(
           revalidateEvents.RECONNECT_EVENT
         )
       )
-      unscubscibe = () => {
+      unsubscribe = () => {
         releaseFocus && releaseFocus()
         releaseReconnect && releaseReconnect()
       }
@@ -80,6 +80,6 @@ export const initCache = <Data = any>(
     // We might want to inject an extra layer on top of `provider` in the future,
     // such as key serialization, auto GC, etc.
     // For now, it's just a `Map` interface without any modifications.
-    return [provider, mutate, unscubscibe]
+    return [provider, mutate, unsubscribe]
   }
 }

src/utils/config-context.ts

@@ -1,15 +1,9 @@
-import {
-  createContext,
-  createElement,
-  useContext,
-  useState,
-  FC,
-  useEffect
-} from 'react'
+import { createContext, createElement, useContext, useState, FC } from 'react'
 import { cache as defaultCache } from './config'
 import { initCache } from './cache'
 import { mergeConfigs } from './merge-config'
-import { isFunction, UNDEFINED } from './helper'
+import { UNDEFINED } from './helper'
+import { useIsomorphicLayoutEffect } from './env'
 import {
   SWRConfiguration,
   FullConfiguration,
@@ -32,24 +26,23 @@ const SWRConfig: FC<{
   const provider = value && value.provider
 
   // Use a lazy initialized state to create the cache on first access.
-  const [cacheHandle] = useState(() =>
+  const [cacheContext] = useState(() =>
     provider
       ? initCache(provider(extendedConfig.cache || defaultCache), value)
       : UNDEFINED
   )
 
   // Override the cache if a new provider is given.
-  if (cacheHandle) {
-    extendedConfig.cache = cacheHandle[0]
-    extendedConfig.mutate = cacheHandle[1]
+  if (cacheContext) {
+    extendedConfig.cache = cacheContext[0]
+    extendedConfig.mutate = cacheContext[1]
   }
 
-  useEffect(() => {
-    return () => {
-      const unsubscribe = cacheHandle ? cacheHandle[2] : UNDEFINED
-      isFunction(unsubscribe) && unsubscribe()
-    }
-  }, [])
+  // Unsubscribe events.
+  useIsomorphicLayoutEffect(
+    () => (cacheContext ? cacheContext[2] : UNDEFINED),
+    []
+  )
 
   return createElement(
     SWRConfigContext.Provider,