Merge remote-tracking branch 'origin/master' into reconfigure

# Conflicts:
#	packages/app/package.json

plugins/bazaar/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @backstage/plugin-bazaar
 
+## 0.1.22
+
+### Patch Changes
+
+- 4e9a90e307: Updated dependency `luxon` to `^3.0.0`.
+- 77abf50acf: Fixed api warnings
+- Updated dependencies
+  - @backstage/core-components@0.10.0
+  - @backstage/catalog-model@1.1.0
+  - @backstage/plugin-catalog@1.4.0
+  - @backstage/cli@0.18.0
+  - @backstage/core-plugin-api@1.0.4
+  - @backstage/catalog-client@1.0.4
+  - @backstage/plugin-catalog-react@1.1.2
+
 ## 0.1.22-next.3
 
 ### Patch Changes

plugins/bazaar/api-report.md

@@ -8,13 +8,9 @@
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 
-// Warning: (ae-missing-release-tag) "BazaarPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const BazaarPage: () => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "bazaarPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const bazaarPlugin: BackstagePlugin<
   {
@@ -24,13 +20,9 @@ export const bazaarPlugin: BackstagePlugin<
   {}
 >;
 
-// Warning: (ae-missing-release-tag) "EntityBazaarInfoCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const EntityBazaarInfoCard: () => JSX.Element | null;
 
-// Warning: (ae-missing-release-tag) "SortView" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const SortView: () => JSX.Element;
 

plugins/bazaar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bazaar",
-  "version": "0.1.22-next.3",
+  "version": "0.1.22",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -24,13 +24,13 @@
     "clean": "backstage-cli package clean"
   },
   "dependencies": {
-    "@backstage/catalog-client": "^1.0.4-next.2",
-    "@backstage/catalog-model": "^1.1.0-next.3",
-    "@backstage/cli": "^0.18.0-next.3",
-    "@backstage/core-components": "^0.10.0-next.3",
-    "@backstage/core-plugin-api": "^1.0.4-next.0",
-    "@backstage/plugin-catalog": "^1.4.0-next.3",
-    "@backstage/plugin-catalog-react": "^1.1.2-next.3",
+    "@backstage/catalog-client": "^1.0.4",
+    "@backstage/catalog-model": "^1.1.0",
+    "@backstage/cli": "^0.18.0",
+    "@backstage/core-components": "^0.10.0",
+    "@backstage/core-plugin-api": "^1.0.4",
+    "@backstage/plugin-catalog": "^1.4.0",
+    "@backstage/plugin-catalog-react": "^1.1.2",
     "@date-io/luxon": "1.x",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -47,8 +47,8 @@
     "react": "^16.13.1 || ^17.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.18.0-next.3",
-    "@backstage/dev-utils": "^1.0.4-next.3",
+    "@backstage/cli": "^0.18.0",
+    "@backstage/dev-utils": "^1.0.4",
     "@testing-library/jest-dom": "^5.10.1",
     "cross-fetch": "^3.1.5"
   },

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

@@ -24,6 +24,7 @@ import { EntityBazaarInfoContent } from '../EntityBazaarInfoContent';
 import { Card } from '@material-ui/core';
 import { parseBazaarResponse } from '../../util/parseMethods';
 
+/** @public */
 export const EntityBazaarInfoCard = () => {
   const { entity } = useEntity();
   const bazaarApi = useApi(bazaarApiRef);

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

@@ -66,6 +66,7 @@ const getUnlinkedCatalogEntities = (
   });
 };
 
+/** @public */
 export const SortView = () => {
   const bazaarApi = useApi(bazaarApiRef);
   const catalogApi = useApi(catalogApiRef);

plugins/bazaar/src/plugin.ts

@@ -25,6 +25,7 @@ import {
 } from '@backstage/core-plugin-api';
 import { bazaarApiRef, BazaarClient } from './api';
 
+/** @public */
 export const bazaarPlugin = createPlugin({
   id: 'bazaar',
   routes: {
@@ -44,6 +45,7 @@ export const bazaarPlugin = createPlugin({
   ],
 });
 
+/** @public */
 export const BazaarPage = bazaarPlugin.provide(
   createRoutableExtension({
     name: 'BazaarPage',