From b0b165b9a57abc16174fc56118745cef053e445d Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Tue, 3 Aug 2021 10:50:56 +0200
Subject: [PATCH 01/12] create-app: add a prettier:check script in the template

Co-authored-by: Mike Lewis <mtlewis@users.noreply.github.com>
Signed-off-by: Himanshu Mishra <himanshu@orkohunter.net>
---
 packages/create-app/templates/default-app/package.json.hbs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs
index 7ae86c0fbc..a763b3cabb 100644
--- a/packages/create-app/templates/default-app/package.json.hbs
+++ b/packages/create-app/templates/default-app/package.json.hbs
@@ -19,6 +19,7 @@
     "test:all": "lerna run test -- --coverage",
     "lint": "lerna run lint --since origin/master --",
     "lint:all": "lerna run lint --",
+    "prettier:check": "prettier --check .",
     "create-plugin": "backstage-cli create-plugin --scope internal --no-private",
     "remove-plugin": "backstage-cli remove-plugin"
   },

From e7d9f68678dee468b0089bf3bff03734e1989322 Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Tue, 3 Aug 2021 10:51:55 +0200
Subject: [PATCH 02/12] e2e: run prettier check for newly created app

Co-authored-by: Mike Lewis <mtlewis@users.noreply.github.com>
Signed-off-by: Himanshu Mishra <himanshu@orkohunter.net>
---
 packages/e2e-test/src/commands/run.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts
