From cd3f18da70cdda3d8ebe173c44e5048ca79fd806 Mon Sep 17 00:00:00 2001
From: Tyler Graf <tylergraf@gmail.com>
Date: Fri, 22 Feb 2019 15:26:57 -0700
Subject: [PATCH] merge server.js files for ef and hf. Force ef in hf.

---
 packages/react-scripts/scripts/utils/frontierInit.js   | 8 +++++++-
 packages/react-scripts/template-ef/Procfile            | 2 +-
 packages/react-scripts/template-ef/{src => }/server.js | 3 +--
 3 files changed, 9 insertions(+), 4 deletions(-)
 rename packages/react-scripts/template-ef/{src => }/server.js (74%)

diff --git a/packages/react-scripts/scripts/utils/frontierInit.js b/packages/react-scripts/scripts/utils/frontierInit.js
index 5d62e61bdfe..802e34734ab 100644
--- a/packages/react-scripts/scripts/utils/frontierInit.js
+++ b/packages/react-scripts/scripts/utils/frontierInit.js
@@ -49,7 +49,10 @@ function installFrontierDependencies(appPath, answers, ownPath) {
   if (additionalFeatures.includes('polymer')) {
     configurePolymer(appPath);
   }
-  if (additionalFeatures.includes('electric-flow')) {
+  if (
+    additionalFeatures.includes('electric-flow') ||
+    additionalFeatures.includes('header-footer')
+  ) {
     configureEF(appPath, ownPath);
   }
   if (additionalFeatures.includes('header-footer')) {
@@ -143,6 +146,9 @@ function configureEF(appPath, ownPath) {
     packageJson.scripts = sortScripts({ ...packageJson.scripts, ...additionalScripts });
     return packageJson;
   });
+
+  let modules = ['express'];
+  installModulesSync(modules, useYarn);
 }
 
 function configureHF(appPath, ownPath) {
diff --git a/packages/react-scripts/template-ef/Procfile b/packages/react-scripts/template-ef/Procfile
index 08ee8b7485d..489b2700aca 100644
--- a/packages/react-scripts/template-ef/Procfile
+++ b/packages/react-scripts/template-ef/Procfile
@@ -1 +1 @@
-web: node src/server.js
\ No newline at end of file
+web: node server.js
diff --git a/packages/react-scripts/template-ef/src/server.js b/packages/react-scripts/template-ef/server.js
similarity index 74%
rename from packages/react-scripts/template-ef/src/server.js
rename to packages/react-scripts/template-ef/server.js
index 720cecd0be9..b95bd893e86 100644
--- a/packages/react-scripts/template-ef/src/server.js
+++ b/packages/react-scripts/template-ef/server.js
@@ -1,9 +1,8 @@
-const path = require('path');
 const express = require('express');
 const app = express();
 
 // Statically serve up the production built React App
-app.use(express.static(`${__dirname}/build`));
+app.use(express.static('build'));
 
 const port = process.env.PORT || 3000;
 app.listen(port, () => {