From 63047c968daeca509095b3f020fe06197da24f54 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 20 Jan 2021 20:37:35 +0100
Subject: [PATCH] e2e-test: include create-app deps in workspace

---
 packages/e2e-test/src/commands/run.ts | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts
index be00b99e54..2ddcc333d2 100644
--- a/packages/e2e-test/src/commands/run.ts
+++ b/packages/e2e-test/src/commands/run.ts
@@ -80,10 +80,22 @@ async function buildDistWorkspace(workspaceName: string, rootDir: string) {
 
   // We grab the needed dependencies from the create app template
   const createAppDeps = new Set<string>();
+
+  function appendDeps(pkg: any) {
+    Array<string>()
+      .concat(
+        Object.keys(pkg.dependencies ?? {}),
+        Object.keys(pkg.devDependencies ?? {}),
+        Object.keys(pkg.peerDependencies ?? {}),
+      )
+      .filter(name => name.startsWith('@backstage/'))
+      .forEach(dep => createAppDeps.add(dep));
+  }
+
   for (const pkgJsonPath of templatePackagePaths) {
     const path = paths.resolveOwnRoot(pkgJsonPath);
     const pkgTemplate = await fs.readFile(path, 'utf8');
-    const { dependencies = {}, devDependencies = {} } = JSON.parse(
+    const pkg = JSON.parse(
       handlebars.compile(pkgTemplate)(
         {
           privatePackage: true,
@@ -102,13 +114,12 @@ async function buildDistWorkspace(workspaceName: string, rootDir: string) {
         },
       ),
     );
-
-    Array<string>()
-      .concat(Object.keys(dependencies), Object.keys(devDependencies))
-      .filter(name => name.startsWith('@backstage/'))
-      .forEach(dep => createAppDeps.add(dep));
+    appendDeps(pkg);
   }
 
+  // eslint-disable-next-line import/no-extraneous-dependencies
+  appendDeps(require('@backstage/create-app/package.json'));
+
   print(`Preparing workspace`);
   await runPlain([
     'yarn',