Skip to content

Commit

Permalink
feat: SB-818 Export all providers from one index file
Browse files Browse the repository at this point in the history
  • Loading branch information
voytek98 committed Feb 22, 2023
1 parent f6475f4 commit f1257bb
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 24 deletions.
4 changes: 2 additions & 2 deletions packages/webapp/.storybook/decorators.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { useEffect } from 'react';
import { IntlProvider } from 'react-intl';

import { ResponsiveThemeProvider } from '../src/app/providers/responsiveThemeProvider';
import { GlobalStyle } from '../src/theme/global';
import { DEFAULT_LOCALE, translationMessages } from '../src/app/config/i18n';
import { ResponsiveThemeProvider } from '../src/app/providers';
import { GlobalStyle } from '../src/theme/global';
import { initializeFontFace } from '../src/theme/initializeFontFace';

export { default as withRouter } from 'storybook-react-router';
Expand Down
4 changes: 2 additions & 2 deletions packages/webapp/src/app/__tests__/app.component.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { FC } from 'react';
import { screen } from '@testing-library/react';
import { FC } from 'react';
import { Route, Routes } from 'react-router-dom';

import { ValidRoutesProviders } from '../providers/validRoutesProvider';
import { render } from '../../tests/utils/rendering';
import { RoutesConfig } from '../config/routes';
import { ValidRoutesProviders } from '../providers';

describe('App: Component', () => {
const Component: FC = () => (
Expand Down
15 changes: 8 additions & 7 deletions packages/webapp/src/app/app.component.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { FormattedMessage, IntlProvider } from 'react-intl';
import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
import { PasswordReset } from '../routes/auth/passwordReset';

import { Role } from '../modules/auth/auth.types';
import { H1 } from '../theme/typography';
import { AuthRoute } from '../shared/components/routes/authRoute';
import { AnonymousRoute } from '../shared/components/routes/anonymousRoute';
import { PasswordReset } from '../routes/auth/passwordReset';
import { ActiveSubscriptionContext } from '../routes/finances/activeSubscriptionContext/activeSubscriptionContext.component';
import { LANG_PREFIX, RoutesConfig } from './config/routes';
import { DEFAULT_LOCALE, translationMessages } from './config/i18n';
import { AnonymousRoute } from '../shared/components/routes/anonymousRoute';
import { AuthRoute } from '../shared/components/routes/authRoute';
import { H1 } from '../theme/typography';
import {
CancelSubscription,
ConfirmEmail,
Expand All @@ -29,7 +28,9 @@ import {
TermsAndConditions,
TransactionHistory,
} from './asyncComponents';
import { ValidRoutesProviders } from './providers/validRoutesProvider';
import { DEFAULT_LOCALE, translationMessages } from './config/i18n';
import { LANG_PREFIX, RoutesConfig } from './config/routes';
import { ValidRoutesProviders } from './providers';

export const App = () => {
const { pathname, search } = useLocation();
Expand Down
6 changes: 1 addition & 5 deletions packages/webapp/src/app/initApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ import { createRoot } from 'react-dom/client';
import { HelmetProvider } from 'react-helmet-async';
import 'regenerator-runtime/runtime';

import { ApolloProvider } from './providers/apollo';
import { CommonQuery } from './providers/commonQuery';
import { ReduxProvider } from './providers/redux';
import { RouterProvider } from './providers/router';
import { SentryProvider } from './providers/sentry';
import { ApolloProvider, CommonQuery, ReduxProvider, RouterProvider, SentryProvider } from './providers';
import { setUnsupportedClasses } from './unsupported/support';
import { UnsupportedBrowserDetection } from './unsupported/unsupportedBrowserDetection';

Expand Down
7 changes: 7 additions & 0 deletions packages/webapp/src/app/providers/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export { ApolloProvider } from './apollo';
export { RouterProvider } from './router';
export { ReduxProvider } from './redux';
export { SentryProvider } from './sentry';
export { CommonQuery } from './commonQuery';
export { ValidRoutesProviders } from './validRoutesProvider';
export { ResponsiveThemeProvider } from './responsiveThemeProvider';
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { Outlet } from 'react-router-dom';
import { useSelector } from 'react-redux';
import { FormattedMessage, IntlProvider } from 'react-intl';
import { Helmet } from 'react-helmet-async';
import { FormattedMessage, IntlProvider } from 'react-intl';
import { useSelector } from 'react-redux';
import { Outlet } from 'react-router-dom';

import { ResponsiveThemeProvider } from '../';
import { localesSelectors } from '../../../modules/locales';
import { translationMessages } from '../../config/i18n';
import { GlobalStyle } from '../../../theme/global';
import { ResponsiveThemeProvider } from '../responsiveThemeProvider';
import { Layout } from '../../../shared/components/layout';
import { GlobalStyle } from '../../../theme/global';
import { translationMessages } from '../../config/i18n';
import { useLanguageFromParams } from './useLanguageFromParams';

export const ValidRoutesProviders = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { renderHook } from '@testing-library/react-hooks';
import { BreakpointQuery, useMediaQuery } from '../useMediaQuery.hook';

import { ResponsiveThemeProvider } from '../../../../app/providers';
import { Breakpoint, getActiveBreakpoint } from '../../../../theme/media';
import { ResponsiveThemeProvider } from '../../../../app/providers/responsiveThemeProvider';
import { BreakpointQuery, useMediaQuery } from '../useMediaQuery.hook';

jest.mock('../../../../theme/media', () => ({
...jest.requireActual<NodeModule>('../../../../theme/media'),
Expand Down

0 comments on commit f1257bb

Please sign in to comment.