Merge branch 'master' of https://github.com/spotify/backstage into lintMod

plugins/search/src/apis.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { CatalogApi } from '@backstage/plugin-catalog';
 import { Entity, ENTITY_DEFAULT_NAMESPACE } from '@backstage/catalog-model';
+import { CatalogApi } from '@backstage/plugin-catalog-react';
 
 export type Result = {
   name: string;

plugins/search/src/components/SearchResult/SearchResult.tsx

@@ -13,23 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { useState, useEffect } from 'react';
-import { useAsync } from 'react-use';
-
-import { makeStyles, Typography, Grid, Divider } from '@material-ui/core';
-import { Alert } from '@material-ui/lab';
 import {
-  Link,
   EmptyState,
+  Link,
   Progress,
   Table,
   TableColumn,
   useApi,
 } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog';
-
-import { FiltersButton, Filters, FiltersState } from '../Filters';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
+import { Divider, Grid, makeStyles, Typography } from '@material-ui/core';
+import { Alert } from '@material-ui/lab';
+import React, { useEffect, useState } from 'react';
+import { useAsync } from 'react-use';
 import SearchApi, { Result, SearchResults } from '../../apis';
+import { Filters, FiltersButton, FiltersState } from '../Filters';
 
 const useStyles = makeStyles(theme => ({
   searchQuery: {