From a361a6a4a2b2e97d9adf47d4c4144885f24a78cd Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Wed, 3 Apr 2019 16:42:12 -0500
Subject: [PATCH] Fix serverless options (#6884)

---
 packages/next/build/entries.ts                               | 3 ++-
 .../next/build/webpack/loaders/next-serverless-loader.ts     | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/next/build/entries.ts b/packages/next/build/entries.ts
index f8ee29a013..bf706ebc84 100644
--- a/packages/next/build/entries.ts
+++ b/packages/next/build/entries.ts
@@ -42,7 +42,8 @@ export function createEntrypoints(pages: PagesMapping, target: 'server'|'serverl
     absoluteErrorPath: pages['/_error'],
     distDir: DOT_NEXT_ALIAS,
     assetPrefix: config.assetPrefix,
-    generateEtags: config.generateEtags
+    generateEtags: config.generateEtags,
+    ampBindInitData: config.experimental.ampBindInitData
   }
 
   Object.keys(pages).forEach((page) => {
diff --git a/packages/next/build/webpack/loaders/next-serverless-loader.ts b/packages/next/build/webpack/loaders/next-serverless-loader.ts
index a652eae145..b1e4ea09e9 100644
--- a/packages/next/build/webpack/loaders/next-serverless-loader.ts
+++ b/packages/next/build/webpack/loaders/next-serverless-loader.ts
@@ -11,6 +11,7 @@ export type ServerlessLoaderQuery = {
   absoluteDocumentPath: string,
   absoluteErrorPath: string,
   assetPrefix: string,
+  ampBindInitData: boolean,
   generateEtags: string
 }
 
@@ -20,6 +21,7 @@ const nextServerlessLoader: loader.Loader = function () {
     absolutePagePath,
     page,
     assetPrefix,
+    ampBindInitData,
     absoluteAppPath,
     absoluteDocumentPath,
     absoluteErrorPath,
@@ -44,7 +46,8 @@ const nextServerlessLoader: loader.Loader = function () {
         buildManifest,
         reactLoadableManifest,
         buildId: "__NEXT_REPLACE__BUILD_ID__",
-        assetPrefix: "${assetPrefix}"
+        assetPrefix: "${assetPrefix}",
+        ampBindInitData: ${Boolean(ampBindInitData)}
       }
       const parsedUrl = parse(req.url, true)
       try {
-- 
GitLab