Merge branch 'canary' into fix-ts-types-middleware

vercel · May 12, 2022 · 6537494 · 6537494
2 parents 5392515 + 4475de5
commit 6537494
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 51 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -554,7 +554,7 @@ export default async function getBaseWebpackConfig(
                 path
                   .relative(
                     dir,
-                    path.join(NEXT_PROJECT_ROOT_DIST_CLIENT, 'root-next.js')
+                    path.join(NEXT_PROJECT_ROOT_DIST_CLIENT, 'views-next.js')
                   )
                   .replace(/\\/g, '/'),
             }

diff --git a/packages/next/client/root-index.tsx → packages/next/client/views-index.tsx b/packages/next/client/root-index.tsx → packages/next/client/views-index.tsx
@@ -194,11 +194,58 @@ const RSCComponent = (props: any) => {
   )
 }
 
+const ViewRouterContext = React.createContext({})
+
+// TODO: move to client component when handling is implemented
+function ViewRouter({ initialUrl, children }: any) {
+  const initialState = {
+    url: initialUrl,
+  }
+  const previousUrlRef = React.useRef(initialState)
+  const [current, setCurrent] = React.useState(initialState)
+
+  const viewRouter = React.useMemo(() => {
+    return {
+      push: (url: string) => {
+        previousUrlRef.current = current
+        setCurrent({ ...current, url })
+        // TODO: update url eagerly or not?
+        window.history.pushState(current, '', url)
+      },
+      url: current.url,
+    }
+  }, [current])
+
+  // @ts-ignore TODO: for testing
+  window.viewRouter = viewRouter
+
+  console.log({
+    viewRouter,
+    previous: previousUrlRef.current,
+    current,
+  })
+
+  let root
+  if (current.url !== previousUrlRef.current?.url) {
+    // eslint-disable-next-line
+    const data = useServerResponse(current.url)
+    root = data.readRoot()
+  }
+
+  return (
+    <ViewRouterContext.Provider value={viewRouter}>
+      {root ? root : children}
+    </ViewRouterContext.Provider>
+  )
+}
+
 export function hydrate() {
   renderReactElement(appElement!, () => (
     <React.StrictMode>
       <Root>
-        <RSCComponent />
+        <ViewRouter initialUrl={location.pathname}>
+          <RSCComponent />
+        </ViewRouter>
       </Root>
     </React.StrictMode>
   ))

diff --git a/packages/next/client/root-next.js → packages/next/client/views-next.js b/packages/next/client/root-next.js → packages/next/client/views-next.js
@@ -1,4 +1,4 @@
-import { hydrate, version } from './root-index'
+import { hydrate, version } from './views-index'
 
 window.next = {
   version,

diff --git a/packages/next/lib/views-layout.tsx b/packages/next/lib/views-layout.tsx
@@ -1,21 +1,17 @@
 import React from 'react'
 
 export type LayoutProps = {
-  headChildren: any
-  bodyChildren: any
+  children: any
 }
 
-export default function ViewsLayout({
-  headChildren,
-  bodyChildren,
-}: LayoutProps) {
+export default function ViewsLayout({ children }: LayoutProps) {
   return (
     <html>
       <head>
-        {headChildren}
+        {/* TODO: Remove <title> */}
         <title>Test</title>
       </head>
-      <body>{bodyChildren}</body>
+      <body>{children}</body>
     </html>
   )
 }
diff --git a/packages/next/server/node-web-streams-helper.ts b/packages/next/server/node-web-streams-helper.ts
@@ -139,11 +139,13 @@ export function createFlushEffectStream(
 export function renderToInitialStream({
   ReactDOMServer,
   element,
+  streamOptions,
 }: {
   ReactDOMServer: any
   element: React.ReactElement
+  streamOptions?: any
 }): Promise<ReactReadableStream> {
-  return ReactDOMServer.renderToReadableStream(element)
+  return ReactDOMServer.renderToReadableStream(element, streamOptions)
 }
 
 export async function continueFromInitialStream(
@@ -181,30 +183,6 @@ export async function continueFromInitialStream(
   )
 }
 
-export async function renderToStream({
-  ReactDOMServer,
-  element,
-  suffix,
-  dataStream,
-  generateStaticHTML,
-  flushEffectHandler,
-}: {
-  ReactDOMServer: typeof import('react-dom/server')
-  element: React.ReactElement
-  suffix?: string
-  dataStream?: ReadableStream<Uint8Array>
-  generateStaticHTML: boolean
-  flushEffectHandler?: () => string
-}): Promise<ReadableStream<Uint8Array>> {
-  const renderStream = await renderToInitialStream({ ReactDOMServer, element })
-  return continueFromInitialStream(renderStream, {
-    suffix,
-    dataStream,
-    generateStaticHTML,
-    flushEffectHandler,
-  })
-}
-
 export function createSuffixStream(
   suffix: string
 ): TransformStream<Uint8Array, Uint8Array> {

diff --git a/packages/next/server/view-render.tsx b/packages/next/server/view-render.tsx
@@ -326,12 +326,11 @@ export async function renderToHTML(
         }
       }
 
-      // if this is the root layout pass children as bodyChildren prop
+      // if this is the root layout pass children as children prop
       if (!isSubtreeRender && i === 0) {
         return React.createElement(layout.Component, {
           ...props,
-          headChildren: props.headChildren,
-          bodyChildren: React.createElement(
+          children: React.createElement(
             lastComponent || React.Fragment,
             {},
             null
@@ -356,10 +355,8 @@ export async function renderToHTML(
     // }
   }
 
-  const headChildren = !isSubtreeRender
-    ? buildManifest.rootMainFiles.map((src) => (
-        <script src={'/_next/' + src} async key={src} />
-      ))
+  const bootstrapScripts = !isSubtreeRender
+    ? buildManifest.rootMainFiles.map((src) => '/_next/' + src)
     : undefined
 
   let serverComponentsInlinedTransformStream: TransformStream<
@@ -429,7 +426,7 @@ export async function renderToHTML(
   if (renderServerComponentData) {
     return new RenderResult(
       renderToReadableStream(
-        <WrappedComponent headChildren={headChildren} />,
+        <WrappedComponent />,
         serverComponentManifest
       ).pipeThrough(createBufferedTransformStream())
     )
@@ -452,13 +449,16 @@ export async function renderToHTML(
   const bodyResult = async () => {
     const content = (
       <AppContainer>
-        <Component headChildren={headChildren} />
+        <Component />
       </AppContainer>
     )
 
     const renderStream = await renderToInitialStream({
       ReactDOMServer,
       element: content,
+      streamOptions: {
+        bootstrapScripts,
+      },
     })
 
     const flushEffectHandler = (): string => {

diff --git a/test/e2e/views-dir/app/views/(newroot)/layout.server.js b/test/e2e/views-dir/app/views/(newroot)/layout.server.js
@@ -6,14 +6,13 @@ export async function getServerSideProps() {
   }
 }
 
-export default function Root({ headChildren, bodyChildren, world }) {
+export default function Root({ children, world }) {
   return (
     <html className="this-is-another-document-html">
       <head>
-        {headChildren}
         <title>{`hello ${world}`}</title>
       </head>
-      <body className="this-is-another-document-body">{bodyChildren}</body>
+      <body className="this-is-another-document-body">{children}</body>
     </html>
   )
 }
diff --git a/test/e2e/views-dir/app/views/layout.server.js b/test/e2e/views-dir/app/views/layout.server.js
@@ -6,14 +6,13 @@ export async function getServerSideProps() {
   }
 }
 
-export default function Root({ headChildren, bodyChildren, world }) {
+export default function Root({ children, world }) {
   return (
     <html className="this-is-the-document-html">
       <head>
-        {headChildren}
         <title>{`hello ${world}`}</title>
       </head>
-      <body className="this-is-the-document-body">{bodyChildren}</body>
+      <body className="this-is-the-document-body">{children}</body>
     </html>
   )
 }