From 2db99234966ab3e7c964de3d8acb4f21241ed350 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 26 Oct 2021 19:45:52 +0200
Subject: [PATCH] changesets: updated changesets to use withDefaults

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/giant-drinks-wave.md   |  2 +-
 .changeset/hot-walls-fail.md      | 25 +++++++------------------
 .changeset/late-rice-sit.md       |  2 +-
 .changeset/twenty-swans-matter.md | 15 +++++++--------
 4 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/.changeset/giant-drinks-wave.md b/.changeset/giant-drinks-wave.md
index ab9df136fc..4c2f754c2c 100644
--- a/.changeset/giant-drinks-wave.md
+++ b/.changeset/giant-drinks-wave.md
@@ -2,4 +2,4 @@
 '@backstage/dev-utils': patch
 ---
 
-Migrated to explicit passing of components to `createApp`.
+Migrated to using `withDefaults` to pass defaults to `createApp`.
diff --git a/.changeset/hot-walls-fail.md b/.changeset/hot-walls-fail.md
index 055613934d..c814354a56 100644
--- a/.changeset/hot-walls-fail.md
+++ b/.changeset/hot-walls-fail.md
@@ -2,32 +2,21 @@
 '@backstage/create-app': patch
 ---
 
-Migrated the app template to pass on explicit `components` to the `createApp` options, as not doing this has been deprecated and will need to be done in the future.
+Migrated the app template use the new `withDefaults` to construct the `createApp` options, as not doing this has been deprecated and will need to be done in the future.
 
 To migrate an existing application, make the following change to `packages/app/src/App.tsx`:
 
 ```diff
-+import { defaultAppComponents } from '@backstage/core-components';
++import { withDefaults } from '@backstage/core-components';
 
  // ...
 
- const app = createApp({
+-const app = createApp({
++const app = createApp(withDefaults({
    apis,
-+  components: defaultAppComponents(),
    bindRoutes({ bind }) {
-```
-
-If you already supply custom app components, you can use the following:
-
-```diff
-
- // ...
-
- const app = createApp({
-   apis,
-+  components: {
-     ...defaultAppComponents(),
-+    Progress: MyCustomProgressComponent,
+     ...
    },
-   bindRoutes({ bind }) {
+-});
++}));
 ```
diff --git a/.changeset/late-rice-sit.md b/.changeset/late-rice-sit.md
index eb074cbb18..778215038f 100644
--- a/.changeset/late-rice-sit.md
+++ b/.changeset/late-rice-sit.md
@@ -2,4 +2,4 @@
 '@backstage/core-components': patch
 ---
 
-Added a new `defaultAppComponents` method that creates a minimal set of components to pass on to `createApp` from `@backstage/core-app-api`.
+Added a new `withDefaults` method that accepts a set of `AppOptions` and add the default components, themes and icons. It is intended to be used together with `createApp` from `@backstage/core-app-api` like this: `createApp(withDefaults({ ... }))`.
diff --git a/.changeset/twenty-swans-matter.md b/.changeset/twenty-swans-matter.md
index 0722913e05..6dea7a089f 100644
--- a/.changeset/twenty-swans-matter.md
+++ b/.changeset/twenty-swans-matter.md
@@ -2,15 +2,14 @@
 '@backstage/core-app-api': patch
 ---
 
-Deprecated the defaulting of the `components` options of `createApp`, meaning it will become required in the future. When not passing the required components options a deprecation warning is currently logged, and it will become required in a future release.
+Deprecated the defaulting of the `components`, `icons` and `themes` options of `createApp`, meaning it will become required in the future. When not passing the required options a deprecation warning is currently logged, and they will become required in a future release.
 
-The keep the existing components intact, migrate to using `defaultAppComponents` from `@backstage/core-components`:
+The keep using the default set of options, migrate to using `withDefaults` from `@backstage/core-components`:
 
 ```ts
-const app = createApp({
-  components: {
-    ...defaultAppComponents(),
-    // Place any custom components here
-  },
-});
+const app = createApp(
+  withDefaults({
+    // ...
+  }),
+);
 ```