archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove top level usage of loader imports in next/document (#9419)

Browse source 
* Don't use loader import at top level in next/document

* Update ts-ignores
This commit is contained in:
JJ Kasper 2019-11-15 01:33:52 -06:00 committed by Joe Haddad
parent ba5e6943fa
commit 53f3cb627a
2 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/next/next-server/server/render.tsx
View file

@ -285,7 +285,10 @@ export async function renderToHTML(
let results: any = props ? {} : []
if ((Document as any)[`${method}Middleware`]) {
const curResults = await (Document as any)[`${method}Middleware`](...args)
let middlewareFunc = await (Document as any)[`${method}Middleware`]
middlewareFunc = middlewareFunc.default || middlewareFunc
const curResults = await middlewareFunc(...args)
if (props) {
for (const result of curResults) {
results = {

49
packages/next/pages/_document.tsx
View file

@ -1,13 +1,3 @@
// @ts-ignore
import bodyTagsMiddleware from 'next-plugin-loader?middleware=document-body-tags-server!'
// @ts-ignore
import headTagsMiddleware from 'next-plugin-loader?middleware=document-head-tags-server!'
// @ts-ignore
import htmlPropsMiddleware from 'next-plugin-loader?middleware=document-html-props-server!'
// @ts-ignore
import enhanceAppMiddleware from 'next-plugin-loader?middleware=unstable-enhance-app-server!'
// @ts-ignore
import getStylesMiddleware from 'next-plugin-loader?middleware=unstable-get-styles-server!'
import PropTypes from 'prop-types'
import React, { Component } from 'react'
import flush from 'styled-jsx/server'
@ -62,9 +52,24 @@ function isLowPriority(file: string) {
* Commonly used for implementing server side rendering for `css-in-js` libraries.
*/
export default class Document<P = {}> extends Component<DocumentProps & P> {
static headTagsMiddleware = headTagsMiddleware
static bodyTagsMiddleware = bodyTagsMiddleware
static htmlPropsMiddleware = htmlPropsMiddleware
static headTagsMiddleware = process.env.__NEXT_PLUGINS
? import(
// @ts-ignore loader syntax
'next-plugin-loader?middleware=document-head-tags-server!'
)
: () => []
static bodyTagsMiddleware = process.env.__NEXT_PLUGINS
? import(
// @ts-ignore loader syntax
'next-plugin-loader?middleware=document-body-tags-server!'
)
: () => []
static htmlPropsMiddleware = process.env.__NEXT_PLUGINS
? import(
// @ts-ignore loader syntax
'next-plugin-loader?middleware=document-html-props-server!'
)
: () => []
/**
* `getInitialProps` hook returns the context object with the addition of `renderPage`.
@ -73,7 +78,13 @@ export default class Document<P = {}> extends Component<DocumentProps & P> {
static async getInitialProps(
ctx: DocumentContext
): Promise<DocumentInitialProps> {
const enhancers = await enhanceAppMiddleware(ctx)
const enhancers = process.env.__NEXT_PLUGINS
? await import(
// @ts-ignore loader syntax
'next-plugin-loader?middleware=unstable-enhance-app-server!'
).then(mod => mod.default(ctx))
: []
const enhanceApp = (App: any) => {
for (const enhancer of enhancers) {
App = enhancer(App)
@ -82,7 +93,15 @@ export default class Document<P = {}> extends Component<DocumentProps & P> {
}
const { html, head, dataOnly } = await ctx.renderPage({ enhanceApp })
const styles = [...flush(), ...(await getStylesMiddleware(ctx))]
const styles = [
...flush(),
...(process.env.__NEXT_PLUGINS
? await import(
// @ts-ignore loader syntax
'next-plugin-loader?middleware=unstable-get-styles-server!'
).then(mod => mod.default(ctx))
: []),
]
return { html, head, styles, dataOnly }
}