From 67b32946d0de133a3f6860031ef7ad669d664678 Mon Sep 17 00:00:00 2001
From: Grace Park <gracepark@github.com>
Date: Fri, 18 Jun 2021 14:15:47 -0700
Subject: [PATCH] exporting createApp function in app.js

---
 lib/app.js         | 11 ++++++++---
 lib/frontmatter.js |  7 +++++--
 server.js          |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/app.js b/lib/app.js
index 849e2814e91f..6e5798830cbe 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -1,5 +1,10 @@
 const express = require('express')
+const middleware = require('../middleware/index.js')
 
-const app = express()
-require('../middleware')(app)
-module.exports = app
+function createApp () {
+  const app = express()
+  middleware(app)
+  return app
+}
+
+module.exports = createApp
diff --git a/lib/frontmatter.js b/lib/frontmatter.js
index 216d2a9bec7b..3fb6fafe8545 100644
--- a/lib/frontmatter.js
+++ b/lib/frontmatter.js
@@ -1,6 +1,9 @@
 const parse = require('./read-frontmatter')
-const semverValidRange = require('semver').validRange
-const layoutNames = Object.keys(require('./layouts')).concat([false])
+const semver = require('semver')
+const layouts = require('./layouts')
+
+const semverValidRange = semver.validRange
+const layoutNames = Object.keys(layouts).concat([false])
 const semverRange = {
   type: 'string',
   conform: semverValidRange,
diff --git a/server.js b/server.js
index b6842357fe68..450dd6930e75 100644
--- a/server.js
+++ b/server.js
@@ -49,7 +49,7 @@ async function checkPortAvailability () {
 }
 
 async function startServer () {
-  const app = libApp
+  const app = libApp()
   const warmServer = libWarmServer
 
   // If in a deployed environment...