Merge branch 'master' of github.com:backstage/backstage into RoadieHQ-5identity-api-client-interface

packages/create-app/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @backstage/create-app
 
+## 0.4.31-next.1
+
+### Patch Changes
+
+- c1f1a4c760: The Backstage packages and plugins have all been updated to support React Router v6 stable. The `create-app` template has not been migrated yet, but if you want to migrate your own app or plugins, check out the [migration guide](https://backstage.io/docs/tutorials/react-router-stable-migration).
+- c3c90280be: The options part of `DatabaseManager.fromConfig` now accepts an optional logger
+  field. You may want to supply that logger in your backend initialization code to
+  ensure that you can get relevant logging data when things happen related to the
+  connection pool.
+
+  In `packages/backend/src/index.ts`:
+
+  ```diff
+   function makeCreateEnv(config: Config) {
+     const root = getRootLogger();
+     ...
+  -  const databaseManager = DatabaseManager.fromConfig(config);
+  +  const databaseManager = DatabaseManager.fromConfig(config, { logger: root });
+  ```
+
 ## 0.4.31-next.0
 
 ### Patch Changes

packages/create-app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/create-app",
   "description": "A CLI that helps you create your own Backstage app",
-  "version": "0.4.31-next.0",
+  "version": "0.4.31-next.1",
   "private": false,
   "publishConfig": {
     "access": "public"

packages/create-app/src/lib/tasks.test.ts

@@ -130,10 +130,10 @@ describe('buildAppTask', () => {
 
     const appDir = 'projects/dir';
     await expect(buildAppTask(appDir)).resolves.not.toThrow();
-    expect(mockChdir).toBeCalledTimes(2);
+    expect(mockChdir).toHaveBeenCalledTimes(2);
     expect(mockChdir).toHaveBeenNthCalledWith(1, appDir);
     expect(mockChdir).toHaveBeenNthCalledWith(2, appDir);
-    expect(mockExec).toBeCalledTimes(2);
+    expect(mockExec).toHaveBeenCalledTimes(2);
     expect(mockExec).toHaveBeenNthCalledWith(
       1,
       'yarn install',

packages/create-app/templates/default-app/packages/backend/src/index.ts

@@ -37,7 +37,7 @@ function makeCreateEnv(config: Config) {
   const reader = UrlReaders.default({ logger: root, config });
   const discovery = SingleHostDiscovery.fromConfig(config);
   const cacheManager = CacheManager.fromConfig(config);
-  const databaseManager = DatabaseManager.fromConfig(config);
+  const databaseManager = DatabaseManager.fromConfig(config, { logger: root });
   const tokenManager = ServerTokenManager.noop();
   const taskScheduler = TaskScheduler.fromConfig(config);