From 53fed5a17c7e256d83753945ec7a03674cbb812f Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 7 Apr 2020 18:05:21 +0200
Subject: [PATCH 1/4] backstage/cli: add common tsconfig

---
 packages/cli/config/tsconfig.json                | 11 +++++++++++
 packages/cli/templates/default-app/tsconfig.json |  9 +--------
 tsconfig.json                                    | 10 +---------
 3 files changed, 13 insertions(+), 17 deletions(-)
 create mode 100644 packages/cli/config/tsconfig.json

diff --git a/packages/cli/config/tsconfig.json b/packages/cli/config/tsconfig.json
new file mode 100644
index 0000000000..abb10087ca
--- /dev/null
+++ b/packages/cli/config/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "@spotify/web-scripts/config/tsconfig.json",
+  "exclude": ["**/*.test.*"],
+  "compilerOptions": {
+    "allowJs": true,
+    "noEmit": false,
+    "declarationMap": true,
+    "incremental": true,
+    "module": "es6"
+  }
+}
diff --git a/packages/cli/templates/default-app/tsconfig.json b/packages/cli/templates/default-app/tsconfig.json
index 25f61cc933..f278b2777d 100644
--- a/packages/cli/templates/default-app/tsconfig.json
+++ b/packages/cli/templates/default-app/tsconfig.json
@@ -1,10 +1,3 @@
 {
-  "extends": "@spotify/web-scripts/config/tsconfig.json",
-  "exclude": ["**/*.test.*"],
-  "compilerOptions": {
-    "allowJs": true,
-    "noEmit": false,
-    "declarationMap": true,
-    "incremental": true
-  }
+  "extends": "@backstage/cli/config/tsconfig.json"
 }
diff --git a/tsconfig.json b/tsconfig.json
index abb10087ca..f278b2777d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,3 @@
 {
-  "extends": "@spotify/web-scripts/config/tsconfig.json",
-  "exclude": ["**/*.test.*"],
-  "compilerOptions": {
-    "allowJs": true,
-    "noEmit": false,
-    "declarationMap": true,
-    "incremental": true,
-    "module": "es6"
-  }
+  "extends": "@backstage/cli/config/tsconfig.json"
 }

From 1275e438771e1b45727821345768854965808f74 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 7 Apr 2020 18:05:45 +0200
Subject: [PATCH 2/4] packages/cli: fix WelcomePage using old props in
 scaffolded app

---
 .../plugins/welcome/src/components/WelcomePage/WelcomePage.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/templates/default-app/plugins/welcome/src/components/WelcomePage/WelcomePage.tsx b/packages/cli/templates/default-app/plugins/welcome/src/components/WelcomePage/WelcomePage.tsx
index 19f9ee55e2..d9ef0524c6 100644
--- a/packages/cli/templates/default-app/plugins/welcome/src/components/WelcomePage/WelcomePage.tsx
+++ b/packages/cli/templates/default-app/plugins/welcome/src/components/WelcomePage/WelcomePage.tsx
@@ -36,7 +36,7 @@ const WelcomePage: FC<{}> = () => {
         </ContentHeader>
         <Grid container>
           <Grid item xs={12} md={6}>
-            <InfoCard maxWidth>
+            <InfoCard>
               <Typography variant="body1" gutterBottom>
                 You now have a running instance of Backstage!
                 <span role="img" aria-label="confetti">

From 43d3388238b7d05c8a3e901aae4fc08a124e3456 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 7 Apr 2020 18:06:21 +0200
Subject: [PATCH 3/4] packages/cli: fix scaffolded app main and types fields

---
 .../templates/default-app/plugins/welcome/package.json.hbs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/templates/default-app/plugins/welcome/package.json.hbs b/packages/cli/templates/default-app/plugins/welcome/package.json.hbs
index 581f5e41ce..9593a4007f 100644
--- a/packages/cli/templates/default-app/plugins/welcome/package.json.hbs
+++ b/packages/cli/templates/default-app/plugins/welcome/package.json.hbs
@@ -1,8 +1,8 @@
 {
   "name": "plugin-welcome",
   "version": "0.0.0",
-  "main": "dist/cjs/index.js",
-  "types": "dist/cjs/index.d.ts",
+  "main": "dist/index.cjs.js",
+  "types": "dist/index.d.ts",
   "private": true,
   "scripts": {
     "build": "backstage-cli plugin:build",

From 89494ad4cd62f8b5679efc72a970ce184d4648cd Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 7 Apr 2020 18:06:49 +0200
Subject: [PATCH 4/4] packages/cli: updated deps of scaffolded app plugin

---
 .../default-app/plugins/welcome/package.json.hbs       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/cli/templates/default-app/plugins/welcome/package.json.hbs b/packages/cli/templates/default-app/plugins/welcome/package.json.hbs
index 9593a4007f..9069ce6f8e 100644
--- a/packages/cli/templates/default-app/plugins/welcome/package.json.hbs
+++ b/packages/cli/templates/default-app/plugins/welcome/package.json.hbs
@@ -11,11 +11,17 @@
   },
   "devDependencies": {
     "@backstage/cli": "^{{version}}",
+    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/react": "^9.3.2",
     "@types/testing-library__jest-dom": "5.0.2"
   },
   "dependencies": {
-    "@material-ui/lab": "4.0.0-alpha.45",
     "@backstage/core": "^{{version}}",
-    "@backstage/theme": "^{{version}}"
+    "@backstage/theme": "^{{version}}",
+    "@material-ui/core": "^4.9.1",
+    "@material-ui/icons": "^4.9.1",
+    "react": "16.13.1",
+    "react-dom": "16.13.1",
+    "react-router-dom": "5.1.2"
   }
 }