index c205b4f527..e4072872d1 100644
--- a/packages/e2e-test/src/commands/run.ts
+++ b/packages/e2e-test/src/commands/run.ts
@@ -232,7 +232,14 @@ async function createApp(
 
     print('Test app created');
 
-    for (const cmd of ['install', 'tsc', 'build', 'lint:all', 'test:all']) {
+    for (const cmd of [
+      'install',
+      'tsc',
+      'build',
+      'lint:all',
+      'prettier:check',
+      'test:all',
+    ]) {
       print(`Running 'yarn ${cmd}' in newly created app`);
       await runPlain(['yarn', cmd], { cwd: appDir });
     }

From 58cdab3d601fa06307ff8eabd11a87984e892b25 Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Tue, 3 Aug 2021 11:11:09 +0200
Subject: [PATCH 03/12] create-app: upgrade prettier version

 since we are using 2.x in backstage/backstage

Co-authored-by: Mike Lewis <mtlewis@users.noreply.github.com>
Signed-off-by: Himanshu Mishra <himanshu@orkohunter.net>
---
 packages/create-app/templates/default-app/package.json.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs
index a763b3cabb..3f913102cb 100644
--- a/packages/create-app/templates/default-app/package.json.hbs
+++ b/packages/create-app/templates/default-app/package.json.hbs
@@ -38,7 +38,7 @@
     "@spotify/prettier-config": "^7.0.0",
     "concurrently": "^6.0.0",
     "lerna": "^4.0.0",
-    "prettier": "^1.19.1"
+    "prettier": "^2.3.2"
   },
   "prettier": "@spotify/prettier-config",
   "lint-staged": {

From 94abf07f1ddd0381bed5e6a4ad95b82327f5dc39 Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Tue, 3 Aug 2021 11:12:14 +0200
Subject: [PATCH 04/12] fix prettier issues in the create-app default template

Co-authored-by: Mike Lewis <mtlewis@users.noreply.github.com>
Signed-off-by: Himanshu Mishra <himanshu@orkohunter.net>
---
 packages/create-app/templates/default-app/README.md    |  2 +-
 .../templates/default-app/catalog-info.yaml.hbs        |  4 ++--
 .../default-app/packages/app/public/index.html         |  2 +-
 .../templates/default-app/packages/app/src/App.tsx     | 10 +++++-----
 .../templates/default-app/packages/app/src/apis.ts     |  9 +++++++--
 .../packages/app/src/components/catalog/EntityPage.tsx |  2 +-
 .../packages/backend/src/plugins/catalog.ts            |  6 ++++--
 .../packages/backend/src/plugins/scaffolder.ts         |  4 +---
 .../default-app/packages/backend/src/types.ts          |  2 +-
 9 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/packages/create-app/templates/default-app/README.md b/packages/create-app/templates/default-app/README.md
index 07cf6fd136..8c7c4373fe 100644
--- a/packages/create-app/templates/default-app/README.md
+++ b/packages/create-app/templates/default-app/README.md
@@ -7,4 +7,4 @@ To start the app, run:
 ```sh
 yarn install
 yarn dev
-```
\ No newline at end of file
+```
diff --git a/packages/create-app/templates/default-app/catalog-info.yaml.hbs b/packages/create-app/templates/default-app/catalog-info.yaml.hbs
index 265864e235..e01ce8f756 100644
--- a/packages/create-app/templates/default-app/catalog-info.yaml.hbs
+++ b/packages/create-app/templates/default-app/catalog-info.yaml.hbs
@@ -5,8 +5,8 @@ metadata:
   description: An example of a Backstage application.
   # Example for optional annotations
   # annotations:
-    # github.com/project-slug: backstage/backstage
-    # backstage.io/techdocs-ref: dir:.
+  #   github.com/project-slug: backstage/backstage
+  #   backstage.io/techdocs-ref: dir:.
 spec:
   type: website
   owner: john@example.com
diff --git a/packages/create-app/templates/default-app/packages/app/public/index.html b/packages/create-app/templates/default-app/packages/app/public/index.html
index 5653173480..b93896c6da 100644
--- a/packages/create-app/templates/default-app/packages/app/public/index.html
+++ b/packages/create-app/templates/default-app/packages/app/public/index.html
@@ -65,7 +65,7 @@
     </script>
     <% } %>
   </head>
-  <body style="margin: 0;">
+  <body style="margin: 0">
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <!--
diff --git a/packages/create-app/templates/default-app/packages/app/src/App.tsx b/packages/create-app/templates/default-app/packages/app/src/App.tsx
index c513c7e28e..6306b1a685 100644
--- a/packages/create-app/templates/default-app/packages/app/src/App.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/App.tsx
@@ -6,11 +6,11 @@ import {
   CatalogIndexPage,
   catalogPlugin,
 } from '@backstage/plugin-catalog';
-import {CatalogImportPage, catalogImportPlugin} from '@backstage/plugin-catalog-import';
-import { 
-  ScaffolderPage, 
-  scaffolderPlugin 
-} from '@backstage/plugin-scaffolder';
+import {
+  CatalogImportPage,
+  catalogImportPlugin,
+} from '@backstage/plugin-catalog-import';
+import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder';
 import { SearchPage } from '@backstage/plugin-search';
 import { TechRadarPage } from '@backstage/plugin-tech-radar';
 import { TechdocsPage } from '@backstage/plugin-techdocs';
diff --git a/packages/create-app/templates/default-app/packages/app/src/apis.ts b/packages/create-app/templates/default-app/packages/app/src/apis.ts
index 080b20fcbc..f2cd272c87 100644
--- a/packages/create-app/templates/default-app/packages/app/src/apis.ts
+++ b/packages/create-app/templates/default-app/packages/app/src/apis.ts
@@ -1,7 +1,12 @@
 import {
-  ScmIntegrationsApi, scmIntegrationsApiRef
+  ScmIntegrationsApi,
+  scmIntegrationsApiRef,
 } from '@backstage/integration-react';
-import { AnyApiFactory, configApiRef, createApiFactory } from '@backstage/core-plugin-api';
+import {
+  AnyApiFactory,
+  configApiRef,
+  createApiFactory,
+} from '@backstage/core-plugin-api';
 
 export const apis: AnyApiFactory[] = [
   createApiFactory({
diff --git a/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx b/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
index 6b285aff92..a78d1a8f01 100644
--- a/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
@@ -91,7 +91,7 @@ const overviewContent = (
         </Grid>
       </EntitySwitch.Case>
     </EntitySwitch>
-    
+
     <EntitySwitch>
       <EntitySwitch.Case if={hasCatalogProcessingErrors}>
         <Grid item xs={12}>
diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts
index a132f0a8ae..3145e588cc 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts
@@ -1,11 +1,13 @@
 import {
   CatalogBuilder,
-  createRouter
+  createRouter,
 } from '@backstage/plugin-catalog-backend';
 import { Router } from 'express';
 import { PluginEnvironment } from '../types';
 
-export default async function createPlugin(env: PluginEnvironment): Promise<Router> {
+export default async function createPlugin(
+  env: PluginEnvironment,
+): Promise<Router> {
   const builder = await CatalogBuilder.create(env);
   const {
     entitiesCatalog,
diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
index a0201cec01..2ce640c124 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
@@ -3,9 +3,7 @@ import {
   SingleHostDiscovery,
 } from '@backstage/backend-common';
 import { CatalogClient } from '@backstage/catalog-client';
-import {
-  createRouter,
-} from '@backstage/plugin-scaffolder-backend';
+import { createRouter } from '@backstage/plugin-scaffolder-backend';
 import Docker from 'dockerode';
 import { Router } from 'express';
 import type { PluginEnvironment } from '../types';
diff --git a/packages/create-app/templates/default-app/packages/backend/src/types.ts b/packages/create-app/templates/default-app/packages/backend/src/types.ts
index e5bfff2e1f..6c78a2a90c 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/types.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/types.ts
@@ -12,6 +12,6 @@ export type PluginEnvironment = {
   database: PluginDatabaseManager;
   cache: PluginCacheManager;
   config: Config;
-  reader: UrlReader
+  reader: UrlReader;
   discovery: PluginEndpointDiscovery;
 };

From cdbc3e0ce71097dc4554ec7ecc5e4e16db836441 Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Tue, 3 Aug 2021 11:30:49 +0200
Subject: [PATCH 05/12] create-app: add some folders to prettier ignore

Co-authored-by: Mike Lewis <mtlewis@users.noreply.github.com>
Signed-off-by: Himanshu Mishra <himanshu@orkohunter.net>
---
 packages/create-app/templates/default-app/.prettierignore | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/create-app/templates/default-app/.prettierignore

diff --git a/packages/create-app/templates/default-app/.prettierignore b/packages/create-app/templates/default-app/.prettierignore
new file mode 100644
index 0000000000..dfb0f1cd11
--- /dev/null
+++ b/packages/create-app/templates/default-app/.prettierignore
@@ -0,0 +1,4 @@
+dist
+dist-types
+coverage
+.vscode

From 32188af0fd290bba86e87e6639b886c9e2f0e7a6 Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Tue, 3 Aug 2021 11:53:06 +0200
Subject: [PATCH 06/12] create-app: fix prettier issue in template app-config

Co-authored-by: Mike Lewis <mtlewis@users.noreply.github.com>
Signed-off-by: Himanshu Mishra <himanshu@orkohunter.net>
---
 .../create-app/templates/default-app/app-config.yaml.hbs    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs
index dc296e5e62..9c35c58c33 100644
--- a/packages/create-app/templates/default-app/app-config.yaml.hbs
+++ b/packages/create-app/templates/default-app/app-config.yaml.hbs
@@ -32,9 +32,9 @@ backend:
       user: ${POSTGRES_USER}
       password: ${POSTGRES_PASSWORD}
       # https://node-postgres.com/features/ssl
-      #ssl: require # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. require)
-        #ca: # if you have a CA file and want to verify it you can uncomment this section
-        #  $file: <file-path>/ca/server.crt
+      # ssl: require # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. require)
+      #   ca: # if you have a CA file and want to verify it you can uncomment this section
+      #     $file: <file-path>/ca/server.crt
   {{/if}}
   cache:
     store: memory

From f71bbe5d28872047b1e425dd576de95e8e7bfdbb Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Tue, 3 Aug 2021 11:56:15 +0200
Subject: [PATCH 07/12] e2e-test: run yarn tsc:full on new apps

We encounetered errors with tsc:full on a newly created-app. So it should be verified that the command works

Co-authored-by: Mike Lewis <mtlewis@users.noreply.github.com>
Signed-off-by: Himanshu Mishra <himanshu@orkohunter.net>
---
 packages/e2e-test/src/commands/run.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts
index e4072872d1..94bb1dd7f5 100644
--- a/packages/e2e-test/src/commands/run.ts
+++ b/packages/e2e-test/src/commands/run.ts
@@ -234,7 +234,7 @@ async function createApp(
 
     for (const cmd of [
       'install',
-      'tsc',
+      'tsc:full',
       'build',
       'lint:all',
       'prettier:check',

From 990cc3bacbf6fc23c764be1490264ab39740b63d Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 5 Aug 2021 12:33:48 +0200
Subject: [PATCH 08/12] packages: switch @types/react dependency to use *

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/core-app-api/package.json                             | 2 +-
 packages/core-components/package.json                          | 2 +-
 packages/core-plugin-api/package.json                          | 2 +-
 packages/dev-utils/package.json                                | 2 +-
 packages/test-utils-core/package.json                          | 2 +-
 packages/test-utils/package.json                               | 2 +-
 plugins/api-docs/package.json                                  | 2 +-
 plugins/catalog-import/package.json                            | 2 +-
 plugins/catalog-react/package.json                             | 2 +-
 plugins/catalog/package.json                                   | 2 +-
 plugins/cost-insights/package.json                             | 2 +-
 plugins/explore/package.json                                   | 2 +-
 plugins/git-release-manager/package.json                       | 2 +-
 plugins/lighthouse/package.json                                | 2 +-
 plugins/pagerduty/package.json                                 | 2 +-
 plugins/rollbar/package.json                                   | 2 +-
 .../sample-templates/create-react-app/skeleton/package.json    | 2 +-
 .../sample-templates/react-ssr-template/skeleton/package.json  | 2 +-
 plugins/scaffolder/package.json                                | 2 +-
 plugins/search/package.json                                    | 3 +--
 plugins/sentry/package.json                                    | 2 +-
 plugins/tech-radar/package.json                                | 2 +-
 plugins/techdocs/package.json                                  | 2 +-
 23 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index d49d89eab6..20b71c6bb5 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -35,7 +35,7 @@
     "@backstage/theme": "^0.2.9",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "@types/prop-types": "^15.7.3",
     "prop-types": "^15.7.2",
     "react": "^16.12.0",
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index d28d8a177e..457fe2db2e 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -39,7 +39,7 @@
     "@testing-library/react-hooks": "^3.4.2",
     "@types/dagre": "^0.7.44",
     "@types/prop-types": "^15.7.3",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "@types/react-sparklines": "^1.7.0",
     "@types/react-text-truncate": "^0.14.0",
     "classnames": "^2.2.6",
diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json
index 374c158d57..7843a2bd0f 100644
--- a/packages/core-plugin-api/package.json
+++ b/packages/core-plugin-api/package.json
@@ -32,7 +32,7 @@
     "@backstage/config": "^0.1.3",
     "@backstage/theme": "^0.2.9",
     "@material-ui/core": "^4.12.2",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "history": "^5.0.0",
     "prop-types": "^15.7.2",
     "react": "^16.12.0",
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index b211c67f44..a3fc6ef326 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -42,7 +42,7 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-hot-loader": "^4.12.21",
diff --git a/packages/test-utils-core/package.json b/packages/test-utils-core/package.json
index d3c8d11bb5..84475d3c5d 100644
--- a/packages/test-utils-core/package.json
+++ b/packages/test-utils-core/package.json
@@ -31,7 +31,7 @@
   "dependencies": {
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
   },
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index d5c8c505e4..80fb029f34 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -37,7 +37,7 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "msw": "^0.29.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index ffa488de2f..efa6c5f090 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -40,7 +40,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "graphiql": "^1.0.0-alpha.10",
     "graphql": "^15.3.0",
     "isomorphic-form-data": "^2.0.0",
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index f854bb423f..ae3e454fc0 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -42,7 +42,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@octokit/rest": "^18.5.3",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "git-url-parse": "~11.4.4",
     "js-base64": "^3.6.0",
     "react": "^16.13.1",
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index c8e6b2e604..ec3cafea23 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -37,7 +37,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "jwt-decode": "^3.1.0",
     "lodash": "^4.17.15",
     "qs": "^6.9.4",
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index 0935f797fc..d2900eec10 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -42,7 +42,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "classnames": "^2.2.6",
     "git-url-parse": "~11.4.4",
     "lodash": "^4.17.21",
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index 469cc7075f..d05bcbc510 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -38,7 +38,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@material-ui/styles": "^4.9.6",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "@types/recharts": "^1.8.14",
     "classnames": "^2.2.6",
     "history": "^5.0.0",
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index 78a51dfbea..d8ae9dba71 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -39,7 +39,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "classnames": "^2.2.6",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
diff --git a/plugins/git-release-manager/package.json b/plugins/git-release-manager/package.json
index 97c22558a9..58c2f14fe5 100644
--- a/plugins/git-release-manager/package.json
+++ b/plugins/git-release-manager/package.json
@@ -28,7 +28,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@octokit/rest": "^18.5.3",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "luxon": "^1.26.0",
     "qs": "^6.10.1",
     "react-dom": "^16.13.1",
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index 47d816b857..d7ae5bff83 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -56,7 +56,7 @@
     "@testing-library/user-event": "^13.1.8",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "cross-fetch": "^3.0.6",
     "msw": "^0.29.0"
   },
diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json
index b5dccba914..24226aef6e 100644
--- a/plugins/pagerduty/package.json
+++ b/plugins/pagerduty/package.json
@@ -38,7 +38,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "classnames": "^2.2.6",
     "luxon": "1.25.0",
     "react": "^16.13.1",
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index 26d4194795..eae619f132 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -58,7 +58,7 @@
     "@testing-library/user-event": "^13.1.8",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "cross-fetch": "^3.0.6",
     "msw": "^0.29.0"
   },
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
index 2ce9bf6266..565dc5db60 100644
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
+++ b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
@@ -8,7 +8,7 @@
     "@testing-library/user-event": "^12.1.10",
     "@types/jest": "^26.0.15",
     "@types/node": "^12.0.0",
-    "@types/react": "^17.0.0",
+    "@types/react": "*",
     "@types/react-dom": "^17.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
index 75925bf567..88765d36c1 100644
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
@@ -25,7 +25,7 @@
     "@spotify/web-scripts": "^5.0.0",
     "@testing-library/react": "^8.0.1",
     "@types/node": "^14.14.32",
-    "@types/react": "^16.8.7",
+    "@types/react": "*",
     "@types/react-dom": "^16.8.2",
     "@types/styled-components": "^4.1.18",
     "husky": "^2.7.0",
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index f31be76803..2dbce9e467 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -45,7 +45,7 @@
     "@material-ui/lab": "4.0.0-alpha.45",
     "@rjsf/core": "^3.0.0",
     "@rjsf/material-ui": "^3.0.0",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "classnames": "^2.2.6",
     "git-url-parse": "~11.4.4",
     "humanize-duration": "^3.25.1",
diff --git a/plugins/search/package.json b/plugins/search/package.json
index 564e62a6ba..b2c8e0e745 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -40,7 +40,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "qs": "^6.9.4",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -59,7 +59,6 @@
     "@testing-library/user-event": "^13.1.8",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
-    "@types/react": "^16.9",
     "cross-fetch": "^3.0.6",
     "msw": "^0.29.0"
   },
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index 648f930fb5..dde57f309e 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -57,7 +57,7 @@
     "@types/jest": "^26.0.7",
     "@types/luxon": "^1.27.0",
     "@types/node": "^14.14.32",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "cross-fetch": "^3.0.6",
     "msw": "^0.29.0"
   },
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index 611c475e64..f7ad48aad1 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -55,7 +55,7 @@
     "@types/d3-force": "^2.1.1",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "cross-fetch": "^3.0.6",
     "msw": "^0.29.0"
   },
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index be6cd4c344..bb77553ebd 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -67,7 +67,7 @@
     "@types/eventsource": "^1.1.5",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "canvas": "^2.6.1",
     "cross-fetch": "^3.0.6",
     "msw": "^0.29.0"

From d74032edadccb4cef3f75d67cdbe080a64421ff4 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 5 Aug 2021 13:41:07 +0200
Subject: [PATCH 09/12] packages: switch @types/react-dom dependency to use *

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/app/package.json                                 | 2 +-
 .../templates/default-app/packages/app/package.json.hbs   | 2 +-
 .../create-react-app/skeleton/package.json                | 2 +-
 .../react-ssr-template/skeleton/package.json              | 2 +-
 yarn.lock                                                 | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/app/package.json b/packages/app/package.json
index abba8492da..100e26b240 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -68,7 +68,7 @@
     "@types/jest": "^26.0.7",
     "@types/jquery": "^3.3.34",
     "@types/node": "^14.14.32",
-    "@types/react-dom": "^16.9.8",
+    "@types/react-dom": "*",
     "@types/zen-observable": "^0.8.0",
     "cross-env": "^7.0.0",
     "cypress": "^7.3.0",
diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs
index 219f503aa0..c443b45dc7 100644
--- a/packages/create-app/templates/default-app/packages/app/package.json.hbs
+++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs
@@ -38,7 +38,7 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
-    "@types/react-dom": "^16.9.8",
+    "@types/react-dom": "*",
     "cross-env": "^7.0.0",
     "cypress": "^7.3.0",
     "eslint-plugin-cypress": "^2.10.3",
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
index 565dc5db60..88560c379d 100644
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
+++ b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
@@ -9,7 +9,7 @@
     "@types/jest": "^26.0.15",
     "@types/node": "^12.0.0",
     "@types/react": "*",
-    "@types/react-dom": "^17.0.0",
+    "@types/react-dom": "*",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-scripts": "4.0.3",
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
index 88765d36c1..8ea9f7ba5f 100644
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
@@ -26,7 +26,7 @@
     "@testing-library/react": "^8.0.1",
     "@types/node": "^14.14.32",
     "@types/react": "*",
-    "@types/react-dom": "^16.8.2",
+    "@types/react-dom": "*",
     "@types/styled-components": "^4.1.18",
     "husky": "^2.7.0",
     "jest-junit": "^8.0.0",
diff --git a/yarn.lock b/yarn.lock
index b74316d89d..c70c1790ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6532,10 +6532,10 @@
     "@types/webpack" "^4"
     "@types/webpack-dev-server" "*"
 
-"@types/react-dom@^16.9.8":
-  version "16.9.8"
-  resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
-  integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==
+"@types/react-dom@*":
+  version "17.0.9"
+  resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add"
+  integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==
   dependencies:
     "@types/react" "*"
 

From 11af62d235e1ad8d14bf6aa5398463fc5cb58233 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 5 Aug 2021 17:03:27 +0200
Subject: [PATCH 10/12] github/workflows: use LF line endings in e2e-win

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .github/workflows/e2e-win.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml
index 1844700cea..3e2fbe0863 100644
--- a/.github/workflows/e2e-win.yml
+++ b/.github/workflows/e2e-win.yml
@@ -25,6 +25,13 @@ jobs:
 
     name: Node ${{ matrix.node-version }} on ${{ matrix.os }}
     steps:
+      # In order to have the create-app template function as if it was downloaded from NPM
+      # we need to make sure we checkout files with LF line endings only
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
       - uses: actions/checkout@v2
 
       - name: use node.js ${{ matrix.node-version }}

From 53e0efe1f0a6cc2168da2be5ec061a5181b7300d Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 5 Aug 2021 17:59:16 +0200
Subject: [PATCH 11/12] plugins/scaffolder-backend/sample-templates: rolled
 back @react/types version changes

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../sample-templates/create-react-app/skeleton/package.json   | 4 ++--
 .../sample-templates/react-ssr-template/skeleton/package.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
index 88560c379d..2ce9bf6266 100644
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
+++ b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
@@ -8,8 +8,8 @@
     "@testing-library/user-event": "^12.1.10",
     "@types/jest": "^26.0.15",
     "@types/node": "^12.0.0",
-    "@types/react": "*",
-    "@types/react-dom": "*",
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-scripts": "4.0.3",
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
index 8ea9f7ba5f..75925bf567 100644
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
@@ -25,8 +25,8 @@
     "@spotify/web-scripts": "^5.0.0",
     "@testing-library/react": "^8.0.1",
     "@types/node": "^14.14.32",
-    "@types/react": "*",
-    "@types/react-dom": "*",
+    "@types/react": "^16.8.7",
+    "@types/react-dom": "^16.8.2",
     "@types/styled-components": "^4.1.18",
     "husky": "^2.7.0",
     "jest-junit": "^8.0.0",

From 56c773909c12f520615a670b7f8c0dbfdbbb799f Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 5 Aug 2021 18:06:22 +0200
Subject: [PATCH 12/12] changesets: changesets for @types/react and create-app
 prettier

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/modern-ghosts-dress.md | 25 +++++++++++++++++++++++
 .changeset/sharp-berries-fail.md  | 34 +++++++++++++++++++++++++++++++
 .changeset/small-actors-sing.md   | 12 +++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 .changeset/modern-ghosts-dress.md
 create mode 100644 .changeset/sharp-berries-fail.md
 create mode 100644 .changeset/small-actors-sing.md

diff --git a/.changeset/modern-ghosts-dress.md b/.changeset/modern-ghosts-dress.md
new file mode 100644
index 0000000000..6d3cdbfd3c
--- /dev/null
+++ b/.changeset/modern-ghosts-dress.md
@@ -0,0 +1,25 @@
+---
+'@backstage/core-app-api': patch
+'@backstage/core-components': patch
+'@backstage/core-plugin-api': patch
+'@backstage/dev-utils': patch
+'@backstage/test-utils': patch
+'@backstage/test-utils-core': patch
+'@backstage/plugin-api-docs': patch
+'@backstage/plugin-catalog': patch
+'@backstage/plugin-catalog-import': patch
+'@backstage/plugin-catalog-react': patch
+'@backstage/plugin-cost-insights': patch
+'@backstage/plugin-explore': patch
+'@backstage/plugin-git-release-manager': patch
+'@backstage/plugin-lighthouse': patch
+'@backstage/plugin-pagerduty': patch
+'@backstage/plugin-rollbar': patch
+'@backstage/plugin-scaffolder': patch
+'@backstage/plugin-search': patch
+'@backstage/plugin-sentry': patch
+'@backstage/plugin-tech-radar': patch
+'@backstage/plugin-techdocs': patch
+---
+
+Switched `@types/react` dependency to request `*` rather than a specific version.
diff --git a/.changeset/sharp-berries-fail.md b/.changeset/sharp-berries-fail.md
new file mode 100644
index 0000000000..a713b3fdee
--- /dev/null
+++ b/.changeset/sharp-berries-fail.md
@@ -0,0 +1,34 @@
+---
+'@backstage/create-app': patch
+---
+
+Add a complete prettier setup to the created project. Prettier used to only be added as a dependency to create apps, but there wasn't a complete setup included that makes it easy to run prettier. That has now changed, and the new `prettier:check` command can be used to check the formatting of the files in your created project.
+
+To apply this change to an existing app, a couple of changes need to be made.
+
+Create a `.prettierignore` file at the root of your repository with the following contents:
+
+```
+dist
+dist-types
+coverage
+.vscode
+```
+
+Next update the root `package.json` by bumping the prettier version and adding the new `prettier:check` command:
+
+```diff
+   "scripts": {
+     ...
++    "prettier:check": "prettier --check .",
+     ...
+   },
+   ...
+   "dependencies": {
+     ...
+-    "prettier": "^1.19.1"
++    "prettier": "^2.3.2"
+   }
+```
+
+Finally run `yarn prettier --write .` on your project to update the existing formatting.
diff --git a/.changeset/small-actors-sing.md b/.changeset/small-actors-sing.md
new file mode 100644
index 0000000000..40de0f363f
--- /dev/null
+++ b/.changeset/small-actors-sing.md
@@ -0,0 +1,12 @@
+---
+'@backstage/create-app': patch
+---
+
+Switched `@types/react-dom` dependency to of the app package to request `*` rather than a specific version.
+
+To apply this change to an existing app, change the following in `packages/app/package.json`:
+
+```diff
+-    "@types/react-dom": "^16.9.8",
++    "@types/react-dom": "*",
+```