From 614fd12ad0eeb20b130433e726e8e2264f903602 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 28 Oct 2021 20:49:47 +0200
Subject: [PATCH] chore: wrap up the killTree?

Signed-off-by: blam <ben@blam.sh>
---
 packages/core-components/package.json         |  4 +-
 packages/core-components/package.json-prepack | 92 +++++++++++++++++++
 packages/e2e-test/src/commands/run.ts         |  8 +-
 3 files changed, 100 insertions(+), 4 deletions(-)
 create mode 100644 packages/core-components/package.json-prepack

diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index 7f50af7488..5534d27c2a 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -18,8 +18,8 @@
     "backstage"
   ],
   "license": "Apache-2.0",
-  "main": "src/index.ts",
-  "types": "src/index.ts",
+  "main": "dist/index.esm.js",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "backstage-cli build --outputs types,esm",
     "lint": "backstage-cli lint",
diff --git a/packages/core-components/package.json-prepack b/packages/core-components/package.json-prepack
new file mode 100644
index 0000000000..038b99ca90
--- /dev/null
+++ b/packages/core-components/package.json-prepack
@@ -0,0 +1,92 @@
+{
+  "name": "@backstage/core-components",
+  "description": "Core components used by Backstage plugins and apps",
+  "version": "0.7.1",
+  "private": false,
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.esm.js",
+    "types": "dist/index.d.ts"
+  },
+  "homepage": "https://backstage.io",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/backstage/backstage",
+    "directory": "packages/core-components"
+  },
+  "keywords": [
+    "backstage"
+  ],
+  "license": "Apache-2.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "scripts": {
+    "build": "backstage-cli build --outputs types,esm",
+    "lint": "backstage-cli lint",
+    "test": "backstage-cli test",
+    "prepack": "backstage-cli prepack",
+    "postpack": "backstage-cli postpack",
+    "clean": "backstage-cli clean"
+  },
+  "dependencies": {
+    "@backstage/config": "^0.1.10",
+    "@backstage/core-plugin-api": "^0.1.11",
+    "@backstage/errors": "^0.1.3",
+    "@backstage/theme": "^0.2.11",
+    "@material-table/core": "^3.1.0",
+    "@material-ui/core": "^4.12.2",
+    "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "4.0.0-alpha.57",
+    "@types/react": "*",
+    "@types/react-sparklines": "^1.7.0",
+    "@types/react-text-truncate": "^0.14.0",
+    "classnames": "^2.2.6",
+    "clsx": "^1.1.0",
+    "d3-selection": "^3.0.0",
+    "d3-shape": "^3.0.0",
+    "d3-zoom": "^3.0.0",
+    "dagre": "^0.8.5",
+    "immer": "^9.0.1",
+    "lodash": "^4.17.21",
+    "pluralize": "^8.0.0",
+    "prop-types": "^15.7.2",
+    "qs": "^6.9.4",
+    "rc-progress": "^3.0.0",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
+    "react-helmet": "6.1.0",
+    "react-hook-form": "^7.12.2",
+    "react-markdown": "^7.0.1",
+    "react-router": "6.0.0-beta.0",
+    "react-router-dom": "6.0.0-beta.0",
+    "react-sparklines": "^1.7.0",
+    "react-syntax-highlighter": "^15.4.3",
+    "react-text-truncate": "^0.16.0",
+    "react-use": "^17.2.4",
+    "remark-gfm": "^2.0.0",
+    "zen-observable": "^0.8.15"
+  },
+  "devDependencies": {
+    "@backstage/core-app-api": "^0.1.18",
+    "@backstage/cli": "^0.8.0",
+    "@backstage/test-utils": "^0.1.19",
+    "@testing-library/jest-dom": "^5.10.1",
+    "@testing-library/react": "^11.2.5",
+    "@testing-library/react-hooks": "^7.0.2",
+    "@testing-library/user-event": "^13.1.8",
+    "@types/classnames": "^2.2.9",
+    "@types/d3-selection": "^3.0.1",
+    "@types/d3-shape": "^3.0.1",
+    "@types/d3-zoom": "^3.0.1",
+    "@types/dagre": "^0.7.44",
+    "@types/google-protobuf": "^3.7.2",
+    "@types/jest": "^26.0.7",
+    "@types/node": "^14.14.32",
+    "@types/react-helmet": "^6.1.0",
+    "@types/react-syntax-highlighter": "^13.5.2",
+    "@types/zen-observable": "^0.8.0"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts
index eedaca9a8a..e5399c13f9 100644
--- a/packages/e2e-test/src/commands/run.ts
+++ b/packages/e2e-test/src/commands/run.ts
@@ -384,7 +384,9 @@ async function testAppServe(pluginName: string, appDir: string) {
   } finally {
     // Kill entire process group, otherwise we'll end up with hanging serve processes
     if (browser) await browser.close();
-    killTree(startApp.pid);
+    await new Promise<void>((res, rej) =>
+      killTree(startApp.pid, err => (err ? rej(err) : res())),
+    );
   }
 
   try {
@@ -463,7 +465,9 @@ async function testBackendStart(appDir: string, isPostgres: boolean) {
   } finally {
     print('Stopping the child process');
     // Kill entire process group, otherwise we'll end up with hanging serve processes
-    killTree(child.pid);
+    await new Promise<void>((res, rej) =>
+      killTree(child.pid, err => (err ? rej(err) : res())),
+    );
   }
 
   try {