Unverified Commit f0d56190 authored by Shu Ding's avatar Shu Ding Committed by GitHub

Fix injecting CSS link tags before page content (#38559)

* inject the link tags before page content in layout router

* fix flight handling during client navigation

* fix buffering
Co-authored-by: 's avatarkodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
parent 11825da7
...@@ -32,10 +32,13 @@ self.__next_require__ = __webpack_require__ ...@@ -32,10 +32,13 @@ self.__next_require__ = __webpack_require__
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
;(self as any).__next_chunk_load__ = (chunk: string) => { ;(self as any).__next_chunk_load__ = (chunk: string) => {
if (chunk.endsWith('.css')) { if (chunk.endsWith('.css')) {
const link = document.createElement('link') const existingTag = document.querySelector(`link[href="${chunk}"]`)
link.rel = 'stylesheet' if (!existingTag) {
link.href = '/_next/' + chunk const link = document.createElement('link')
document.head.appendChild(link) link.rel = 'stylesheet'
link.href = '/_next/' + chunk
document.head.appendChild(link)
}
return Promise.resolve() return Promise.resolve()
} }
...@@ -169,12 +172,12 @@ function useInitialServerResponse(cacheKey: string) { ...@@ -169,12 +172,12 @@ function useInitialServerResponse(cacheKey: string) {
} }
const loadCssFromStreamData = (data: string) => { const loadCssFromStreamData = (data: string) => {
const seg = data.split(':') if (data.startsWith('CSS:')) {
if (seg[0] === 'CSS') { loadCss(data.slice(4).trim())
loadCss(seg.slice(1).join(':'))
} }
} }
// TODO-APP: Refine the buffering code here to make it more correct.
let buffer = '' let buffer = ''
const loadCssFromFlight = new TransformStream({ const loadCssFromFlight = new TransformStream({
transform(chunk, controller) { transform(chunk, controller) {
...@@ -182,12 +185,17 @@ function useInitialServerResponse(cacheKey: string) { ...@@ -182,12 +185,17 @@ function useInitialServerResponse(cacheKey: string) {
buffer += data buffer += data
let index let index
while ((index = buffer.indexOf('\n')) !== -1) { while ((index = buffer.indexOf('\n')) !== -1) {
const line = buffer.slice(0, index) const line = buffer.slice(0, index + 1)
buffer = buffer.slice(index + 1) buffer = buffer.slice(index + 1)
loadCssFromStreamData(line) if (line.startsWith('CSS:')) {
loadCssFromStreamData(line)
} else {
controller.enqueue(new TextEncoder().encode(line))
}
} }
if (!data.startsWith('CSS:')) { if (buffer && !buffer.startsWith('CSS:')) {
controller.enqueue(chunk) controller.enqueue(new TextEncoder().encode(buffer))
buffer = ''
} }
}, },
flush() { flush() {
......
import React, { useEffect } from 'react' import React, { useEffect } from 'react'
import { createFromFetch } from 'next/dist/compiled/react-server-dom-webpack' import { createFromReadableStream } from 'next/dist/compiled/react-server-dom-webpack'
import { import {
AppRouterContext, AppRouterContext,
AppTreeContext, AppTreeContext,
...@@ -16,16 +16,67 @@ import { ...@@ -16,16 +16,67 @@ import {
// LayoutSegmentsContext, // LayoutSegmentsContext,
} from './hooks-client-context' } from './hooks-client-context'
function fetchFlight( async function loadCss(cssChunkInfoJson: string) {
url: URL, const data = JSON.parse(cssChunkInfoJson)
flightRouterStateData: string await Promise.all(
): Promise<Response> { data.chunks.map((chunkId: string) => {
// load css related chunks
return (self as any).__next_chunk_load__(chunkId)
})
)
// In development mode, import css in dev when it's wrapped by style loader.
// In production mode, css are standalone chunk that doesn't need to be imported.
if (data.id) {
;(self as any).__next_require__(data.id)
}
}
const loadCssFromStreamData = (data: string) => {
if (data.startsWith('CSS:')) {
loadCss(data.slice(4).trim())
}
}
function fetchFlight(url: URL, flightRouterStateData: string): ReadableStream {
const flightUrl = new URL(url) const flightUrl = new URL(url)
const searchParams = flightUrl.searchParams const searchParams = flightUrl.searchParams
searchParams.append('__flight__', '1') searchParams.append('__flight__', '1')
searchParams.append('__flight_router_state_tree__', flightRouterStateData) searchParams.append('__flight_router_state_tree__', flightRouterStateData)
return fetch(flightUrl.toString()) const { readable, writable } = new TransformStream()
// TODO-APP: Refine the buffering code here to make it more correct.
let buffer = ''
const loadCssFromFlight = new TransformStream({
transform(chunk, controller) {
const data = new TextDecoder().decode(chunk)
buffer += data
let index
while ((index = buffer.indexOf('\n')) !== -1) {
const line = buffer.slice(0, index + 1)
buffer = buffer.slice(index + 1)
if (line.startsWith('CSS:')) {
loadCssFromStreamData(line)
} else {
controller.enqueue(new TextEncoder().encode(line))
}
}
if (buffer && !buffer.startsWith('CSS:')) {
controller.enqueue(new TextEncoder().encode(buffer))
buffer = ''
}
},
flush() {
loadCssFromStreamData(buffer)
},
})
fetch(flightUrl.toString()).then((res) => {
res.body?.pipeThrough(loadCssFromFlight).pipeTo(writable)
})
return readable
} }
export function fetchServerResponse( export function fetchServerResponse(
...@@ -33,7 +84,7 @@ export function fetchServerResponse( ...@@ -33,7 +84,7 @@ export function fetchServerResponse(
flightRouterState: FlightRouterState flightRouterState: FlightRouterState
): { readRoot: () => FlightData } { ): { readRoot: () => FlightData } {
const flightRouterStateData = JSON.stringify(flightRouterState) const flightRouterStateData = JSON.stringify(flightRouterState)
return createFromFetch(fetchFlight(url, flightRouterStateData)) return createFromReadableStream(fetchFlight(url, flightRouterStateData))
} }
function ErrorOverlay({ function ErrorOverlay({
...@@ -56,11 +107,13 @@ let initialParallelRoutes: CacheNode['parallelRoutes'] = ...@@ -56,11 +107,13 @@ let initialParallelRoutes: CacheNode['parallelRoutes'] =
export default function AppRouter({ export default function AppRouter({
initialTree, initialTree,
initialCanonicalUrl, initialCanonicalUrl,
initialStylesheets,
children, children,
hotReloader, hotReloader,
}: { }: {
initialTree: FlightRouterState initialTree: FlightRouterState
initialCanonicalUrl: string initialCanonicalUrl: string
initialStylesheets: string[]
children: React.ReactNode children: React.ReactNode
hotReloader?: React.ReactNode hotReloader?: React.ReactNode
}) { }) {
...@@ -259,6 +312,7 @@ export default function AppRouter({ ...@@ -259,6 +312,7 @@ export default function AppRouter({
// Root node always has `url` // Root node always has `url`
// Provided in AppTreeContext to ensure it can be overwritten in layout-router // Provided in AppTreeContext to ensure it can be overwritten in layout-router
url: canonicalUrl, url: canonicalUrl,
stylesheets: initialStylesheets,
}} }}
> >
<ErrorOverlay>{cache.subTreeData}</ErrorOverlay> <ErrorOverlay>{cache.subTreeData}</ErrorOverlay>
......
...@@ -235,7 +235,7 @@ export default function OuterLayoutRouter({ ...@@ -235,7 +235,7 @@ export default function OuterLayoutRouter({
childProp: ChildProp childProp: ChildProp
loading: React.ReactNode | undefined loading: React.ReactNode | undefined
}) { }) {
const { childNodes, tree, url } = useContext(AppTreeContext) const { childNodes, tree, url, stylesheets } = useContext(AppTreeContext)
let childNodesForParallelRouter = childNodes.get(parallelRouterKey) let childNodesForParallelRouter = childNodes.get(parallelRouterKey)
if (!childNodesForParallelRouter) { if (!childNodesForParallelRouter) {
...@@ -256,6 +256,11 @@ export default function OuterLayoutRouter({ ...@@ -256,6 +256,11 @@ export default function OuterLayoutRouter({
return ( return (
<> <>
{stylesheets
? stylesheets.map((href) => (
<link rel="stylesheet" href={`/_next/${href}`} key={href} />
))
: null}
{preservedSegments.map((preservedSegment) => { {preservedSegments.map((preservedSegment) => {
return ( return (
<LoadingBoundary loading={loading} key={preservedSegment}> <LoadingBoundary loading={loading} key={preservedSegment}>
......
...@@ -209,7 +209,7 @@ function createServerComponentRenderer( ...@@ -209,7 +209,7 @@ function createServerComponentRenderer(
} }
const writable = transformStream.writable const writable = transformStream.writable
const ServerComponentWrapper = () => { return function ServerComponentWrapper() {
const reqStream = createRSCStream() const reqStream = createRSCStream()
const response = useFlightResponse( const response = useFlightResponse(
writable, writable,
...@@ -218,11 +218,8 @@ function createServerComponentRenderer( ...@@ -218,11 +218,8 @@ function createServerComponentRenderer(
serverComponentManifest, serverComponentManifest,
cssFlightData cssFlightData
) )
const root = response.readRoot() return response.readRoot()
return root
} }
return ServerComponentWrapper
} }
type DynamicParamTypes = 'catchall' | 'optional-catchall' | 'dynamic' type DynamicParamTypes = 'catchall' | 'optional-catchall' | 'dynamic'
...@@ -327,6 +324,26 @@ function getSegmentParam(segment: string): { ...@@ -327,6 +324,26 @@ function getSegmentParam(segment: string): {
return null return null
} }
function getCSSInlinedLinkTags(
ComponentMod: any,
serverComponentManifest: any
) {
const importedServerCSSFiles: string[] =
ComponentMod.__client__?.__next_rsc_css__ || []
return Array.from(
new Set(
importedServerCSSFiles
.map((css) =>
css.endsWith('.css')
? serverComponentManifest[css].default.chunks
: []
)
.flat()
)
)
}
function getCssFlightData(ComponentMod: any, serverComponentManifest: any) { function getCssFlightData(ComponentMod: any, serverComponentManifest: any) {
const importedServerCSSFiles: string[] = const importedServerCSSFiles: string[] =
ComponentMod.__client__?.__next_rsc_css__ || [] ComponentMod.__client__?.__next_rsc_css__ || []
...@@ -335,7 +352,7 @@ function getCssFlightData(ComponentMod: any, serverComponentManifest: any) { ...@@ -335,7 +352,7 @@ function getCssFlightData(ComponentMod: any, serverComponentManifest: any) {
(css) => serverComponentManifest[css].default (css) => serverComponentManifest[css].default
) )
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
return cssFiles.map((css) => `CSS:${JSON.stringify(css)}`).join('\n') return cssFiles.map((css) => `CSS:${JSON.stringify(css)}`).join('\n') + '\n'
} }
// Multiple css chunks could be merged into one by mini-css-extract-plugin, // Multiple css chunks could be merged into one by mini-css-extract-plugin,
...@@ -345,10 +362,7 @@ function getCssFlightData(ComponentMod: any, serverComponentManifest: any) { ...@@ -345,10 +362,7 @@ function getCssFlightData(ComponentMod: any, serverComponentManifest: any) {
return res return res
}, new Set()) }, new Set())
const cssFlight = Array.from(cssSet) return `CSS:${JSON.stringify({ chunks: [...cssSet] })}\n`
.map((css) => `CSS:${JSON.stringify({ chunks: [css] })}`)
.join('\n')
return cssFlight
} }
export async function renderToHTML( export async function renderToHTML(
...@@ -793,6 +807,11 @@ export async function renderToHTML( ...@@ -793,6 +807,11 @@ export async function renderToHTML(
// /blog/[slug] /blog/hello-world -> ['children', 'blog', 'children', ['slug', 'hello-world']] // /blog/[slug] /blog/hello-world -> ['children', 'blog', 'children', ['slug', 'hello-world']]
const initialTree = createFlightRouterStateFromLoaderTree(tree) const initialTree = createFlightRouterStateFromLoaderTree(tree)
const initialStylesheets = getCSSInlinedLinkTags(
ComponentMod,
serverComponentManifest
)
const { Component: ComponentTree } = createComponentTree({ const { Component: ComponentTree } = createComponentTree({
createSegmentPath: (child) => child, createSegmentPath: (child) => child,
tree, tree,
...@@ -818,6 +837,7 @@ export async function renderToHTML( ...@@ -818,6 +837,7 @@ export async function renderToHTML(
hotReloader={HotReloader && <HotReloader assetPrefix="" />} hotReloader={HotReloader && <HotReloader assetPrefix="" />}
initialCanonicalUrl={initialCanonicalUrl} initialCanonicalUrl={initialCanonicalUrl}
initialTree={initialTree} initialTree={initialTree}
initialStylesheets={initialStylesheets}
> >
<ComponentTree /> <ComponentTree />
</AppRouter> </AppRouter>
...@@ -896,7 +916,6 @@ export async function renderToHTML( ...@@ -896,7 +916,6 @@ export async function renderToHTML(
} }
return await continueFromInitialStream(renderStream, { return await continueFromInitialStream(renderStream, {
suffix: '',
dataStream: serverComponentsInlinedTransformStream?.readable, dataStream: serverComponentsInlinedTransformStream?.readable,
generateStaticHTML: generateStaticHTML || !hasConcurrentFeatures, generateStaticHTML: generateStaticHTML || !hasConcurrentFeatures,
flushEffectHandler, flushEffectHandler,
......
...@@ -172,7 +172,7 @@ export async function continueFromInitialStream( ...@@ -172,7 +172,7 @@ export async function continueFromInitialStream(
const transforms: Array<TransformStream<Uint8Array, Uint8Array>> = [ const transforms: Array<TransformStream<Uint8Array, Uint8Array>> = [
createBufferedTransformStream(), createBufferedTransformStream(),
flushEffectHandler ? createFlushEffectStream(flushEffectHandler) : null, flushEffectHandler ? createFlushEffectStream(flushEffectHandler) : null,
suffixUnclosed != null ? createPrefixStream(suffixUnclosed) : null, suffixUnclosed != null ? createDeferredPrefixStream(suffixUnclosed) : null,
dataStream ? createInlineDataStream(dataStream) : null, dataStream ? createInlineDataStream(dataStream) : null,
suffixUnclosed != null ? createSuffixStream(closeTag) : null, suffixUnclosed != null ? createSuffixStream(closeTag) : null,
].filter(nonNullable) ].filter(nonNullable)
...@@ -197,6 +197,21 @@ export function createSuffixStream( ...@@ -197,6 +197,21 @@ export function createSuffixStream(
export function createPrefixStream( export function createPrefixStream(
prefix: string prefix: string
): TransformStream<Uint8Array, Uint8Array> {
let prefixEnqueued = false
return new TransformStream({
transform(chunk, controller) {
if (!prefixEnqueued) {
controller.enqueue(encodeText(prefix))
prefixEnqueued = true
}
controller.enqueue(chunk)
},
})
}
export function createDeferredPrefixStream(
prefix: string
): TransformStream<Uint8Array, Uint8Array> { ): TransformStream<Uint8Array, Uint8Array> {
let prefixFlushed = false let prefixFlushed = false
let prefixPrefixFlushFinished: Promise<void> | null = null let prefixPrefixFlushFinished: Promise<void> | null = null
......
...@@ -28,6 +28,7 @@ export const AppTreeContext = React.createContext<{ ...@@ -28,6 +28,7 @@ export const AppTreeContext = React.createContext<{
childNodes: CacheNode['parallelRoutes'] childNodes: CacheNode['parallelRoutes']
tree: FlightRouterState tree: FlightRouterState
url: string url: string
stylesheets?: string[]
}>(null as any) }>(null as any)
export const FullAppTreeContext = React.createContext<{ export const FullAppTreeContext = React.createContext<{
tree: FlightRouterState tree: FlightRouterState
......
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