diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx index 91268630de9b..f875a34d1d0a 100644 --- a/packages/next/pages/_document.tsx +++ b/packages/next/pages/_document.tsx @@ -46,9 +46,10 @@ function getDocumentFiles( inAmpMode: boolean ): DocumentFiles { const sharedFiles: readonly string[] = getPageFiles(buildManifest, '/_app') - const pageFiles: readonly string[] = inAmpMode - ? [] - : getPageFiles(buildManifest, pathname) + const pageFiles: readonly string[] = + process.env.NEXT_RUNTIME !== 'edge' && inAmpMode + ? [] + : getPageFiles(buildManifest, pathname) return { sharedFiles, @@ -434,7 +435,11 @@ export class Head extends Component { ) } - if (process.env.NODE_ENV !== 'development' && optimizeFonts && !inAmpMode) { + if ( + process.env.NODE_ENV !== 'development' && + optimizeFonts && + !(process.env.NEXT_RUNTIME !== 'edge' && inAmpMode) + ) { children = this.makeStylesheetInert(children) } @@ -445,7 +450,7 @@ export class Head extends Component { head = React.Children.map(head || [], (child) => { if (!child) return child const { type, props } = child - if (inAmpMode) { + if (process.env.NEXT_RUNTIME !== 'edge' && inAmpMode) { let badProp: string = '' if (type === 'meta' && props.name === 'viewport') { @@ -488,7 +493,7 @@ export class Head extends Component { const files: DocumentFiles = getDocumentFiles( this.context.buildManifest, this.context.__NEXT_DATA__.page, - inAmpMode + process.env.NEXT_RUNTIME !== 'edge' && inAmpMode ) return ( @@ -497,14 +502,22 @@ export class Head extends Component { <>