Internal cleanup of the exports structure in the search plugin

Signed-off-by: Fredrik Adelöw <freben@gmail.com>

.changeset/four-waves-tan.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search': patch
+---
+
+Internal cleanup of the exports structure

plugins/search/src/components/DefaultResultListItem/DefaultResultListItem.stories.tsx

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import React from 'react';
+import { Button } from '@backstage/core-components';
 import { Grid } from '@material-ui/core';
 import FindInPageIcon from '@material-ui/icons/FindInPage';
 import GroupIcon from '@material-ui/icons/Group';
-import { Button } from '@backstage/core-components';
-import { DefaultResultListItem } from '../index';
+import React from 'react';
 import { MemoryRouter } from 'react-router';
+import { DefaultResultListItem } from './DefaultResultListItem';
 
 export default {
   title: 'Plugins/Search/DefaultResultListItem',

plugins/search/src/components/LegacySearchPage/LegacySearchPage.tsx

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { Grid } from '@material-ui/core';
 import React, { useEffect, useState } from 'react';
 import { useDebounce } from 'react-use';

plugins/search/src/components/SearchBar/SearchBar.stories.tsx

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+import { Grid, makeStyles, Paper } from '@material-ui/core';
 import React from 'react';
-import { Paper, Grid, makeStyles } from '@material-ui/core';
-import { SearchBar, SearchContext } from '../index';
 import { MemoryRouter } from 'react-router';
+import { SearchContext } from '../SearchContext';
+import { SearchBar } from './SearchBar';
 
 export default {
   title: 'Plugins/Search/SearchBar',

plugins/search/src/components/SearchFilter/SearchFilter.stories.tsx

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-import React from 'react';
 import { Grid, Paper } from '@material-ui/core';
-import { SearchFilter, SearchContext } from '../index';
+import React from 'react';
 import { MemoryRouter } from 'react-router';
+import { SearchContext } from '../SearchContext';
+import { SearchFilter } from './SearchFilter';
 
 export default {
   title: 'Plugins/Search/SearchFilter',

plugins/search/src/components/SearchModal/SearchModal.stories.tsx

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-import React, { ComponentType } from 'react';
-import { Button } from '@material-ui/core';
 import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 import { wrapInTestApp } from '@backstage/test-utils';
-import { SearchModal } from '../index';
-import { useSearch, SearchContextProvider } from '../SearchContext';
+import { Button } from '@material-ui/core';
+import React, { ComponentType } from 'react';
 import { searchApiRef } from '../../apis';
 import { rootRouteRef } from '../../plugin';
+import { SearchContextProvider, useSearch } from '../SearchContext';
+import { SearchModal } from './SearchModal';
 
 const mockSearchApi = {
   query: () =>

plugins/search/src/components/SearchModal/SearchModal.test.tsx

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import React from 'react';
 import { screen } from '@testing-library/react';
 import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';

plugins/search/src/components/SearchModal/SearchModal.tsx

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import React from 'react';
 import {
   Dialog,

plugins/search/src/components/SearchPage/SearchPage.test.tsx

@@ -18,7 +18,7 @@ import { renderInTestApp } from '@backstage/test-utils';
 import React from 'react';
 import { useLocation, useOutlet } from 'react-router';
 import { useSearch } from '../SearchContext';
-import { SearchPage } from './';
+import { SearchPage } from './SearchPage';
 
 jest.mock('react-router', () => ({
   ...jest.requireActual('react-router'),

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

@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-import React from 'react';
-import { List, ListItem } from '@material-ui/core';
-import { SearchResult, SearchContext, DefaultResultListItem } from '../index';
-import { MemoryRouter } from 'react-router';
 import { Link } from '@backstage/core-components';
+import { List, ListItem } from '@material-ui/core';
+import React from 'react';
+import { MemoryRouter } from 'react-router';
+import { DefaultResultListItem } from '../DefaultResultListItem';
+import { SearchContext } from '../SearchContext';
+import { SearchResult } from './SearchResult';
 
 export default {
   title: 'Plugins/Search/SearchResult',

plugins/search/src/components/SearchType/SearchType.stories.tsx

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { useState } from 'react';
 
-import { SearchType } from '../index';
+import React, { useState } from 'react';
 import { SearchContext } from '../SearchContext';
+import { SearchType } from './SearchType';
 
 export default {
   title: 'Plugins/Search/SearchType',

plugins/search/src/components/index.tsx

@@ -1,29 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export * from './DefaultResultListItem';
-export * from './Filters';
-export * from './SearchBar';
-export * from './SearchContext';
-export * from './SearchFilter';
-export * from './SearchModal';
-export * from './SearchPage';
-export * from './SearchResult';
-export * from './SearchResultPager';
-export * from './SearchType';
-export * from './SidebarSearch';
-export * from './SidebarSearchModal';
-export * from './HomePageComponent';

plugins/search/src/index.ts

@@ -22,30 +22,26 @@
 
 export { searchApiRef } from './apis';
 export type { SearchApi } from './apis';
-export {
-  Filters,
-  FiltersButton,
-  SearchBar,
-  SearchBarBase,
-  SearchContextProvider,
-  SearchFilter,
-  SearchFilterNext,
-  SearchModal,
-  SearchPage as Router,
-  SearchResultPager,
-  SearchType,
-  SidebarSearch,
-  useSearch,
-} from './components';
+
+export { Filters, FiltersButton } from './components/Filters';
+export type { FiltersState } from './components/Filters';
+export type { HomePageSearchBarProps } from './components/HomePageComponent';
+export { SearchBar, SearchBarBase } from './components/SearchBar';
 export type {
-  SearchModalProps,
-  SidebarSearchModalProps,
-  HomePageSearchBarProps,
-  SidebarSearchProps,
-  FiltersState,
-  SearchBarProps,
   SearchBarBaseProps,
-} from './components';
+  SearchBarProps,
+} from './components/SearchBar';
+export { SearchContextProvider, useSearch } from './components/SearchContext';
+export { SearchFilter, SearchFilterNext } from './components/SearchFilter';
+export { SearchModal } from './components/SearchModal';
+export type { SearchModalProps } from './components/SearchModal';
+export { SearchPage as Router } from './components/SearchPage';
+export { SearchResultPager } from './components/SearchResultPager';
+export { SearchType } from './components/SearchType';
+export { SidebarSearch } from './components/SidebarSearch';
+export type { SidebarSearchProps } from './components/SidebarSearch';
+export type { SidebarSearchModalProps } from './components/SidebarSearchModal';
+
 export {
   DefaultResultListItem,
   HomePageSearchBar,