Remove all dot-folder imports everywhere

We aren't supposed to import from '.' or '../..' etc; point to the actual node being imported instead. I did allow e.g. '../../bigfolder' however. Going all the way to the individual file could be done too, but is a matter of taste perhaps.

Also ran Organize Imports on all the touched files :)

No changeset since there are no functional changes at all - only the imports changed

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
This commit is contained in:
Fredrik Adelöw
2021-03-10 13:40:16 +01:00
parent f3cf861f7d
commit 702b837b8b
59 changed files with 218 additions and 203 deletions
@@ -23,24 +23,22 @@ jest.mock('react-router-dom', () => {
};
});
import { ApiProvider, ApiRegistry } from '@backstage/core';
import { msw, wrapInTestApp } from '@backstage/test-utils';
import { fireEvent, render } from '@testing-library/react';
import { rest } from 'msw';
import { setupServer } from 'msw/node';
import React from 'react';
import { render, fireEvent } from '@testing-library/react';
import { ApiRegistry, ApiProvider } from '@backstage/core';
import { wrapInTestApp, msw } from '@backstage/test-utils';
import {
lighthouseApiRef,
LighthouseRestApi,
WebsiteListResponse,
} from '../../api';
import AuditList from '.';
import * as data from '../../__fixtures__/website-list-response.json';
import AuditList from './index';
const { useNavigate } = jest.requireMock('react-router-dom');
const websiteListResponse = data as WebsiteListResponse;
import { rest } from 'msw';
import { setupServer } from 'msw/node';
describe('AuditList', () => {
let apis: ApiRegistry;
@@ -13,29 +13,31 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React, { useState, useMemo, ReactNode } from 'react';
import { useLocalStorage, useAsync } from 'react-use';
import { useNavigate } from 'react-router-dom';
import { Grid, Button } from '@material-ui/core';
import Pagination from '@material-ui/lab/Pagination';
import {
InfoCard,
Header,
Page,
Content,
ContentHeader,
Header,
HeaderLabel,
InfoCard,
Page,
Progress,
useApi,
WarningPanel,
} from '@backstage/core';
import { Button, Grid } from '@material-ui/core';
import Pagination from '@material-ui/lab/Pagination';
import React, { ReactNode, useMemo, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { useAsync, useLocalStorage } from 'react-use';
import { lighthouseApiRef } from '../../api';
import { useQuery } from '../../utils';
import LighthouseSupportButton from '../SupportButton';
import LighthouseIntro, { LIGHTHOUSE_INTRO_LOCAL_STORAGE } from '../Intro';
import LighthouseSupportButton from '../SupportButton';
import AuditListTable from './AuditListTable';
// TODO(freben): move all of this out of index
export const LIMIT = 10;
const AuditList = () => {
@@ -13,11 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import { StatusPending, StatusError, StatusOK } from '@backstage/core';
import { StatusError, StatusOK, StatusPending } from '@backstage/core';
import React from 'react';
import { Audit } from '../../api';
// TODO(freben): move all of this out of index
const AuditStatusIcon = ({ audit }: { audit: Audit }) => {
if (audit.status === 'FAILED') return <StatusError />;
if (audit.status === 'COMPLETED') return <StatusOK />;
@@ -26,17 +26,16 @@ jest.mock('react-router-dom', () => {
};
});
import React from 'react';
import { ApiProvider, ApiRegistry } from '@backstage/core';
import { msw, wrapInTestApp } from '@backstage/test-utils';
import { render } from '@testing-library/react';
import { wrapInTestApp, msw } from '@backstage/test-utils';
import { ApiRegistry, ApiProvider } from '@backstage/core';
import AuditView from '.';
import { lighthouseApiRef, LighthouseRestApi, Audit, Website } from '../../api';
import { rest } from 'msw';
import { setupServer } from 'msw/node';
import React from 'react';
import { Audit, lighthouseApiRef, LighthouseRestApi, Website } from '../../api';
import { formatTime } from '../../utils';
import * as data from '../../__fixtures__/website-response.json';
import { setupServer } from 'msw/node';
import { rest } from 'msw';
import AuditView from './index';
const { useParams }: { useParams: jest.Mock } = jest.requireMock(
'react-router-dom',
@@ -13,40 +13,42 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React, { useState, useEffect, ReactNode } from 'react';
import {
Link,
useParams,
useNavigate,
generatePath,
resolvePath,
} from 'react-router-dom';
import { useAsync } from 'react-use';
Content,
ContentHeader,
Header,
HeaderLabel,
InfoCard,
Page,
Progress,
useApi,
} from '@backstage/core';
import {
makeStyles,
Button,
Grid,
List,
ListItem,
Button,
ListItemIcon,
ListItemText,
makeStyles,
} from '@material-ui/core';
import Alert from '@material-ui/lab/Alert';
import React, { ReactNode, useEffect, useState } from 'react';
import {
useApi,
InfoCard,
Header,
Page,
Content,
ContentHeader,
HeaderLabel,
Progress,
} from '@backstage/core';
import { lighthouseApiRef, Website, Audit } from '../../api';
generatePath,
Link,
resolvePath,
useNavigate,
useParams,
} from 'react-router-dom';
import { useAsync } from 'react-use';
import { Audit, lighthouseApiRef, Website } from '../../api';
import { formatTime } from '../../utils';
import AuditStatusIcon from '../AuditStatusIcon';
import LighthouseSupportButton from '../SupportButton';
import { formatTime } from '../../utils';
// TODO(freben): move all of this out of index
const useStyles = makeStyles({
contentGrid: {
@@ -13,4 +13,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
export { LastLighthouseAuditCard } from './LastLighthouseAuditCard';
@@ -23,22 +23,20 @@ jest.mock('react-router-dom', () => {
};
});
import React from 'react';
import { waitFor, render, fireEvent } from '@testing-library/react';
import {
ApiRegistry,
ApiProvider,
ApiRegistry,
ErrorApi,
errorApiRef,
} from '@backstage/core';
import { wrapInTestApp, msw } from '@backstage/test-utils';
import { lighthouseApiRef, LighthouseRestApi, Audit } from '../../api';
import CreateAudit from '.';
import * as data from '../../__fixtures__/create-audit-response.json';
import { setupServer } from 'msw/node';
import { msw, wrapInTestApp } from '@backstage/test-utils';
import { fireEvent, render, waitFor } from '@testing-library/react';
import { rest } from 'msw';
import { setupServer } from 'msw/node';
import React from 'react';
import { Audit, lighthouseApiRef, LighthouseRestApi } from '../../api';
import * as data from '../../__fixtures__/create-audit-response.json';
import CreateAudit from './index';
const { useNavigate }: { useNavigate: jest.Mock } = jest.requireMock(
'react-router-dom',
@@ -13,32 +13,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React, { useState, useCallback } from 'react';
import { useNavigate } from 'react-router-dom';
import {
Content,
ContentHeader,
errorApiRef,
Header,
HeaderLabel,
InfoCard,
Page,
useApi,
} from '@backstage/core';
import {
makeStyles,
Grid,
Button,
Grid,
List,
ListItem,
makeStyles,
MenuItem,
TextField,
} from '@material-ui/core';
import {
errorApiRef,
useApi,
InfoCard,
Header,
Page,
Content,
ContentHeader,
HeaderLabel,
} from '@backstage/core';
import React, { useCallback, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { lighthouseApiRef } from '../../api';
import { useQuery } from '../../utils';
import LighthouseSupportButton from '../SupportButton';
// TODO(freben): move all of this out of index
const useStyles = makeStyles(theme => ({
input: {
minWidth: 300,
@@ -16,11 +16,10 @@
/* eslint-disable jest/no-disabled-tests */
import React from 'react';
import { render, fireEvent } from '@testing-library/react';
import { wrapInTestApp } from '@backstage/test-utils';
import LighthouseIntro from '.';
import { fireEvent, render } from '@testing-library/react';
import React from 'react';
import LighthouseIntro from './index';
describe('LighthouseIntro', () => {
it('renders successfully', () => {
@@ -13,14 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { ContentHeader, InfoCard, MarkdownContent } from '@backstage/core';
import { Button, Grid, makeStyles, Tab, Tabs } from '@material-ui/core';
import CloseIcon from '@material-ui/icons/Close';
import React, { useState } from 'react';
import { useLocalStorage } from 'react-use';
import { ContentHeader, InfoCard, MarkdownContent } from '@backstage/core';
import { makeStyles, Button, Grid, Tabs, Tab } from '@material-ui/core';
import CloseIcon from '@material-ui/icons/Close';
import LighthouseSupportButton from '../SupportButton';
// TODO(freben): move all of this out of index
export const LIGHTHOUSE_INTRO_LOCAL_STORAGE =
'@backstage/lighthouse-plugin/intro-dismissed';