Merge pull request #835 from CruGlobal/next-import-order

[no-Jira] Move NextJS subimports to the top

.eslintrc.js

@@ -32,7 +32,7 @@ module.exports = {
         'newlines-between': 'never',
         pathGroups: [
           {
-            pattern: '{next,react}',
+            pattern: '{next,next/**,react}',
             group: 'external',
             position: 'before',
           },

__tests__/util/TestRouter.tsx

@@ -1,6 +1,6 @@
-import React, { ReactElement, ReactNode } from 'react';
 import { RouterContext } from 'next/dist/shared/lib/router-context';
-import Router, { Router as IRouter, NextRouter } from 'next/router'; // eslint-disable-line import/no-named-as-default
+import Router, { Router as IRouter, NextRouter } from 'next/router';
+import React, { ReactElement, ReactNode } from 'react';
 
 interface Props {
   children: ReactNode;

pages/404.page.tsx

@@ -1,8 +1,8 @@
+import Head from 'next/head';
 import React, { ReactElement } from 'react';
 import DisabledByDefaultOutlinedIcon from '@mui/icons-material/DisabledByDefaultOutlined';
 import { Box, Button, Typography } from '@mui/material';
 import { styled } from '@mui/material/styles';
-import Head from 'next/head';
 import { useTranslation } from 'react-i18next';
 import useGetAppSettings from '../src/hooks/useGetAppSettings';
 

pages/500.page.tsx

@@ -1,8 +1,8 @@
+import Head from 'next/head';
 import React, { ReactElement } from 'react';
 import DisabledByDefaultOutlinedIcon from '@mui/icons-material/DisabledByDefaultOutlined';
 import { Box, Button, Typography } from '@mui/material';
 import { styled } from '@mui/material/styles';
-import Head from 'next/head';
 import { useTranslation } from 'react-i18next';
 import useGetAppSettings from '../src/hooks/useGetAppSettings';
 

pages/_app.page.tsx

@@ -1,4 +1,6 @@
 import { NextPage } from 'next';
+import type { AppProps } from 'next/app';
+import Head from 'next/head';
 import React, { ReactElement } from 'react';
 import { ApolloProvider } from '@apollo/client';
 import { Box } from '@mui/material';
@@ -12,7 +14,6 @@ import { ErrorBoundary, Provider } from '@rollbar/react';
 import { AnimatePresence } from 'framer-motion';
 import { Session } from 'next-auth';
 import { SessionProvider } from 'next-auth/react';
-import Head from 'next/head';
 import { SnackbarProvider } from 'notistack';
 import { I18nextProvider, useTranslation } from 'react-i18next';
 import Rollbar from 'rollbar';
@@ -32,7 +33,6 @@ import client from '../src/lib/client';
 import i18n from '../src/lib/i18n';
 import theme from '../src/theme';
 import { AdapterLuxon } from './api/utils/AdapterLuxon';
-import type { AppProps } from 'next/app';
 import './helpscout.css';
 import './print.css';
 

pages/_document.page.tsx

@@ -1,5 +1,3 @@
-import React, { ReactElement } from 'react';
-import { ServerStyleSheets } from '@mui/styles';
 import { RenderPageResult } from 'next/dist/shared/lib/utils';
 import Document, {
   DocumentContext,
@@ -10,6 +8,8 @@ import Document, {
   NextScript,
 } from 'next/document';
 import Script from 'next/script';
+import React, { ReactElement } from 'react';
+import { ServerStyleSheets } from '@mui/styles';
 import theme from '../src/theme';
 
 class MyDocument extends Document {

pages/accountLists.page.tsx

@@ -1,7 +1,7 @@
 import { GetServerSideProps, GetServerSidePropsResult } from 'next';
+import Head from 'next/head';
 import React, { ReactElement } from 'react';
 import { getToken } from 'next-auth/jwt';
-import Head from 'next/head';
 import { useTranslation } from 'react-i18next';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import AccountLists from '../src/components/AccountLists';

pages/accountLists/[accountListId].page.tsx

@@ -1,7 +1,7 @@
 import { GetServerSideProps } from 'next';
+import Head from 'next/head';
 import React, { ReactElement, useEffect, useState } from 'react';
 import { getToken } from 'next-auth/jwt';
-import Head from 'next/head';
 import { renderDialog } from 'src/components/Layouts/Primary/TopBar/Items/AddMenu/AddMenu';
 import { suggestArticles } from 'src/lib/helpScout';
 import Dashboard from '../../src/components/Dashboard';

pages/accountLists/[accountListId]/coaching.page.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
 import Head from 'next/head';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { CoachingList } from 'src/components/Coaching/CoachingList';
 import Loading from 'src/components/Loading';

pages/accountLists/[accountListId]/coaching/[coachingId].page.tsx

@@ -1,6 +1,6 @@
-import React from 'react';
 import Head from 'next/head';
 import { useRouter } from 'next/router';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   AccountListTypeEnum,

pages/accountLists/[accountListId]/contacts/ContactsContext.tsx

@@ -1,3 +1,4 @@
+import { NextRouter, useRouter } from 'next/router';
 import React, {
   Dispatch,
   SetStateAction,
@@ -8,7 +9,6 @@ import React, {
   useState,
 } from 'react';
 import _, { debounce } from 'lodash';
-import { NextRouter, useRouter } from 'next/router';
 import { useGetIdsForMassSelectionQuery } from 'src/hooks/GetIdsForMassSelection.generated';
 import { useLocale } from 'src/hooks/useLocale';
 import { sanitizeFilters } from 'src/lib/sanitizeFilters';

pages/accountLists/[accountListId]/contacts/ContactsPage.tsx

@@ -1,6 +1,6 @@
+import { useRouter } from 'next/router';
 import React, { useEffect, useMemo, useState } from 'react';
 import _ from 'lodash';
-import { useRouter } from 'next/router';
 import { suggestArticles } from 'src/lib/helpScout';
 import { sanitizeFilters } from 'src/lib/sanitizeFilters';
 import { ContactFilterSetInput } from '../../../../graphql/types.generated';

pages/accountLists/[accountListId]/contacts/flows/setup.page.tsx

@@ -1,8 +1,8 @@
+import Head from 'next/head';
 import React, { useCallback, useEffect, useState } from 'react';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import _ from 'lodash';
-import Head from 'next/head';
 import { useSnackbar } from 'notistack';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';

pages/accountLists/[accountListId]/reports/coaching.page.tsx

@@ -1,5 +1,5 @@
-import React, { ReactElement, useEffect } from 'react';
 import Head from 'next/head';
+import React, { ReactElement, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   AccountListTypeEnum,

pages/accountLists/[accountListId]/reports/designationAccounts.page.tsx

@@ -1,7 +1,7 @@
+import Head from 'next/head';
 import React, { useEffect, useState } from 'react';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import Head from 'next/head';
 import { useTranslation } from 'react-i18next';
 import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';
 import Loading from 'src/components/Loading';

pages/accountLists/[accountListId]/reports/donations/[[...contactId]].page.tsx

@@ -1,8 +1,8 @@
+import Head from 'next/head';
+import { useRouter } from 'next/router';
 import React, { useEffect, useState } from 'react';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import Head from 'next/head';
-import { useRouter } from 'next/router';
 import { useTranslation } from 'react-i18next';
 import { ContactsRightPanel } from 'src/components/Contacts/ContactsRightPanel/ContactsRightPanel';
 import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';

pages/accountLists/[accountListId]/reports/expectedMonthlyTotal.page.tsx

@@ -1,7 +1,7 @@
+import Head from 'next/head';
 import React, { ReactElement, useEffect, useState } from 'react';
 import { Box } from '@mui/material';
 import { styled } from '@mui/material/styles';
-import Head from 'next/head';
 import { useTranslation } from 'react-i18next';
 import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';
 import Loading from 'src/components/Loading';

pages/accountLists/[accountListId]/reports/partnerCurrency/[[...contactId]].page.tsx

@@ -1,8 +1,8 @@
+import Head from 'next/head';
+import { useRouter } from 'next/router';
 import React, { useEffect, useState } from 'react';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import Head from 'next/head';
-import { useRouter } from 'next/router';
 import { useTranslation } from 'react-i18next';
 import { ContactsRightPanel } from 'src/components/Contacts/ContactsRightPanel/ContactsRightPanel';
 import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';

pages/accountLists/[accountListId]/reports/partnerGivingAnalysis/[[...contactId]].page.tsx

@@ -1,9 +1,9 @@
+import Head from 'next/head';
+import { useRouter } from 'next/router';
 import React, { useEffect, useMemo, useState } from 'react';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import { sortBy } from 'lodash';
-import Head from 'next/head';
-import { useRouter } from 'next/router';
 import { useTranslation } from 'react-i18next';
 import { ReportContactFilterSetInput } from 'pages/api/graphql-rest.page.generated';
 import { ContactsRightPanel } from 'src/components/Contacts/ContactsRightPanel/ContactsRightPanel';

pages/accountLists/[accountListId]/reports/responsibilityCenters.page.tsx

@@ -1,7 +1,7 @@
+import Head from 'next/head';
 import React, { useEffect, useState } from 'react';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import Head from 'next/head';
 import { useTranslation } from 'react-i18next';
 import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';
 import Loading from 'src/components/Loading';

pages/accountLists/[accountListId]/reports/salaryCurrency/[[...contactId]].page.tsx

@@ -1,8 +1,8 @@
+import Head from 'next/head';
+import { useRouter } from 'next/router';
 import React, { useEffect, useState } from 'react';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import Head from 'next/head';
-import { useRouter } from 'next/router';
 import { useTranslation } from 'react-i18next';
 import { ContactsRightPanel } from 'src/components/Contacts/ContactsRightPanel/ContactsRightPanel';
 import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';

pages/accountLists/[accountListId]/settings/integrations/index.page.tsx

@@ -1,7 +1,7 @@
 import { GetServerSideProps } from 'next';
+import { useRouter } from 'next/router';
 import React, { ReactElement, useEffect, useState } from 'react';
 import { getToken } from 'next-auth/jwt';
-import { useRouter } from 'next/router';
 import { useTranslation } from 'react-i18next';
 import { ChalklineAccordion } from 'src/components/Settings/integrations/Chalkline/ChalklineAccordion';
 import { GoogleAccordion } from 'src/components/Settings/integrations/Google/GoogleAccordion';

pages/accountLists/[accountListId]/settings/wrapper.tsx

@@ -1,7 +1,7 @@
+import Head from 'next/head';
 import React, { useState } from 'react';
 import { Box, Container } from '@mui/material';
 import { styled } from '@mui/material/styles';
-import Head from 'next/head';
 import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';
 import {
   HeaderTypeEnum,

pages/accountLists/[accountListId]/tasks/[[...contactId]].page.tsx

@@ -1,12 +1,12 @@
+import Head from 'next/head';
+import { useRouter } from 'next/router';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import AddIcon from '@mui/icons-material/Add';
 import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline';
 import { Box, Button, ButtonGroup, Hidden } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import debounce from 'lodash/debounce';
 import { DateTime } from 'luxon';
-import Head from 'next/head';
-import { useRouter } from 'next/router';
 import { useTranslation } from 'react-i18next';
 import { ContactsRightPanel } from 'src/components/Contacts/ContactsRightPanel/ContactsRightPanel';
 import { navBarHeight } from 'src/components/Layouts/Primary/Primary';

pages/accountLists/[accountListId]/tools.page.tsx

@@ -1,5 +1,5 @@
-import React, { ReactElement } from 'react';
 import Head from 'next/head';
+import React, { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 import ToolHome from 'src/components/Tool/Home/Home';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';

pages/accountLists/[accountListId]/tools/appeals.page.tsx

@@ -1,7 +1,7 @@
+import Head from 'next/head';
 import React from 'react';
 import { Box, Divider, Grid, Theme, Typography } from '@mui/material';
 import { motion } from 'framer-motion';
-import Head from 'next/head';
 import { useTranslation } from 'react-i18next';
 import { makeStyles } from 'tss-react/mui';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';

pages/accountLists/[accountListId]/tools/appeals/[appealId].page.tsx

@@ -1,6 +1,6 @@
+import Head from 'next/head';
 import React, { ReactElement, useState } from 'react';
 import { Box, Container, Theme } from '@mui/material';
-import Head from 'next/head';
 import { useTranslation } from 'react-i18next';
 import { makeStyles } from 'tss-react/mui';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';

pages/accountLists/[accountListId]/tools/fixCommitmentInfo.page.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
 import Head from 'next/head';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import Loading from '../../../../src/components/Loading';

pages/accountLists/[accountListId]/tools/fixEmailAddresses.page.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
 import Head from 'next/head';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import Loading from '../../../../src/components/Loading';

pages/accountLists/[accountListId]/tools/fixMailingAddresses.page.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
 import Head from 'next/head';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import Loading from '../../../../src/components/Loading';

pages/accountLists/[accountListId]/tools/fixPhoneNumbers.page.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
 import Head from 'next/head';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import Loading from '../../../../src/components/Loading';

pages/accountLists/[accountListId]/tools/fixSendNewsletter.page.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
 import Head from 'next/head';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import Loading from '../../../../src/components/Loading';

pages/accountLists/[accountListId]/tools/mergeContacts.page.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
 import Head from 'next/head';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import Loading from '../../../../src/components/Loading';

pages/accountLists/[accountListId]/tools/mergePeople.page.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
 import Head from 'next/head';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import Loading from '../../../../src/components/Loading';

pages/login.page.tsx

@@ -1,10 +1,10 @@
 import { GetServerSideProps } from 'next';
+import Head from 'next/head';
 import React, { ReactElement, useEffect } from 'react';
 import SubjectIcon from '@mui/icons-material/Subject';
 import { Button } from '@mui/material';
 import i18n from 'i18next';
 import { getSession, signIn } from 'next-auth/react';
-import Head from 'next/head';
 import BaseLayout from '../src/components/Layouts/Basic';
 import Loading from '../src/components/Loading';
 import Welcome from '../src/components/Welcome';

pages/logout.page.tsx

@@ -1,10 +1,10 @@
 import { GetServerSideProps } from 'next';
+import Head from 'next/head';
 import React, { ReactElement, useEffect } from 'react';
 import ExitToAppRoundedIcon from '@mui/icons-material/ExitToAppRounded';
 import { Box, Typography } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { signOut } from 'next-auth/react';
-import Head from 'next/head';
 import { useTranslation } from 'react-i18next';
 import { clearDataDogUser } from 'src/hooks/useDataDog';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';

src/components/AccountLists/AccountLists.tsx

@@ -1,3 +1,4 @@
+import Link from 'next/link';
 import React, { ReactElement } from 'react';
 import {
   Box,
@@ -9,7 +10,6 @@ import {
   Typography,
 } from '@mui/material';
 import { motion } from 'framer-motion';
-import Link from 'next/link';
 import { useTranslation } from 'react-i18next';
 import { makeStyles } from 'tss-react/mui';
 import { useLocale } from 'src/hooks/useLocale';

src/components/Contacts/ContactDetails/ContactDetailContext.tsx

@@ -1,5 +1,5 @@
-import React, { useState } from 'react';
 import { useRouter } from 'next/router';
+import React, { useState } from 'react';
 import { TabKey } from './ContactDetails';
 import { DonationTabKey } from './ContactDontationsTab/ContactDonationsTab';
 

src/components/Contacts/ContactFlow/ContactFlowSetup/Header/ContactFlowSetupHeader.tsx

@@ -1,10 +1,10 @@
+import NextLink from 'next/link';
 import React, { useState } from 'react';
 import Add from '@mui/icons-material/Add';
 import ChevronLeft from '@mui/icons-material/ChevronLeft';
 import LoadingButton from '@mui/lab/LoadingButton';
 import { Box, Button } from '@mui/material';
 import { styled } from '@mui/material/styles';
-import NextLink from 'next/link';
 import { useTranslation } from 'react-i18next';
 import { useAccountListId } from '../../../../../hooks/useAccountListId';
 

src/components/Contacts/ContactsContainer.tsx

@@ -1,8 +1,8 @@
+import Head from 'next/head';
 import React, { useContext } from 'react';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import _ from 'lodash';
-import Head from 'next/head';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { useTranslation } from 'react-i18next';