Unverified Commit ac8b15a4 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Add useRequest hook and RequestContext (#6910)

* Add useRequest hook and RequestContext

* Add useRequest hook and RequestContext

* Fix merge conflict duplicate import
parent bc4e58f0
import * as React from 'react'
export const RequestContext: React.Context<any> = React.createContext(null)
...@@ -9,9 +9,10 @@ import { loadGetInitialProps, isResSent } from '../lib/utils' ...@@ -9,9 +9,10 @@ import { loadGetInitialProps, isResSent } from '../lib/utils'
import Head, { defaultHead } from '../lib/head' import Head, { defaultHead } from '../lib/head'
import Loadable from '../lib/loadable' import Loadable from '../lib/loadable'
import { DataManagerContext } from '../lib/data-manager-context' import { DataManagerContext } from '../lib/data-manager-context'
import { RequestContext } from '../lib/request-context'
import {LoadableContext} from '../lib/loadable-context' import {LoadableContext} from '../lib/loadable-context'
import { RouterContext } from '../lib/router-context' import { RouterContext } from '../lib/router-context'
import { DataManager } from '..//lib/data-manager' import { DataManager } from '../lib/data-manager'
import { import {
getDynamicImportBundles, getDynamicImportBundles,
...@@ -317,21 +318,23 @@ export async function renderToHTML( ...@@ -317,21 +318,23 @@ export async function renderToHTML(
Component: EnhancedComponent, Component: EnhancedComponent,
} = enhanceComponents(options, App, Component) } = enhanceComponents(options, App, Component)
const Application = () => <RouterContext.Provider value={router}> const Application = () => <RequestContext.Provider value={req}>
<DataManagerContext.Provider value={dataManager}> <RouterContext.Provider value={router}>
<IsAmpContext.Provider value={amphtml}> <DataManagerContext.Provider value={dataManager}>
<LoadableContext.Provider <IsAmpContext.Provider value={amphtml}>
value={(moduleName) => reactLoadableModules.push(moduleName)} <LoadableContext.Provider
> value={(moduleName) => reactLoadableModules.push(moduleName)}
<EnhancedApp >
Component={EnhancedComponent} <EnhancedApp
router={router} Component={EnhancedComponent}
{...props} router={router}
/> {...props}
</LoadableContext.Provider> />
</IsAmpContext.Provider> </LoadableContext.Provider>
</DataManagerContext.Provider> </IsAmpContext.Provider>
</RouterContext.Provider> </DataManagerContext.Provider>
</RouterContext.Provider>
</RequestContext.Provider>
const element = <Application/> const element = <Application/>
...@@ -373,19 +376,21 @@ export async function renderToHTML( ...@@ -373,19 +376,21 @@ export async function renderToHTML(
return render( return render(
renderElementToString, renderElementToString,
<RouterContext.Provider value={router}> <RequestContext.Provider value={req}>
<IsAmpContext.Provider value={amphtml}> <RouterContext.Provider value={router}>
<LoadableContext.Provider <IsAmpContext.Provider value={amphtml}>
value={(moduleName) => reactLoadableModules.push(moduleName)} <LoadableContext.Provider
> value={(moduleName) => reactLoadableModules.push(moduleName)}
<EnhancedApp >
Component={EnhancedComponent} <EnhancedApp
router={router} Component={EnhancedComponent}
{...props} router={router}
/> {...props}
</LoadableContext.Provider> />
</IsAmpContext.Provider> </LoadableContext.Provider>
</RouterContext.Provider>, </IsAmpContext.Provider>
</RouterContext.Provider>
</RequestContext.Provider>,
) )
} }
} }
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import React from 'react' import React from 'react'
import _Router from 'next-server/dist/lib/router/router' import _Router from 'next-server/dist/lib/router/router'
import { RouterContext } from 'next-server/dist/lib/router-context' import { RouterContext } from 'next-server/dist/lib/router-context'
import { RequestContext } from 'next-server/dist/lib/request-context'
const SingletonRouter = { const SingletonRouter = {
router: null, // holds the actual router instance router: null, // holds the actual router instance
...@@ -81,6 +82,10 @@ export function useRouter () { ...@@ -81,6 +82,10 @@ export function useRouter () {
return React.useContext(RouterContext) return React.useContext(RouterContext)
} }
export function useRequest () {
return React.useContext(RequestContext)
}
// INTERNAL APIS // INTERNAL APIS
// ------------- // -------------
// (do not use following exports inside the app) // (do not use following exports inside the app)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment