From 8fa0cb52dda68bd20078ed57b4f0461f3c1b01da Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Thu, 4 Jun 2020 15:40:51 +0200
Subject: [PATCH 1/6] Clean up render.tsx options

---
 .../webpack/plugins/build-manifest-plugin.ts  |  3 +-
 packages/next/export/index.ts                 |  1 -
 packages/next/next-server/lib/utils.ts        |  6 ++--
 .../next/next-server/server/get-page-files.ts |  1 +
 .../next/next-server/server/next-server.ts    |  4 ---
 packages/next/next-server/server/render.tsx   | 35 +++----------------
 packages/next/pages/_document.tsx             | 23 ++++++------
 packages/next/server/next.ts                  |  2 +-
 8 files changed, 21 insertions(+), 54 deletions(-)

diff --git a/packages/next/build/webpack/plugins/build-manifest-plugin.ts b/packages/next/build/webpack/plugins/build-manifest-plugin.ts
index 3f7d1987e1149..d2a56ba5af4d7 100644
--- a/packages/next/build/webpack/plugins/build-manifest-plugin.ts
+++ b/packages/next/build/webpack/plugins/build-manifest-plugin.ts
@@ -56,6 +56,7 @@ export default class BuildManifestPlugin {
       (compilation, callback) => {
         const { chunks } = compilation
         const assetMap: BuildManifest = {
+          polyfillFiles: [],
           devFiles: [],
           lowPriorityFiles: [],
           pages: { '/_app': [] },
@@ -124,7 +125,7 @@ export default class BuildManifestPlugin {
         }
 
         // Create a separate entry  for polyfills
-        assetMap.pages['/_polyfills'] = polyfillFiles
+        assetMap.polyfillFiles = polyfillFiles
 
         // Add the runtime build manifest file (generated later in this file)
         // as a dependency for the app. If the flag is false, the file won't be
diff --git a/packages/next/export/index.ts b/packages/next/export/index.ts
index 5105fda2317db..17c503f89ac67 100644
--- a/packages/next/export/index.ts
+++ b/packages/next/export/index.ts
@@ -248,7 +248,6 @@ export default async function exportApp(
     assetPrefix: nextConfig.assetPrefix.replace(/\/$/, ''),
     distDir,
     dev: false,
-    staticMarkup: false,
     hotReloader: null,
     basePath: nextConfig.experimental.basePath,
     canonicalBase: nextConfig.amp?.canonicalBase || '',
diff --git a/packages/next/next-server/lib/utils.ts b/packages/next/next-server/lib/utils.ts
index 87dbfa0772b6a..45f18c7ebae76 100644
--- a/packages/next/next-server/lib/utils.ts
+++ b/packages/next/next-server/lib/utils.ts
@@ -5,6 +5,7 @@ import { format, URLFormatOptions, UrlObject } from 'url'
 import { ManifestItem } from '../server/load-components'
 import { NextRouter } from './router/router'
 import { Env } from '../../lib/load-env-config'
+import { BuildManifest } from '../server/get-page-files'
 
 /**
  * Types used by both next and next-server
@@ -153,15 +154,12 @@ export type DocumentInitialProps = RenderPageResult & {
 export type DocumentProps = DocumentInitialProps & {
   __NEXT_DATA__: NEXT_DATA
   dangerousAsPath: string
+  buildManifest: BuildManifest
   ampPath: string
   inAmpMode: boolean
   hybridAmp: boolean
-  staticMarkup: boolean
   isDevelopment: boolean
-  devFiles: string[]
   files: string[]
-  lowPriorityFiles: string[]
-  polyfillFiles: string[]
   dynamicImports: ManifestItem[]
   assetPrefix?: string
   canonicalBase: string
diff --git a/packages/next/next-server/server/get-page-files.ts b/packages/next/next-server/server/get-page-files.ts
index ada704db2ecb7..92f9b4686988d 100644
--- a/packages/next/next-server/server/get-page-files.ts
+++ b/packages/next/next-server/server/get-page-files.ts
@@ -2,6 +2,7 @@ import { normalizePagePath } from './normalize-page-path'
 
 export type BuildManifest = {
   devFiles: string[]
+  polyfillFiles: string[]
   lowPriorityFiles: string[]
   pages: {
     '/_app': string[]
diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
index 1a347704cde13..7bbd08b10fca2 100644
--- a/packages/next/next-server/server/next-server.ts
+++ b/packages/next/next-server/server/next-server.ts
@@ -87,7 +87,6 @@ export type ServerConstructor = {
    * Where the Next project is located - @default '.'
    */
   dir?: string
-  staticMarkup?: boolean
   /**
    * Hide error messages containing server information - @default false
    */
@@ -113,7 +112,6 @@ export default class Server {
   buildId: string
   renderOpts: {
     poweredByHeader: boolean
-    staticMarkup: boolean
     buildId: string
     generateEtags: boolean
     runtimeConfig?: { [key: string]: any }
@@ -140,7 +138,6 @@ export default class Server {
 
   public constructor({
     dir = '.',
-    staticMarkup = false,
     quiet = false,
     conf = null,
     dev = false,
@@ -171,7 +168,6 @@ export default class Server {
     this.renderOpts = {
       poweredByHeader: this.nextConfig.poweredByHeader,
       canonicalBase: this.nextConfig.amp.canonicalBase,
-      staticMarkup,
       buildId: this.buildId,
       generateEtags,
       previewProps: this.getPreviewProps(),
diff --git a/packages/next/next-server/server/render.tsx b/packages/next/next-server/server/render.tsx
index c093511e6f588..0755f16f33210 100644
--- a/packages/next/next-server/server/render.tsx
+++ b/packages/next/next-server/server/render.tsx
@@ -119,7 +119,6 @@ function enhanceComponents(
 }
 
 function render(
-  renderElementToString: (element: React.ReactElement<any>) => string,
   element: React.ReactElement<any>,
   ampMode: any
 ): { html: string; head: React.ReactElement[] } {
@@ -127,7 +126,7 @@ function render(
   let head
 
   try {
-    html = renderElementToString(element)
+    html = renderToString(element)
   } finally {
     head = Head.rewind() || defaultHead(isInAmpMode(ampMode))
   }
@@ -136,7 +135,6 @@ function render(
 }
 
 export type RenderOptsPartial = {
-  staticMarkup: boolean
   buildId: string
   canonicalBase: string
   runtimeConfig?: { [key: string]: any }
@@ -165,6 +163,7 @@ export type RenderOpts = LoadComponentsReturnType & RenderOptsPartial
 function renderDocument(
   Document: DocumentType,
   {
+    buildManifest,
     props,
     docProps,
     pathname,
@@ -184,11 +183,7 @@ function renderDocument(
     ampState,
     inAmpMode,
     hybridAmp,
-    staticMarkup,
-    devFiles,
     files,
-    lowPriorityFiles,
-    polyfillFiles,
     dynamicImports,
     htmlProps,
     bodyTags,
@@ -211,10 +206,7 @@ function renderDocument(
     hybridAmp: boolean
     dynamicImportsIds: string[]
     dynamicImports: ManifestItem[]
-    devFiles: string[]
     files: string[]
-    lowPriorityFiles: string[]
-    polyfillFiles: string[]
     htmlProps: any
     bodyTags: any
     headTags: any
@@ -250,17 +242,14 @@ function renderDocument(
             gip, // whether the page has getInitialProps
             appGip, // whether the _app has getInitialProps
           },
+          buildManifest,
           dangerousAsPath,
           canonicalBase,
           ampPath,
           inAmpMode,
           isDevelopment: !!dev,
           hybridAmp,
-          staticMarkup,
-          devFiles,
           files,
-          lowPriorityFiles,
-          polyfillFiles,
           dynamicImports,
           assetPrefix,
           htmlProps,
@@ -294,7 +283,6 @@ export async function renderToHTML(
   const {
     err,
     dev = false,
-    staticMarkup = false,
     ampPath = '',
     App,
     Document,
@@ -677,27 +665,16 @@ export async function renderToHTML(
   // the response might be finished on the getInitialProps call
   if (isResSent(res) && !isSSG) return null
 
-  const devFiles = buildManifest.devFiles
   const files = [
     ...new Set([
       ...getPageFiles(buildManifest, '/_app'),
       ...getPageFiles(buildManifest, pathname),
     ]),
   ]
-  const lowPriorityFiles = buildManifest.lowPriorityFiles
-  const polyfillFiles = getPageFiles(buildManifest, '/_polyfills')
-
-  const renderElementToString = staticMarkup
-    ? renderToStaticMarkup
-    : renderToString
 
   const renderPageError = (): { html: string; head: any } | void => {
     if (ctx.err && ErrorDebug) {
-      return render(
-        renderElementToString,
-        <ErrorDebug error={ctx.err} />,
-        ampState
-      )
+      return render(<ErrorDebug error={ctx.err} />, ampState)
     }
 
     if (dev && (props.router || props.Component)) {
@@ -719,7 +696,6 @@ export async function renderToHTML(
     } = enhanceComponents(options, App, Component)
 
     return render(
-      renderElementToString,
       <AppContainer>
         <EnhancedApp Component={EnhancedComponent} router={router} {...props} />
       </AppContainer>,
@@ -785,10 +761,7 @@ export async function renderToHTML(
     hybridAmp,
     dynamicImportsIds,
     dynamicImports,
-    devFiles,
     files,
-    lowPriorityFiles,
-    polyfillFiles,
     gsp: !!getStaticProps ? true : undefined,
     gssp: !!getServerSideProps ? true : undefined,
     gip: hasPageGetInitialProps ? true : undefined,
diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
index 8eca7149aea48..741c85dbddbc6 100644
--- a/packages/next/pages/_document.tsx
+++ b/packages/next/pages/_document.tsx
@@ -573,11 +573,11 @@ export class NextScript extends Component<OriginProps> {
   }
 
   getScripts() {
-    const { assetPrefix, files, lowPriorityFiles } = this.context._documentProps
+    const { assetPrefix, files, buildManifest } = this.context._documentProps
     const { _devOnlyInvalidateCacheQueryString } = this.context
 
     const normalScripts = files?.filter((file) => file.endsWith('.js'))
-    const lowPriorityScripts = lowPriorityFiles?.filter((file) =>
+    const lowPriorityScripts = buildManifest.lowPriorityFiles?.filter((file) =>
       file.endsWith('.js')
     )
 
@@ -606,10 +606,10 @@ export class NextScript extends Component<OriginProps> {
   getPolyfillScripts() {
     // polyfills.js has to be rendered as nomodule without async
     // It also has to be the first script to load
-    const { assetPrefix, polyfillFiles } = this.context._documentProps
+    const { assetPrefix, buildManifest } = this.context._documentProps
     const { _devOnlyInvalidateCacheQueryString } = this.context
 
-    return polyfillFiles
+    return buildManifest.polyfillFiles
       .filter(
         (polyfill) =>
           polyfill.endsWith('.js') && !/\.module\.js$/.test(polyfill)
@@ -642,10 +642,9 @@ export class NextScript extends Component<OriginProps> {
 
   render() {
     const {
-      staticMarkup,
       assetPrefix,
       inAmpMode,
-      devFiles,
+      buildManifest,
       __NEXT_DATA__,
       bodyTags,
       unstable_runtimeJS,
@@ -667,7 +666,7 @@ export class NextScript extends Component<OriginProps> {
 
       return (
         <>
-          {staticMarkup || disableRuntimeJS ? null : (
+          {disableRuntimeJS ? null : (
             <script
               id="__NEXT_DATA__"
               type="application/json"
@@ -772,8 +771,8 @@ export class NextScript extends Component<OriginProps> {
 
     return (
       <>
-        {!disableRuntimeJS && devFiles
-          ? devFiles.map(
+        {!disableRuntimeJS && buildManifest.devFiles
+          ? buildManifest.devFiles.map(
               (file: string) =>
                 !file.match(/\.js\.map/) && (
                   <script
@@ -787,7 +786,7 @@ export class NextScript extends Component<OriginProps> {
                 )
             )
           : null}
-        {staticMarkup || disableRuntimeJS ? null : (
+        {disableRuntimeJS ? null : (
           <script
             id="__NEXT_DATA__"
             type="application/json"
@@ -813,8 +812,8 @@ export class NextScript extends Component<OriginProps> {
         {!disableRuntimeJS && this.getPolyfillScripts()}
         {!disableRuntimeJS && appScript}
         {!disableRuntimeJS && page !== '/_error' && pageScript}
-        {disableRuntimeJS || staticMarkup ? null : this.getDynamicChunks()}
-        {disableRuntimeJS || staticMarkup ? null : this.getScripts()}
+        {disableRuntimeJS ? null : this.getDynamicChunks()}
+        {disableRuntimeJS ? null : this.getScripts()}
         {React.createElement(React.Fragment, {}, ...(bodyTags || []))}
       </>
     )
diff --git a/packages/next/server/next.ts b/packages/next/server/next.ts
index 6b17c6496c85c..0e60fc9f67615 100644
--- a/packages/next/server/next.ts
+++ b/packages/next/server/next.ts
@@ -2,7 +2,7 @@ import Server, { ServerConstructor } from '../next-server/server/next-server'
 import { NON_STANDARD_NODE_ENV } from '../lib/constants'
 import * as log from '../build/output/log'
 
-type NextServerConstructor = Omit<ServerConstructor, 'staticMarkup'> & {
+type NextServerConstructor = ServerConstructor & {
   /**
    * Whether to launch Next.js in dev mode - @default false
    */

From 2f836eb21aa4a9aa0c4d4f05b683c6e6f4099c74 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Thu, 4 Jun 2020 16:12:13 +0200
Subject: [PATCH 2/6] Remove htmlProps key that is unused

---
 packages/next/next-server/lib/utils.ts                   | 1 -
 packages/next/next-server/server/render.tsx              | 5 -----
 packages/next/pages/_document.tsx                        | 9 +--------
 .../src/document-html-props-server.js                    | 5 -----
 test/integration/next-plugins/test/index.test.js         | 6 ------
 5 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 test/integration/next-plugins/app/node_modules/@next/plugin-google-analytics/src/document-html-props-server.js

diff --git a/packages/next/next-server/lib/utils.ts b/packages/next/next-server/lib/utils.ts
index 45f18c7ebae76..a888cbebb2be1 100644
--- a/packages/next/next-server/lib/utils.ts
+++ b/packages/next/next-server/lib/utils.ts
@@ -163,7 +163,6 @@ export type DocumentProps = DocumentInitialProps & {
   dynamicImports: ManifestItem[]
   assetPrefix?: string
   canonicalBase: string
-  htmlProps: any
   bodyTags: any[]
   headTags: any[]
   unstable_runtimeJS?: false
diff --git a/packages/next/next-server/server/render.tsx b/packages/next/next-server/server/render.tsx
index 0755f16f33210..4e73dec8c87d3 100644
--- a/packages/next/next-server/server/render.tsx
+++ b/packages/next/next-server/server/render.tsx
@@ -185,7 +185,6 @@ function renderDocument(
     hybridAmp,
     files,
     dynamicImports,
-    htmlProps,
     bodyTags,
     headTags,
     gsp,
@@ -207,7 +206,6 @@ function renderDocument(
     dynamicImportsIds: string[]
     dynamicImports: ManifestItem[]
     files: string[]
-    htmlProps: any
     bodyTags: any
     headTags: any
     isFallback?: boolean
@@ -252,7 +250,6 @@ function renderDocument(
           files,
           dynamicImports,
           assetPrefix,
-          htmlProps,
           bodyTags,
           headTags,
           unstable_runtimeJS,
@@ -324,7 +321,6 @@ export async function renderToHTML(
 
   const headTags = (...args: any) => callMiddleware('headTags', args)
   const bodyTags = (...args: any) => callMiddleware('bodyTags', args)
-  const htmlProps = (...args: any) => callMiddleware('htmlProps', args, true)
 
   const didRewrite = (req as any)._nextDidRewrite
   const isFallback = !!query.__nextFallback
@@ -751,7 +747,6 @@ export async function renderToHTML(
     props,
     headTags: await headTags(documentCtx),
     bodyTags: await bodyTags(documentCtx),
-    htmlProps: await htmlProps(documentCtx),
     isFallback,
     docProps,
     pathname,
diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
index 741c85dbddbc6..683fc3478d981 100644
--- a/packages/next/pages/_document.tsx
+++ b/packages/next/pages/_document.tsx
@@ -59,12 +59,6 @@ export default class Document<P = {}> extends Component<DocumentProps & P> {
         '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`.
@@ -148,10 +142,9 @@ export class Html extends Component<
   context!: React.ContextType<typeof DocumentComponentContext>
 
   render() {
-    const { inAmpMode, htmlProps } = this.context._documentProps
+    const { inAmpMode } = this.context._documentProps
     return (
       <html
-        {...htmlProps}
         {...this.props}
         amp={inAmpMode ? '' : undefined}
         data-ampdevmode={
diff --git a/test/integration/next-plugins/app/node_modules/@next/plugin-google-analytics/src/document-html-props-server.js b/test/integration/next-plugins/app/node_modules/@next/plugin-google-analytics/src/document-html-props-server.js
deleted file mode 100644
index 1ee34a9aa74b1..0000000000000
--- a/test/integration/next-plugins/app/node_modules/@next/plugin-google-analytics/src/document-html-props-server.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default async function htmlProps () {
-  return {
-    lang: 'en'
-  }
-}
diff --git a/test/integration/next-plugins/test/index.test.js b/test/integration/next-plugins/test/index.test.js
index 8f07561d1ae3b..63325ef0736ef 100644
--- a/test/integration/next-plugins/test/index.test.js
+++ b/test/integration/next-plugins/test/index.test.js
@@ -28,12 +28,6 @@ function runTests() {
     expect(html).toMatch(/home/)
   })
 
-  it('should apply htmlProps from plugin correctly', async () => {
-    const html = await renderViaHTTP(appPort, '/')
-    const $ = cheerio.load(html)
-    expect($('html').attr('lang')).toBe('en')
-  })
-
   it('should apply headTags from plugin correctly', async () => {
     const html = await renderViaHTTP(appPort, '/')
     const $ = cheerio.load(html)

From 4f6d9386de51ede8898ef02d4366d99506bd99d0 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Thu, 4 Jun 2020 16:15:43 +0200
Subject: [PATCH 3/6] Remove unused property

---
 packages/next/build/plugins/collect-plugins.ts       |  2 --
 packages/next/next-server/lib/utils.ts               |  1 -
 packages/next/next-server/server/render.tsx          |  5 -----
 packages/next/pages/_document.tsx                    |  9 ---------
 .../src/document-body-tags-server.js                 |  7 -------
 test/integration/next-plugins/test/index.test.js     | 12 ------------
 6 files changed, 36 deletions(-)
 delete mode 100644 test/integration/next-plugins/app/node_modules/@next/plugin-google-analytics/src/document-body-tags-server.js

diff --git a/packages/next/build/plugins/collect-plugins.ts b/packages/next/build/plugins/collect-plugins.ts
index 3c46aa8c16cbe..e0d80e3951eeb 100644
--- a/packages/next/build/plugins/collect-plugins.ts
+++ b/packages/next/build/plugins/collect-plugins.ts
@@ -17,8 +17,6 @@ export type PluginMetaData = {
 // currently supported middleware
 export const VALID_MIDDLEWARE = [
   'document-head-tags-server',
-  'document-body-tags-server',
-  'document-html-props-server',
   'on-init-client',
   'on-init-server',
   'on-error-server',
diff --git a/packages/next/next-server/lib/utils.ts b/packages/next/next-server/lib/utils.ts
index a888cbebb2be1..4b255709eb966 100644
--- a/packages/next/next-server/lib/utils.ts
+++ b/packages/next/next-server/lib/utils.ts
@@ -163,7 +163,6 @@ export type DocumentProps = DocumentInitialProps & {
   dynamicImports: ManifestItem[]
   assetPrefix?: string
   canonicalBase: string
-  bodyTags: any[]
   headTags: any[]
   unstable_runtimeJS?: false
 }
diff --git a/packages/next/next-server/server/render.tsx b/packages/next/next-server/server/render.tsx
index 4e73dec8c87d3..02ad6a1356977 100644
--- a/packages/next/next-server/server/render.tsx
+++ b/packages/next/next-server/server/render.tsx
@@ -185,7 +185,6 @@ function renderDocument(
     hybridAmp,
     files,
     dynamicImports,
-    bodyTags,
     headTags,
     gsp,
     gssp,
@@ -206,7 +205,6 @@ function renderDocument(
     dynamicImportsIds: string[]
     dynamicImports: ManifestItem[]
     files: string[]
-    bodyTags: any
     headTags: any
     isFallback?: boolean
     gsp?: boolean
@@ -250,7 +248,6 @@ function renderDocument(
           files,
           dynamicImports,
           assetPrefix,
-          bodyTags,
           headTags,
           unstable_runtimeJS,
           ...docProps,
@@ -320,7 +317,6 @@ export async function renderToHTML(
   }
 
   const headTags = (...args: any) => callMiddleware('headTags', args)
-  const bodyTags = (...args: any) => callMiddleware('bodyTags', args)
 
   const didRewrite = (req as any)._nextDidRewrite
   const isFallback = !!query.__nextFallback
@@ -746,7 +742,6 @@ export async function renderToHTML(
     ampState,
     props,
     headTags: await headTags(documentCtx),
-    bodyTags: await bodyTags(documentCtx),
     isFallback,
     docProps,
     pathname,
diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
index 683fc3478d981..da4e983208aaa 100644
--- a/packages/next/pages/_document.tsx
+++ b/packages/next/pages/_document.tsx
@@ -53,12 +53,6 @@ export default class Document<P = {}> extends Component<DocumentProps & P> {
         '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!'
-      )
-    : () => []
 
   /**
    * `getInitialProps` hook returns the context object with the addition of `renderPage`.
@@ -639,7 +633,6 @@ export class NextScript extends Component<OriginProps> {
       inAmpMode,
       buildManifest,
       __NEXT_DATA__,
-      bodyTags,
       unstable_runtimeJS,
     } = this.context._documentProps
     const disableRuntimeJS = unstable_runtimeJS === false
@@ -684,7 +677,6 @@ export class NextScript extends Component<OriginProps> {
                 />
               ))
             : null}
-          {React.createElement(React.Fragment, {}, ...(bodyTags || []))}
         </>
       )
     }
@@ -807,7 +799,6 @@ export class NextScript extends Component<OriginProps> {
         {!disableRuntimeJS && page !== '/_error' && pageScript}
         {disableRuntimeJS ? null : this.getDynamicChunks()}
         {disableRuntimeJS ? null : this.getScripts()}
-        {React.createElement(React.Fragment, {}, ...(bodyTags || []))}
       </>
     )
   }
diff --git a/test/integration/next-plugins/app/node_modules/@next/plugin-google-analytics/src/document-body-tags-server.js b/test/integration/next-plugins/app/node_modules/@next/plugin-google-analytics/src/document-body-tags-server.js
deleted file mode 100644
index 263a146486d55..0000000000000
--- a/test/integration/next-plugins/app/node_modules/@next/plugin-google-analytics/src/document-body-tags-server.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default async function bodyTags () {
-  return (
-    <>
-      <script dangerouslySetInnerHTML={{ __html: 'console.log("hi") ' }} />
-    </>
-  )
-}
diff --git a/test/integration/next-plugins/test/index.test.js b/test/integration/next-plugins/test/index.test.js
index 63325ef0736ef..433bee3d6b02c 100644
--- a/test/integration/next-plugins/test/index.test.js
+++ b/test/integration/next-plugins/test/index.test.js
@@ -37,18 +37,6 @@ function runTests() {
     expect(found).toBeTruthy()
   })
 
-  it('should apply bodyTags from plugin correctly', async () => {
-    const html = await renderViaHTTP(appPort, '/')
-    const $ = cheerio.load(html)
-    const found = Array.from($('body').children()).find(
-      (el) =>
-        el.type === 'script' &&
-        el.children[0] &&
-        el.children[0].data.includes('console.log')
-    )
-    expect(found).toBeTruthy()
-  })
-
   it('should call clientInit from plugin correctly', async () => {
     const browser = await webdriver(appPort, '/')
     expect(await browser.eval('window.didClientInit')).toBe(true)

From 1fcd0a248dcb5c4b438af917c1983e5916b01635 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Thu, 4 Jun 2020 17:03:51 +0200
Subject: [PATCH 4/6] Update crossOrigin name to be consistent with other
 replaced vars

---
 packages/next/build/webpack-config.ts |  2 +-
 packages/next/client/page-loader.js   |  4 +-
 packages/next/pages/_document.tsx     | 68 ++++++++++++++++++++-------
 3 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index 23dbae7c485e8..6b97311ef164f 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -803,7 +803,7 @@ export default async function getBaseWebpackConfig(
           }
         }, {}),
         'process.env.NODE_ENV': JSON.stringify(webpackMode),
-        'process.crossOrigin': JSON.stringify(crossOrigin),
+        'process.env.__NEXT_CROSS_ORIGIN': JSON.stringify(crossOrigin),
         'process.browser': JSON.stringify(!isServer),
         'process.env.__NEXT_TEST_MODE': JSON.stringify(
           process.env.__NEXT_TEST_MODE
diff --git a/packages/next/client/page-loader.js b/packages/next/client/page-loader.js
index 759e55fa92645..1009c5f7b5af9 100644
--- a/packages/next/client/page-loader.js
+++ b/packages/next/client/page-loader.js
@@ -37,7 +37,7 @@ function normalizeRoute(route) {
 function appendLink(href, rel, as) {
   return new Promise((res, rej, link) => {
     link = document.createElement('link')
-    link.crossOrigin = process.crossOrigin
+    link.crossOrigin = process.env.__NEXT_CROSS_ORIGIN
     link.href = href
     link.rel = rel
     if (as) link.as = as
@@ -261,7 +261,7 @@ export default class PageLoader {
       // dependencies already have it added during build manifest creation
       if (isPage) url = url.replace(/\.js$/, '.module.js')
     }
-    script.crossOrigin = process.crossOrigin
+    script.crossOrigin = process.env.__NEXT_CROSS_ORIGIN
     script.src = url
     script.onerror = () => {
       const error = new Error(`Error loading script ${url}`)
diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
index da4e983208aaa..f72ae0b1fd994 100644
--- a/packages/next/pages/_document.tsx
+++ b/packages/next/pages/_document.tsx
@@ -182,7 +182,9 @@ export class Head extends Component<
             file
           )}${_devOnlyInvalidateCacheQueryString}`}
           as="style"
-          crossOrigin={this.props.crossOrigin || process.crossOrigin}
+          crossOrigin={
+            this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+          }
         />,
         <link
           key={file}
@@ -191,7 +193,9 @@ export class Head extends Component<
           href={`${assetPrefix}/_next/${encodeURI(
             file
           )}${_devOnlyInvalidateCacheQueryString}`}
-          crossOrigin={this.props.crossOrigin || process.crossOrigin}
+          crossOrigin={
+            this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+          }
         />
       )
     })
@@ -222,7 +226,9 @@ export class Head extends Component<
               )}${_devOnlyInvalidateCacheQueryString}`}
               as="script"
               nonce={this.props.nonce}
-              crossOrigin={this.props.crossOrigin || process.crossOrigin}
+              crossOrigin={
+                this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+              }
             />
           )
         })
@@ -256,7 +262,9 @@ export class Head extends Component<
               file
             )}${_devOnlyInvalidateCacheQueryString}`}
             as="script"
-            crossOrigin={this.props.crossOrigin || process.crossOrigin}
+            crossOrigin={
+              this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+            }
           />
         ))
   }
@@ -467,7 +475,9 @@ export class Head extends Component<
                 }
                 as="script"
                 nonce={this.props.nonce}
-                crossOrigin={this.props.crossOrigin || process.crossOrigin}
+                crossOrigin={
+                  this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+                }
               />
             )}
             {!disableRuntimeJS && page !== '/_error' && (
@@ -484,7 +494,9 @@ export class Head extends Component<
                 }
                 as="script"
                 nonce={this.props.nonce}
-                crossOrigin={this.props.crossOrigin || process.crossOrigin}
+                crossOrigin={
+                  this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+                }
               />
             )}
             {!disableRuntimeJS && this.getPreloadDynamicChunks()}
@@ -552,7 +564,9 @@ export class NextScript extends Component<OriginProps> {
             bundle.file
           )}${_devOnlyInvalidateCacheQueryString}`}
           nonce={this.props.nonce}
-          crossOrigin={this.props.crossOrigin || process.crossOrigin}
+          crossOrigin={
+            this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+          }
           {...modernProps}
         />
       )
@@ -583,7 +597,9 @@ export class NextScript extends Component<OriginProps> {
           )}${_devOnlyInvalidateCacheQueryString}`}
           nonce={this.props.nonce}
           async
-          crossOrigin={this.props.crossOrigin || process.crossOrigin}
+          crossOrigin={
+            this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+          }
           {...modernProps}
         />
       )
@@ -605,7 +621,9 @@ export class NextScript extends Component<OriginProps> {
         <script
           key={polyfill}
           nonce={this.props.nonce}
-          crossOrigin={this.props.crossOrigin || process.crossOrigin}
+          crossOrigin={
+            this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+          }
           noModule={true}
           src={`${assetPrefix}/_next/${polyfill}${_devOnlyInvalidateCacheQueryString}`}
         />
@@ -657,7 +675,9 @@ export class NextScript extends Component<OriginProps> {
               id="__NEXT_DATA__"
               type="application/json"
               nonce={this.props.nonce}
-              crossOrigin={this.props.crossOrigin || process.crossOrigin}
+              crossOrigin={
+                this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+              }
               dangerouslySetInnerHTML={{
                 __html: NextScript.getInlineScriptSource(
                   this.context._documentProps
@@ -672,7 +692,9 @@ export class NextScript extends Component<OriginProps> {
                   key={file}
                   src={`${assetPrefix}/_next/${file}${_devOnlyInvalidateCacheQueryString}`}
                   nonce={this.props.nonce}
-                  crossOrigin={this.props.crossOrigin || process.crossOrigin}
+                  crossOrigin={
+                    this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+                  }
                   data-ampdevmode
                 />
               ))
@@ -701,7 +723,7 @@ export class NextScript extends Component<OriginProps> {
           _devOnlyInvalidateCacheQueryString
         }
         nonce={this.props.nonce}
-        crossOrigin={this.props.crossOrigin || process.crossOrigin}
+        crossOrigin={this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN}
         {...(process.env.__NEXT_MODERN_BUILD ? { noModule: true } : {})}
       />,
       process.env.__NEXT_MODERN_BUILD && (
@@ -717,7 +739,9 @@ export class NextScript extends Component<OriginProps> {
             _devOnlyInvalidateCacheQueryString
           }
           nonce={this.props.nonce}
-          crossOrigin={this.props.crossOrigin || process.crossOrigin}
+          crossOrigin={
+            this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+          }
           type="module"
         />
       ),
@@ -734,7 +758,7 @@ export class NextScript extends Component<OriginProps> {
         }
         key="_app"
         nonce={this.props.nonce}
-        crossOrigin={this.props.crossOrigin || process.crossOrigin}
+        crossOrigin={this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN}
         {...(process.env.__NEXT_MODERN_BUILD ? { noModule: true } : {})}
       />,
       process.env.__NEXT_MODERN_BUILD && (
@@ -748,7 +772,9 @@ export class NextScript extends Component<OriginProps> {
           }
           key="_app-modern"
           nonce={this.props.nonce}
-          crossOrigin={this.props.crossOrigin || process.crossOrigin}
+          crossOrigin={
+            this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+          }
           type="module"
         />
       ),
@@ -766,7 +792,9 @@ export class NextScript extends Component<OriginProps> {
                       file
                     )}${_devOnlyInvalidateCacheQueryString}`}
                     nonce={this.props.nonce}
-                    crossOrigin={this.props.crossOrigin || process.crossOrigin}
+                    crossOrigin={
+                      this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+                    }
                   />
                 )
             )
@@ -776,7 +804,9 @@ export class NextScript extends Component<OriginProps> {
             id="__NEXT_DATA__"
             type="application/json"
             nonce={this.props.nonce}
-            crossOrigin={this.props.crossOrigin || process.crossOrigin}
+            crossOrigin={
+              this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+            }
             dangerouslySetInnerHTML={{
               __html: NextScript.getInlineScriptSource(
                 this.context._documentProps
@@ -787,7 +817,9 @@ export class NextScript extends Component<OriginProps> {
         {process.env.__NEXT_MODERN_BUILD && !disableRuntimeJS ? (
           <script
             nonce={this.props.nonce}
-            crossOrigin={this.props.crossOrigin || process.crossOrigin}
+            crossOrigin={
+              this.props.crossOrigin || process.env.__NEXT_CROSS_ORIGIN
+            }
             noModule={true}
             dangerouslySetInnerHTML={{
               __html: NextScript.safariNomoduleFix,

From 822c55774e07dc9a10ba2f890895153e36120362 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Fri, 5 Jun 2020 19:56:15 +0200
Subject: [PATCH 5/6] Convert html component into a function

---
 packages/next/pages/_document.tsx | 38 ++++++++++++-------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
index f72ae0b1fd994..241f0465b93be 100644
--- a/packages/next/pages/_document.tsx
+++ b/packages/next/pages/_document.tsx
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types'
-import React, { Component } from 'react'
+import React, { useContext, Component } from 'react'
 import flush from 'styled-jsx/server'
 import {
   AMP_RENDER_TARGET,
@@ -121,32 +121,22 @@ export default class Document<P = {}> extends Component<DocumentProps & P> {
   }
 }
 
-export class Html extends Component<
-  React.DetailedHTMLProps<
+export function Html(
+  props: React.DetailedHTMLProps<
     React.HtmlHTMLAttributes<HTMLHtmlElement>,
     HTMLHtmlElement
   >
-> {
-  static contextType = DocumentComponentContext
-
-  static propTypes = {
-    children: PropTypes.node.isRequired,
-  }
-
-  context!: React.ContextType<typeof DocumentComponentContext>
-
-  render() {
-    const { inAmpMode } = this.context._documentProps
-    return (
-      <html
-        {...this.props}
-        amp={inAmpMode ? '' : undefined}
-        data-ampdevmode={
-          inAmpMode && process.env.NODE_ENV !== 'production' ? '' : undefined
-        }
-      />
-    )
-  }
+) {
+  const { inAmpMode } = useContext(DocumentComponentContext)._documentProps
+  return (
+    <html
+      {...props}
+      amp={inAmpMode ? '' : undefined}
+      data-ampdevmode={
+        inAmpMode && process.env.NODE_ENV !== 'production' ? '' : undefined
+      }
+    />
+  )
 }
 
 export class Head extends Component<

From 57855810a7a031aca032ff32c9972f6ce2038280 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Sat, 6 Jun 2020 23:30:16 +0200
Subject: [PATCH 6/6] Remove unused publicPath and name from loadable manifest

---
 .../webpack/plugins/react-loadable-plugin.ts     | 16 +---------------
 .../next/next-server/server/load-components.ts   |  1 -
 .../client-navigation/test/rendering.js          |  3 +--
 test/integration/production/test/index.test.js   |  2 +-
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/packages/next/build/webpack/plugins/react-loadable-plugin.ts b/packages/next/build/webpack/plugins/react-loadable-plugin.ts
index ab418acadba6c..afd16f1fe63d3 100644
--- a/packages/next/build/webpack/plugins/react-loadable-plugin.ts
+++ b/packages/next/build/webpack/plugins/react-loadable-plugin.ts
@@ -21,8 +21,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAR
 // Implementation of this PR: https://github.com/jamiebuilds/react-loadable/pull/132
 // Modified to strip out unneeded results for Next's specific use case
 
-import url from 'url'
-
 import {
   Compiler,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -30,10 +28,9 @@ import {
 } from 'webpack'
 
 function buildManifest(
-  compiler: Compiler,
+  _compiler: Compiler,
   compilation: CompilationType.Compilation
 ) {
-  let context = compiler.options.context
   let manifest: { [k: string]: any[] } = {}
 
   compilation.chunkGroups.forEach((chunkGroup) => {
@@ -50,17 +47,8 @@ function buildManifest(
             return
           }
 
-          let publicPath = url.resolve(
-            compilation.outputOptions.publicPath || '',
-            file
-          )
-
           for (const module of chunk.modulesIterable) {
             let id = module.id
-            let name =
-              typeof module.libIdent === 'function'
-                ? module.libIdent({ context })
-                : null
 
             if (!manifest[request]) {
               manifest[request] = []
@@ -77,9 +65,7 @@ function buildManifest(
 
             manifest[request].push({
               id,
-              name,
               file,
-              publicPath,
             })
           }
         })
diff --git a/packages/next/next-server/server/load-components.ts b/packages/next/next-server/server/load-components.ts
index e67aa0d699e02..de09e852e5dc8 100644
--- a/packages/next/next-server/server/load-components.ts
+++ b/packages/next/next-server/server/load-components.ts
@@ -23,7 +23,6 @@ export type ManifestItem = {
   id: number | string
   name: string
   file: string
-  publicPath: string
 }
 
 type ReactLoadableManifest = { [moduleId: string]: ManifestItem[] }
diff --git a/test/integration/client-navigation/test/rendering.js b/test/integration/client-navigation/test/rendering.js
index a8873df8fbe2b..2a5ac2d152550 100644
--- a/test/integration/client-navigation/test/rendering.js
+++ b/test/integration/client-navigation/test/rendering.js
@@ -310,8 +310,7 @@ export default function (render, fetch) {
 
       // test dynamic chunk
       resources.push(
-        '/_next/' +
-          reactLoadableManifest['../../components/hello1'][0].publicPath
+        '/_next/' + reactLoadableManifest['../../components/hello1'][0].file
       )
 
       // test main.js runtime etc
diff --git a/test/integration/production/test/index.test.js b/test/integration/production/test/index.test.js
index 4d91ef240bffe..33dcaa36e4153 100644
--- a/test/integration/production/test/index.test.js
+++ b/test/integration/production/test/index.test.js
@@ -198,7 +198,7 @@ describe('Production Usage', () => {
 
       // test dynamic chunk
       resources.add(
-        url + reactLoadableManifest['../../components/hello1'][0].publicPath
+        url + reactLoadableManifest['../../components/hello1'][0].file
       )
 
       // test main.js runtime etc