From f90c1e3c167bc5da602a2f05c36df7924c23aed8 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Tue, 28 Apr 2020 17:31:21 +0200
Subject: [PATCH 1/2] Enable NEXT_PUBLIC_ env var support

---
 packages/next/next-server/server/config.ts       | 2 +-
 test/integration/process-env-stub/next.config.js | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/next/next-server/server/config.ts b/packages/next/next-server/server/config.ts
index 7a6fb10ce0cd7..3bc2e069737d3 100644
--- a/packages/next/next-server/server/config.ts
+++ b/packages/next/next-server/server/config.ts
@@ -50,7 +50,7 @@ const defaultConfig: { [key: string]: any } = {
     workerThreads: false,
     basePath: '',
     sassOptions: {},
-    pageEnv: false,
+    pageEnv: true,
     measureFid: false,
     reactRefresh: false,
   },
diff --git a/test/integration/process-env-stub/next.config.js b/test/integration/process-env-stub/next.config.js
index 80ee697d9b1ba..4ba52ba2c8df6 100644
--- a/test/integration/process-env-stub/next.config.js
+++ b/test/integration/process-env-stub/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    pageEnv: true,
-  },
-}
+module.exports = {}

From 2a8941ae4d3bf94e567d657ee5746148a976e35a Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Tue, 28 Apr 2020 12:00:53 -0500
Subject: [PATCH 2/2] bump