Merge branch 'master' of https://github.com/backstage/backstage into bazaar-workflow-changes

plugins/bazaar/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @backstage/plugin-bazaar
 
+## 0.1.8
+
+### Patch Changes
+
+- 4ce51ab0f1: Internal refactor of the `react-use` imports to use `react-use/lib/*` instead.
+- Updated dependencies
+  - @backstage/cli@0.10.5
+  - @backstage/core-plugin-api@0.4.1
+  - @backstage/plugin-catalog-react@0.6.10
+  - @backstage/core-components@0.8.3
+  - @backstage/plugin-catalog@0.7.7
+
+## 0.1.7
+
+### Patch Changes
+
+- 26926bb7a7: made the linkage between a Bazaar project to a catalog Entity optional
+- Updated dependencies
+  - @backstage/core-plugin-api@0.4.0
+  - @backstage/plugin-catalog-react@0.6.8
+  - @backstage/core-components@0.8.2
+  - @backstage/cli@0.10.3
+  - @backstage/plugin-catalog@0.7.5
+
 ## 0.1.6
 
 ### Patch Changes

plugins/bazaar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bazaar",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,12 +22,12 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.7",
-    "@backstage/cli": "^0.10.1",
-    "@backstage/core-components": "^0.8.0",
-    "@backstage/core-plugin-api": "^0.3.0",
-    "@backstage/plugin-catalog": "^0.7.4",
-    "@backstage/plugin-catalog-react": "^0.6.5",
-    "@date-io/luxon": "1.x",
+    "@backstage/cli": "^0.10.5",
+    "@backstage/core-components": "^0.8.3",
+    "@backstage/core-plugin-api": "^0.4.1",
+    "@backstage/plugin-catalog": "^0.7.7",
+    "@backstage/plugin-catalog-react": "^0.6.10",
+    "@date-io/luxon": "2.x",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
@@ -43,8 +43,8 @@
     "react": "^16.13.1 || ^17.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.10.1",
-    "@backstage/dev-utils": "^0.2.14",
+    "@backstage/cli": "^0.10.5",
+    "@backstage/dev-utils": "^0.2.16",
     "@testing-library/jest-dom": "^5.10.1",
     "cross-fetch": "^3.0.6"
   },

plugins/bazaar/src/api.ts

@@ -22,7 +22,6 @@ import {
 
 export const bazaarApiRef = createApiRef<BazaarApi>({
   id: 'bazaar',
-  description: 'Used to make requests towards the bazaar backend',
 });
 
 export interface BazaarApi {

plugins/bazaar/src/components/EntityBazaarInfoCard/EntityBazaarInfoCard.tsx

@@ -15,7 +15,7 @@
  */
 
 import React, { useState, useEffect } from 'react';
-import { useAsyncFn } from 'react-use';
+import useAsyncFn from 'react-use/lib/useAsyncFn';
 import { useApi } from '@backstage/core-plugin-api';
 import { stringifyEntityRef } from '@backstage/catalog-model';
 import { useEntity } from '@backstage/plugin-catalog-react';

plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx

@@ -30,7 +30,7 @@ import { useApi, identityApiRef } from '@backstage/core-plugin-api';
 import { BazaarProject, Member } from '../../types';
 import { bazaarApiRef } from '../../api';
 import { Alert } from '@material-ui/lab';
-import { useAsyncFn } from 'react-use';
+import useAsyncFn from 'react-use/lib/useAsyncFn';
 import ExitToAppIcon from '@material-ui/icons/ExitToApp';
 import { parseEntityRef } from '@backstage/catalog-model';
 import { ConfirmationDialog } from '../ConfirmationDialog';

plugins/bazaar/src/components/HomePageBazaarInfoCard/HomePageBazaarInfoCard.tsx

@@ -43,7 +43,7 @@ import {
 import { Member, BazaarProject } from '../../types';
 import { bazaarApiRef } from '../../api';
 import { Alert } from '@material-ui/lab';
-import { useAsyncFn } from 'react-use';
+import useAsyncFn from 'react-use/lib/useAsyncFn';
 import {
   catalogApiRef,
   catalogRouteRef,

plugins/bazaar/src/components/SortView/SortView.tsx

@@ -19,7 +19,7 @@ import { Content, SupportButton } from '@backstage/core-components';
 import { AddProjectDialog } from '../AddProjectDialog';
 import { ProjectPreview } from '../ProjectPreview/ProjectPreview';
 import { Button, makeStyles } from '@material-ui/core';
-import { useAsyncFn } from 'react-use';
+import useAsyncFn from 'react-use/lib/useAsyncFn';
 import { Entity, stringifyEntityRef } from '@backstage/catalog-model';
 import { useApi } from '@backstage/core-plugin-api';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';