Update order in serverless target instead

Author: ijjk

packages/next/build/webpack/loaders/next-serverless-loader/index.ts

@@ -138,6 +138,8 @@ const nextServerlessLoader: webpack.loader.Loader = function () {
       }
       import { getPageHandler } from 'next/dist/build/webpack/loaders/next-serverless-loader/page-handler'
 
+      const documentModule = require("${absoluteDocumentPath}")
+
       const appMod = require('${absoluteAppPath}')
       let App = appMod.default || appMod.then && appMod.then(mod => mod.default);
 
@@ -163,7 +165,7 @@ const nextServerlessLoader: webpack.loader.Loader = function () {
         pageComponent: Component,
         pageConfig: config,
         appModule: App,
-        documentModule: require("${absoluteDocumentPath}"),
+        documentModule: documentModule,
         errorModule: require("${absoluteErrorPath}"),
         notFoundModule: ${
           absolute404Path ? `require("${absolute404Path}")` : undefined

packages/next/next-server/server/load-components.ts

@@ -59,8 +59,8 @@ export async function loadComponents(
     } as LoadComponentsReturnType
   }
 
-  const AppMod = await requirePage('/_app', distDir, serverless)
   const DocumentMod = await requirePage('/_document', distDir, serverless)
+  const AppMod = await requirePage('/_app', distDir, serverless)
   const ComponentMod = await requirePage(pathname, distDir, serverless)
 
   const [

test/integration/app-document-import-order/test/index.test.js

@@ -38,7 +38,7 @@ describe('Root components import order', () => {
     const html = await res.text()
     const $ = cheerio.load(html)
 
-    const expectSideEffectsOrder = ['_app', '_document', 'page']
+    const expectSideEffectsOrder = ['_document', '_app', 'page']
 
     const sideEffectCalls = $('.side-effect-calls')
 
@@ -87,7 +87,7 @@ describe('Root components import order', () => {
     afterAll(() => killApp(app))
 
     it(
-      'root components should be imported in this order _app > _document > page in order to respect side effects',
+      'root components should be imported in this order _document > _app > page in order to respect side effects',
       respectsSideEffects
     )