Unverified Commit 6c7e76b5 authored by Wyatt Johnson's avatar Wyatt Johnson Committed by GitHub

Hybrid App Hooks Support (#41767)

This adapts the new client hooks of `usePathname`, `useSearchParams`,
and `useRouter` to work within the `pages/` directory to aid users
attempting to migrate shared components over to the `app/` directory.

> **Exception:**
> When the pages router is not ready, `useSearchParams` will return an
empty `URLSearchParams`. This mirrors the behavior seen in the `pages/`
directory today in that `router.query` is not available until the client
hydrates.

This also adds a new option for `useRouter` to bring it line with the
correct typings with the app directory. By default, calling
`useRouter()` will return the type `NextRouter | null` to represent what
you get when you call it from a component originating from the app
directory. If you want to instead force it to return `NextRouter` as it
does today, you can pass a boolean into the `useRouter` call as such:

```ts
const router = useRouter()     // typeof router === NextRouter | null
const router = useRouter(true) // typeof router === NextRouter
```

This change is designed to ease the incremental adoption of app.
parent b0ad8adc
...@@ -238,7 +238,6 @@ ...@@ -238,7 +238,6 @@
"no-obj-calls": "warn", "no-obj-calls": "warn",
"no-octal": "warn", "no-octal": "warn",
"no-octal-escape": "warn", "no-octal-escape": "warn",
"no-redeclare": ["warn", { "builtinGlobals": false }],
"no-regex-spaces": "warn", "no-regex-spaces": "warn",
"no-restricted-syntax": [ "no-restricted-syntax": [
"warn", "warn",
...@@ -330,6 +329,10 @@ ...@@ -330,6 +329,10 @@
"react/style-prop-object": "warn", "react/style-prop-object": "warn",
"react-hooks/rules-of-hooks": "error", "react-hooks/rules-of-hooks": "error",
// "@typescript-eslint/non-nullable-type-assertion-style": "warn", // "@typescript-eslint/non-nullable-type-assertion-style": "warn",
"@typescript-eslint/prefer-as-const": "warn" "@typescript-eslint/prefer-as-const": "warn",
"@typescript-eslint/no-redeclare": [
"warn",
{ "builtinGlobals": false, "ignoreDeclarationMerge": true }
]
} }
} }
...@@ -26,7 +26,7 @@ import { ...@@ -26,7 +26,7 @@ import {
// ParamsContext, // ParamsContext,
PathnameContext, PathnameContext,
// LayoutSegmentsContext, // LayoutSegmentsContext,
} from './hooks-client-context' } from '../../shared/lib/hooks-client-context'
import { useReducerWithReduxDevtools } from './use-reducer-with-devtools' import { useReducerWithReduxDevtools } from './use-reducer-with-devtools'
import { ErrorBoundary, GlobalErrorComponent } from './error-boundary' import { ErrorBoundary, GlobalErrorComponent } from './error-boundary'
......
...@@ -19,12 +19,12 @@ import { ...@@ -19,12 +19,12 @@ import {
LayoutRouterContext, LayoutRouterContext,
GlobalLayoutRouterContext, GlobalLayoutRouterContext,
TemplateContext, TemplateContext,
AppRouterContext,
} from '../../shared/lib/app-router-context' } from '../../shared/lib/app-router-context'
import { fetchServerResponse } from './app-router' import { fetchServerResponse } from './app-router'
import { createInfinitePromise } from './infinite-promise' import { createInfinitePromise } from './infinite-promise'
import { ErrorBoundary } from './error-boundary' import { ErrorBoundary } from './error-boundary'
import { matchSegment } from './match-segments' import { matchSegment } from './match-segments'
import { useRouter } from './navigation'
/** /**
* Add refetch marker to router state at the point of the current layout segment. * Add refetch marker to router state at the point of the current layout segment.
...@@ -109,11 +109,13 @@ export function InnerLayoutRouter({ ...@@ -109,11 +109,13 @@ export function InnerLayoutRouter({
path: string path: string
rootLayoutIncluded: boolean rootLayoutIncluded: boolean
}) { }) {
const { const context = useContext(GlobalLayoutRouterContext)
changeByServerResponse, if (!context) {
tree: fullTree, throw new Error('invariant global layout router not mounted')
focusAndScrollRef, }
} = useContext(GlobalLayoutRouterContext)
const { changeByServerResponse, tree: fullTree, focusAndScrollRef } = context
const focusAndScrollElementRef = useRef<HTMLDivElement>(null) const focusAndScrollElementRef = useRef<HTMLDivElement>(null)
useEffect(() => { useEffect(() => {
...@@ -275,7 +277,7 @@ interface RedirectBoundaryProps { ...@@ -275,7 +277,7 @@ interface RedirectBoundaryProps {
} }
function HandleRedirect({ redirect }: { redirect: string }) { function HandleRedirect({ redirect }: { redirect: string }) {
const router = useContext(AppRouterContext) const router = useRouter()
useEffect(() => { useEffect(() => {
router.replace(redirect, {}) router.replace(redirect, {})
...@@ -312,7 +314,7 @@ class RedirectErrorBoundary extends React.Component< ...@@ -312,7 +314,7 @@ class RedirectErrorBoundary extends React.Component<
} }
function RedirectBoundary({ children }: { children: React.ReactNode }) { function RedirectBoundary({ children }: { children: React.ReactNode }) {
const router = useContext(AppRouterContext) const router = useRouter()
return ( return (
<RedirectErrorBoundary router={router}>{children}</RedirectErrorBoundary> <RedirectErrorBoundary router={router}>{children}</RedirectErrorBoundary>
) )
...@@ -389,7 +391,12 @@ export default function OuterLayoutRouter({ ...@@ -389,7 +391,12 @@ export default function OuterLayoutRouter({
notFound: React.ReactNode | undefined notFound: React.ReactNode | undefined
rootLayoutIncluded: boolean rootLayoutIncluded: boolean
}) { }) {
const { childNodes, tree, url } = useContext(LayoutRouterContext) const context = useContext(LayoutRouterContext)
if (!context) {
throw new Error('invariant expected layout router to be mounted')
}
const { childNodes, tree, url } = context
// Get the current parallelRouter cache node // Get the current parallelRouter cache node
let childNodesForParallelRouter = childNodes.get(parallelRouterKey) let childNodesForParallelRouter = childNodes.get(parallelRouterKey)
......
...@@ -11,7 +11,7 @@ import { ...@@ -11,7 +11,7 @@ import {
// ParamsContext, // ParamsContext,
PathnameContext, PathnameContext,
// LayoutSegmentsContext, // LayoutSegmentsContext,
} from './hooks-client-context' } from '../../shared/lib/hooks-client-context'
import { staticGenerationBailout } from './static-generation-bailout' import { staticGenerationBailout } from './static-generation-bailout'
const INTERNAL_URLSEARCHPARAMS_INSTANCE = Symbol( const INTERNAL_URLSEARCHPARAMS_INSTANCE = Symbol(
...@@ -72,9 +72,15 @@ class ReadonlyURLSearchParams { ...@@ -72,9 +72,15 @@ class ReadonlyURLSearchParams {
export function useSearchParams() { export function useSearchParams() {
staticGenerationBailout('useSearchParams') staticGenerationBailout('useSearchParams')
const searchParams = useContext(SearchParamsContext) const searchParams = useContext(SearchParamsContext)
if (!searchParams) {
throw new Error('invariant expected search params to be mounted')
}
// eslint-disable-next-line react-hooks/rules-of-hooks
const readonlySearchParams = useMemo(() => { const readonlySearchParams = useMemo(() => {
return new ReadonlyURLSearchParams(searchParams) return new ReadonlyURLSearchParams(searchParams)
}, [searchParams]) }, [searchParams])
return readonlySearchParams return readonlySearchParams
} }
...@@ -83,7 +89,12 @@ export function useSearchParams() { ...@@ -83,7 +89,12 @@ export function useSearchParams() {
*/ */
export function usePathname(): string { export function usePathname(): string {
staticGenerationBailout('usePathname') staticGenerationBailout('usePathname')
return useContext(PathnameContext) const pathname = useContext(PathnameContext)
if (pathname === null) {
throw new Error('invariant expected pathname to be mounted')
}
return pathname
} }
// TODO-APP: getting all params when client-side navigating is non-trivial as it does not have route matchers so this might have to be a server context instead. // TODO-APP: getting all params when client-side navigating is non-trivial as it does not have route matchers so this might have to be a server context instead.
...@@ -106,7 +117,12 @@ export { ...@@ -106,7 +117,12 @@ export {
* Get the router methods. For example router.push('/dashboard') * Get the router methods. For example router.push('/dashboard')
*/ */
export function useRouter(): import('../../shared/lib/app-router-context').AppRouterInstance { export function useRouter(): import('../../shared/lib/app-router-context').AppRouterInstance {
return useContext(AppRouterContext) const router = useContext(AppRouterContext)
if (router === null) {
throw new Error('invariant expected app router to be mounted')
}
return router
} }
// TODO-APP: handle parallel routes // TODO-APP: handle parallel routes
......
...@@ -36,6 +36,16 @@ import { ImageConfigContext } from '../shared/lib/image-config-context' ...@@ -36,6 +36,16 @@ import { ImageConfigContext } from '../shared/lib/image-config-context'
import { ImageConfigComplete } from '../shared/lib/image-config' import { ImageConfigComplete } from '../shared/lib/image-config'
import { removeBasePath } from './remove-base-path' import { removeBasePath } from './remove-base-path'
import { hasBasePath } from './has-base-path' import { hasBasePath } from './has-base-path'
import { AppRouterContext } from '../shared/lib/app-router-context'
import {
adaptForAppRouterInstance,
adaptForPathname,
adaptForSearchParams,
} from '../shared/lib/router/adapters'
import {
PathnameContext,
SearchParamsContext,
} from '../shared/lib/hooks-client-context'
/// <reference types="react-dom/experimental" /> /// <reference types="react-dom/experimental" />
...@@ -304,15 +314,23 @@ function AppContainer({ ...@@ -304,15 +314,23 @@ function AppContainer({
) )
} }
> >
<RouterContext.Provider value={makePublicRouterInstance(router)}> <AppRouterContext.Provider value={adaptForAppRouterInstance(router)}>
<HeadManagerContext.Provider value={headManager}> <SearchParamsContext.Provider value={adaptForSearchParams(router)}>
<ImageConfigContext.Provider <PathnameContext.Provider value={adaptForPathname(asPath)}>
value={process.env.__NEXT_IMAGE_OPTS as any as ImageConfigComplete} <RouterContext.Provider value={makePublicRouterInstance(router)}>
> <HeadManagerContext.Provider value={headManager}>
{children} <ImageConfigContext.Provider
</ImageConfigContext.Provider> value={
</HeadManagerContext.Provider> process.env.__NEXT_IMAGE_OPTS as any as ImageConfigComplete
</RouterContext.Provider> }
>
{children}
</ImageConfigContext.Provider>
</HeadManagerContext.Provider>
</RouterContext.Provider>
</PathnameContext.Provider>
</SearchParamsContext.Provider>
</AppRouterContext.Provider>
</Container> </Container>
) )
} }
......
This diff is collapsed.
...@@ -17,7 +17,7 @@ const nextjsRouteAnnouncerStyles: React.CSSProperties = { ...@@ -17,7 +17,7 @@ const nextjsRouteAnnouncerStyles: React.CSSProperties = {
} }
export const RouteAnnouncer = () => { export const RouteAnnouncer = () => {
const { asPath } = useRouter() const { asPath } = useRouter(true)
const [routeAnnouncement, setRouteAnnouncement] = React.useState('') const [routeAnnouncement, setRouteAnnouncement] = React.useState('')
// Only announce the path change, but not for the first load because screen // Only announce the path change, but not for the first load because screen
......
...@@ -129,8 +129,15 @@ export default singletonRouter as SingletonRouter ...@@ -129,8 +129,15 @@ export default singletonRouter as SingletonRouter
// Reexport the withRoute HOC // Reexport the withRoute HOC
export { default as withRouter } from './with-router' export { default as withRouter } from './with-router'
export function useRouter(): NextRouter { export function useRouter(throwOnMissing: true): NextRouter
return React.useContext(RouterContext) export function useRouter(): NextRouter | null
export function useRouter(throwOnMissing?: boolean) {
const router = React.useContext(RouterContext)
if (!router && throwOnMissing) {
throw new Error('invariant expected pages router to be mounted')
}
return router
} }
// INTERNAL APIS // INTERNAL APIS
......
...@@ -82,6 +82,16 @@ import { ...@@ -82,6 +82,16 @@ import {
import { ImageConfigContext } from '../shared/lib/image-config-context' import { ImageConfigContext } from '../shared/lib/image-config-context'
import stripAnsi from 'next/dist/compiled/strip-ansi' import stripAnsi from 'next/dist/compiled/strip-ansi'
import { stripInternalQueries } from './internal-utils' import { stripInternalQueries } from './internal-utils'
import {
adaptForAppRouterInstance,
adaptForPathname,
adaptForSearchParams,
} from '../shared/lib/router/adapters'
import { AppRouterContext } from '../shared/lib/app-router-context'
import {
PathnameContext,
SearchParamsContext,
} from '../shared/lib/hooks-client-context'
let tryGetPreviewData: typeof import('./api-utils/node').tryGetPreviewData let tryGetPreviewData: typeof import('./api-utils/node').tryGetPreviewData
let warn: typeof import('../build/output/log').warn let warn: typeof import('../build/output/log').warn
...@@ -168,6 +178,9 @@ class ServerRouter implements NextRouter { ...@@ -168,6 +178,9 @@ class ServerRouter implements NextRouter {
back() { back() {
noRouter() noRouter()
} }
forward(): void {
noRouter()
}
prefetch(): any { prefetch(): any {
noRouter() noRouter()
} }
...@@ -582,6 +595,8 @@ export async function renderToHTML( ...@@ -582,6 +595,8 @@ export async function renderToHTML(
getRequestMeta(req, '__nextIsLocaleDomain') getRequestMeta(req, '__nextIsLocaleDomain')
) )
const appRouter = adaptForAppRouterInstance(router)
let scriptLoader: any = {} let scriptLoader: any = {}
const jsxStyleRegistry = createStyleRegistry() const jsxStyleRegistry = createStyleRegistry()
const ampState = { const ampState = {
...@@ -604,32 +619,38 @@ export async function renderToHTML( ...@@ -604,32 +619,38 @@ export async function renderToHTML(
} }
const AppContainer = ({ children }: { children: JSX.Element }) => ( const AppContainer = ({ children }: { children: JSX.Element }) => (
<RouterContext.Provider value={router}> <AppRouterContext.Provider value={appRouter}>
<AmpStateContext.Provider value={ampState}> <SearchParamsContext.Provider value={adaptForSearchParams(router)}>
<HeadManagerContext.Provider <PathnameContext.Provider value={adaptForPathname(asPath)}>
value={{ <RouterContext.Provider value={router}>
updateHead: (state) => { <AmpStateContext.Provider value={ampState}>
head = state <HeadManagerContext.Provider
}, value={{
updateScripts: (scripts) => { updateHead: (state) => {
scriptLoader = scripts head = state
}, },
scripts: initialScripts, updateScripts: (scripts) => {
mountedInstances: new Set(), scriptLoader = scripts
}} },
> scripts: initialScripts,
<LoadableContext.Provider mountedInstances: new Set(),
value={(moduleName) => reactLoadableModules.push(moduleName)} }}
> >
<StyleRegistry registry={jsxStyleRegistry}> <LoadableContext.Provider
<ImageConfigContext.Provider value={images}> value={(moduleName) => reactLoadableModules.push(moduleName)}
{children} >
</ImageConfigContext.Provider> <StyleRegistry registry={jsxStyleRegistry}>
</StyleRegistry> <ImageConfigContext.Provider value={images}>
</LoadableContext.Provider> {children}
</HeadManagerContext.Provider> </ImageConfigContext.Provider>
</AmpStateContext.Provider> </StyleRegistry>
</RouterContext.Provider> </LoadableContext.Provider>
</HeadManagerContext.Provider>
</AmpStateContext.Provider>
</RouterContext.Provider>
</PathnameContext.Provider>
</SearchParamsContext.Provider>
</AppRouterContext.Provider>
) )
// The `useId` API uses the path indexes to generate an ID for each node. // The `useId` API uses the path indexes to generate an ID for each node.
......
...@@ -59,8 +59,8 @@ export interface AppRouterInstance { ...@@ -59,8 +59,8 @@ export interface AppRouterInstance {
prefetch(href: string): void prefetch(href: string): void
} }
export const AppRouterContext = React.createContext<AppRouterInstance>( export const AppRouterContext = React.createContext<AppRouterInstance | null>(
null as any null
) )
export const LayoutRouterContext = React.createContext<{ export const LayoutRouterContext = React.createContext<{
childNodes: CacheNode['parallelRoutes'] childNodes: CacheNode['parallelRoutes']
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
import { createContext } from 'react' import { createContext } from 'react'
export const SearchParamsContext = createContext<URLSearchParams>(null as any) export const SearchParamsContext = createContext<URLSearchParams | null>(null)
export const PathnameContext = createContext<string>(null as any) export const PathnameContext = createContext<string | null>(null)
export const ParamsContext = createContext(null as any) export const ParamsContext = createContext(null as any)
export const LayoutSegmentsContext = createContext(null as any) export const LayoutSegmentsContext = createContext(null as any)
......
...@@ -9,7 +9,7 @@ declare namespace LoadableExport { ...@@ -9,7 +9,7 @@ declare namespace LoadableExport {
} }
} }
// eslint-disable-next-line no-redeclare // eslint-disable-next-line @typescript-eslint/no-redeclare
declare const LoadableExport: LoadableExport.ILoadable declare const LoadableExport: LoadableExport.ILoadable
export = LoadableExport export = LoadableExport
import React from 'react' import React from 'react'
import type { NextRouter } from './router/router' import type { NextRouter } from './router/router'
export const RouterContext = React.createContext<NextRouter>(null as any) export const RouterContext = React.createContext<NextRouter | null>(null)
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
RouterContext.displayName = 'RouterContext' RouterContext.displayName = 'RouterContext'
......
import type { ParsedUrlQuery } from 'node:querystring'
import { AppRouterInstance } from '../app-router-context'
import { NextRouter } from './router'
/**
* adaptForAppRouterInstance implements the AppRouterInstance with a NextRouter.
*
* @param router the NextRouter to adapt
* @returns an AppRouterInstance
*/
export function adaptForAppRouterInstance(
router: NextRouter
): AppRouterInstance {
return {
back(): void {
router.back()
},
forward(): void {
router.forward()
},
refresh(): void {
router.reload()
},
push(href: string): void {
void router.push(href)
},
replace(href: string): void {
void router.replace(href)
},
prefetch(href: string): void {
void router.prefetch(href)
},
}
}
/**
* transforms the ParsedUrlQuery into a URLSearchParams.
*
* @param query the query to transform
* @returns URLSearchParams
*/
function transformQuery(query: ParsedUrlQuery): URLSearchParams {
const params = new URLSearchParams()
for (const [name, value] of Object.entries(query)) {
if (Array.isArray(value)) {
for (const val of value) {
params.append(name, val)
}
} else if (typeof value !== 'undefined') {
params.append(name, value)
}
}
return params
}
/**
* adaptForSearchParams transforms the ParsedURLQuery into URLSearchParams.
*
* @param router the router that contains the query.
* @returns the search params in the URLSearchParams format
*/
export function adaptForSearchParams(router: NextRouter): URLSearchParams {
if (!router.isReady || !router.query) {
return new URLSearchParams()
}
return transformQuery(router.query)
}
/**
* adaptForPathname adapts the `asPath` parameter from the router to a pathname.
*
* @param asPath the asPath parameter to transform that comes from the router
* @returns pathname part of `asPath`
*/
export function adaptForPathname(asPath: string): string {
const url = new URL(asPath, 'http://f')
return url.pathname
}
...@@ -122,11 +122,11 @@ function stripOrigin(url: string) { ...@@ -122,11 +122,11 @@ function stripOrigin(url: string) {
return url.startsWith(origin) ? url.substring(origin.length) : url return url.startsWith(origin) ? url.substring(origin.length) : url
} }
function omit<T extends { [key: string]: any }, K extends keyof T>( function omit<T extends { [key: string]: unknown }, K extends keyof T>(
object: T, object: T,
keys: K[] keys: K[]
): Omit<T, K> { ): Omit<T, K> {
const omitted: { [key: string]: any } = {} const omitted: { [key: string]: unknown } = {}
Object.keys(object).forEach((key) => { Object.keys(object).forEach((key) => {
if (!keys.includes(key as K)) { if (!keys.includes(key as K)) {
omitted[key] = object[key] omitted[key] = object[key]
...@@ -259,6 +259,7 @@ export function resolveHref( ...@@ -259,6 +259,7 @@ export function resolveHref(
// fallback to / for invalid asPath values e.g. // // fallback to / for invalid asPath values e.g. //
base = new URL('/', 'http://n') base = new URL('/', 'http://n')
} }
try { try {
const finalUrl = new URL(urlAsString, base) const finalUrl = new URL(urlAsString, base)
finalUrl.pathname = normalizePathTrailingSlash(finalUrl.pathname) finalUrl.pathname = normalizePathTrailingSlash(finalUrl.pathname)
...@@ -542,6 +543,7 @@ export type NextRouter = BaseRouter & ...@@ -542,6 +543,7 @@ export type NextRouter = BaseRouter &
| 'replace' | 'replace'
| 'reload' | 'reload'
| 'back' | 'back'
| 'forward'
| 'prefetch' | 'prefetch'
| 'beforePopState' | 'beforePopState'
| 'events' | 'events'
...@@ -1137,6 +1139,13 @@ export default class Router implements BaseRouter { ...@@ -1137,6 +1139,13 @@ export default class Router implements BaseRouter {
window.history.back() window.history.back()
} }
/**
* Go forward in history
*/
forward() {
window.history.forward()
}
/** /**
* Performs a `pushState` with arguments * Performs a `pushState` with arguments
* @param url of the route * @param url of the route
......
import { useRouter as usePagesRouter } from 'next/router'
import {
usePathname,
useRouter as useAppRouter,
useSearchParams,
} from 'next/navigation'
import { useState, useEffect } from 'react'
export const RouterHooksFixtures = () => {
const pagesRouter = usePagesRouter()
const appRouter = useAppRouter()
const searchParams = useSearchParams()
const pathname = usePathname()
const [value, setValue] = useState(null)
useEffect(() => {
if (!pagesRouter.isReady) {
return
}
setValue(searchParams.get('key'))
}, [pagesRouter.isReady, searchParams])
const onClick = () => {
appRouter.push('/adapter-hooks/pushed')
}
return (
<div id={pagesRouter.isReady ? 'router-ready' : 'router-not-ready'}>
<div id="key-value">{value}</div>
<div id="pathname">{pathname}</div>
<button type="button" onClick={onClick}>
Push
</button>
</div>
)
}
import { RouterHooksFixtures } from '../../components/router-hooks-fixtures'
export default function Page() {
return <RouterHooksFixtures />
}
import { RouterHooksFixtures } from '../../../components/router-hooks-fixtures'
export default function Page() {
return <RouterHooksFixtures />
}
export const getStaticProps = () => {
return { props: {} }
}
export const getStaticPaths = () => {
return { fallback: 'blocking', paths: [{ params: { id: '1' } }] }
}
export default function Page() {
return <div id="pushed" />
}
import { RouterHooksFixtures } from '../../components/router-hooks-fixtures'
export default function Page() {
return <RouterHooksFixtures />
}
export const getStaticProps = () => {
return { props: {} }
}
...@@ -1148,6 +1148,42 @@ describe('app dir', () => { ...@@ -1148,6 +1148,42 @@ describe('app dir', () => {
describe('client components', () => { describe('client components', () => {
describe('hooks', () => { describe('hooks', () => {
describe('from pages', () => {
it.each([
{ pathname: '/adapter-hooks/static' },
{ pathname: '/adapter-hooks/1' },
{ pathname: '/adapter-hooks/2' },
{ pathname: '/adapter-hooks/1/account' },
{ pathname: '/adapter-hooks/static', keyValue: 'value' },
{ pathname: '/adapter-hooks/1', keyValue: 'value' },
{ pathname: '/adapter-hooks/2', keyValue: 'value' },
{ pathname: '/adapter-hooks/1/account', keyValue: 'value' },
])(
'should have the correct hooks',
async ({ pathname, keyValue = '' }) => {
const browser = await webdriver(
next.url,
pathname + (keyValue ? `?key=${keyValue}` : '')
)
try {
await browser.waitForElementByCss('#router-ready')
expect(await browser.elementById('key-value').text()).toBe(
keyValue
)
expect(await browser.elementById('pathname').text()).toBe(
pathname
)
await browser.elementByCss('button').click()
await browser.waitForElementByCss('#pushed')
} finally {
await browser.close()
}
}
)
})
describe('usePathname', () => { describe('usePathname', () => {
it('should have the correct pathname', async () => { it('should have the correct pathname', async () => {
const html = await renderViaHTTP(next.url, '/hooks/use-pathname') const html = await renderViaHTTP(next.url, '/hooks/use-pathname')
......
...@@ -31,7 +31,7 @@ class Test2 extends Test { ...@@ -31,7 +31,7 @@ class Test2 extends Test {
new Test2().show() new Test2().show()
export default function HelloPage(): JSX.Element { export default function HelloPage(): JSX.Element {
const router = useRouter() const router = useRouter(true)
console.log(process.browser) console.log(process.browser)
console.log(router.pathname) console.log(router.pathname)
console.log(router.isReady) console.log(router.isReady)
......
...@@ -142,6 +142,7 @@ export default function EvilPage(): JSX.Element { ...@@ -142,6 +142,7 @@ export default function EvilPage(): JSX.Element {
try { try {
errorPage.replace('static ', 'static async ') errorPage.replace('static ', 'static async ')
const output = await nextBuild(appDir, [], { stdout: true }) const output = await nextBuild(appDir, [], { stdout: true })
expect(output.stdout).toMatch(/Compiled successfully/) expect(output.stdout).toMatch(/Compiled successfully/)
} finally { } finally {
errorPage.restore() errorPage.restore()
...@@ -153,6 +154,7 @@ export default function EvilPage(): JSX.Element { ...@@ -153,6 +154,7 @@ export default function EvilPage(): JSX.Element {
try { try {
page.replace(/async \(/g, '(') page.replace(/async \(/g, '(')
const output = await nextBuild(appDir, [], { stdout: true }) const output = await nextBuild(appDir, [], { stdout: true })
expect(output.stdout).toMatch(/Compiled successfully/) expect(output.stdout).toMatch(/Compiled successfully/)
} finally { } finally {
page.restore() page.restore()
......
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