rework imports; disable babel.config.json for now

mimecuvalo · Mar 3, 2023 · 19a939e · 19a939e · vercel · Mar 3, 2023
1 parent fd976d2
commit 19a939e
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 21 deletions.
diff --git a/components/Editor.tsx b/components/Editor.tsx
@@ -1,6 +1,7 @@
-import { Alert, Skeleton, Snackbar, styled } from '@mui/material';
+import { Alert, Skeleton, Snackbar } from '@mui/material';
 import { ClipboardEvent, Suspense, lazy, useState } from 'react';
 
+import { styled } from '@mui/material/styles';
 import uploadFileToS3 from 'util/s3';
 
 const HelloWorldEditor = lazy(() => import('hello-world-editor'));

diff --git a/components/FeedWrapper.tsx b/components/FeedWrapper.tsx
@@ -1,4 +1,4 @@
-import { styled } from '@mui/material';
+import { styled } from '@mui/material/styles';
 
 const FeedWrapper = styled('div', { label: 'FeedWrapper' })`
   width: calc(33% - ${(props) => props.theme.spacing(2)});

diff --git a/components/Footer.tsx b/components/Footer.tsx
@@ -1,7 +1,7 @@
 import { Suspense, lazy, memo, useEffect, useState } from 'react';
 
 import Help from './Help';
-import { styled } from '@mui/material';
+import { styled } from '@mui/material/styles';
 
 const Debug = lazy(() => import('components/internal/Debug'));
 

diff --git a/components/Header.tsx b/components/Header.tsx
@@ -1,5 +1,5 @@
 import Login from './Login';
-import { styled } from '@mui/material';
+import { styled } from '@mui/material/styles';
 
 const StyledHeader = styled('header')`
   position: fixed;

diff --git a/components/Help.tsx b/components/Help.tsx
@@ -11,7 +11,7 @@ import {
 } from '@mui/material';
 import { F, defineMessages, useIntl } from 'i18n';
 import { MouseEvent, useEffect, useState } from 'react';
-import { styled, useTheme } from '@mui/material';
+import { styled, useTheme } from '@mui/material/styles';
 
 import { $Experiment } from 'app/experiments';
 import Cookies from 'js-cookie';

diff --git a/components/ItemWrapper.tsx b/components/ItemWrapper.tsx
@@ -1,5 +1,5 @@
 import { PropsWithChildren } from 'react';
-import { styled } from '@mui/material';
+import { styled } from '@mui/material/styles';
 
 const StyledItemWrapper = styled('div', { label: 'ItemWrapper' })`
   padding-bottom: 0;

diff --git a/components/content/ContentBase.tsx b/components/content/ContentBase.tsx
@@ -1,11 +1,12 @@
 import { Content, UserPublic } from 'data/graphql-generated';
-import { CssBaseline, GlobalStyles, ThemeProvider } from '@mui/material';
+import { CssBaseline, GlobalStyles } from '@mui/material';
 import { Grid, Typography, styled } from 'components';
 import { themeGlobalCss, themes } from 'styles/theme';
 
 import ContentHead from './ContentHead';
 import { PropsWithChildren } from 'react';
 import SiteMap from './SiteMap';
+import { ThemeProvider } from '@mui/material/styles';
 
 const Container = styled('div', { label: 'ContentBaseContainer' })`
   display: flex;

diff --git a/components/content/ContentHead.tsx b/components/content/ContentHead.tsx
@@ -3,7 +3,7 @@ import { buildUrl, contentUrl, profileUrl } from 'util/url-factory';
 
 import Head from 'next/head';
 import { themes } from 'styles/theme';
-import { useTheme } from '@mui/material';
+import { useTheme } from 'components';
 
 export default function ContentHead(props: {
   content?: Content;

diff --git a/components/content/Nav.tsx b/components/content/Nav.tsx
@@ -1,6 +1,6 @@
 import { Content, ContentMetaInfo } from 'data/graphql-generated';
 import { Link, styled } from 'components';
-import { Palette, PaletteColor, useTheme } from '@mui/material';
+import { Palette, PaletteColor, useTheme } from '@mui/material/styles';
 import { gql, useQuery } from '@apollo/client';
 
 import ContentLink from 'components/ContentLink';

diff --git a/components/content/SiteMap.tsx b/components/content/SiteMap.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Box, IconButton, Link, TextField, styled } from 'components';
+import { Avatar, Box, IconButton, Link, TextField, styled, useTheme } from 'components';
 import { Content, SiteMapAndUserQuery } from 'data/graphql-generated';
 import { F, defineMessages, useIntl } from 'i18n';
 import { FormEvent, ReactNode, useContext, useEffect, useState } from 'react';
@@ -15,7 +15,6 @@ import baseTheme from 'styles';
 import constants from 'util/constants';
 import { transientOptions } from 'util/css';
 import { useRouter } from 'next/router';
-import { useTheme } from '@mui/material';
 
 export const SITE_MAP_WIDTH = 175;
 

diff --git a/components/dashboard/DashboardEditor.tsx b/components/dashboard/DashboardEditor.tsx
@@ -9,15 +9,16 @@ import {
   Snackbar,
   Toolbar,
   styled,
+  useTheme,
 } from 'components';
 import { F, defineMessages, useIntl } from 'i18n';
-import { SelectChangeEvent, useTheme } from '@mui/material';
 import { gql, useMutation, useQuery } from '@apollo/client';
 import { useEffect, useState } from 'react';
 
 import { ArrowDropDown } from '@mui/icons-material';
 import Cookies from 'js-cookie';
 import Editor from 'components/Editor';
+import { SelectChangeEvent } from '@mui/material';
 import { SiteMapAndUserEditorQuery } from 'data/graphql-generated';
 import baseTheme from 'styles';
 import mime from 'mime/lite';

diff --git a/components/dashboard/actions/NewFeed.tsx b/components/dashboard/actions/NewFeed.tsx
@@ -1,4 +1,4 @@
-import { MenuItem, TextField } from 'components';
+import { MenuItem, TextField, useTheme } from 'components';
 import { defineMessages, useIntl } from 'i18n';
 import { gql, useMutation } from '@apollo/client';
 
@@ -8,7 +8,6 @@ import FollowingFeedCountsQuery from 'components/dashboard/FollowingFeedCountsQu
 import FollowingQuery from 'components/dashboard/FollowingQuery';
 import FollowingSpecialFeedCountsQuery from 'components/dashboard/FollowingSpecialFeedCountsQuery';
 import { UserRemotePublic } from 'data/graphql-generated';
-import { useTheme } from '@mui/material';
 
 const messages = defineMessages({
   error: { defaultMessage: 'Error subscribing to new feed.' },

diff --git a/components/index.tsx b/components/index.tsx
@@ -29,9 +29,10 @@ export {
   Toolbar,
   Tooltip,
   Typography,
-  styled,
 } from '@mui/material';
 
+export { useTheme, styled } from '@mui/material/styles';
+
 export { default as FeedWrapper } from './FeedWrapper';
 export { default as Footer } from './Footer';
 export { default as Header } from './Header';

diff --git a/babel.config.json → for-i18n-later-babel.config.json b/babel.config.json → for-i18n-later-babel.config.json
diff --git a/pages/[[...slug]].tsx b/pages/[[...slug]].tsx
@@ -1,5 +1,5 @@
 import { Comment, ContentAndUserQuery, Content as ContentType, Favorite, UserPublic } from 'data/graphql-generated';
-import { CssBaseline, GlobalStyles, ThemeProvider } from '@mui/material';
+import { CssBaseline, GlobalStyles } from '@mui/material';
 import { addApolloState, initializeApollo } from 'app/apollo';
 import { buildUrl, contentUrl } from 'util/url-factory';
 import { themeGlobalCss, themes } from 'styles/theme';
@@ -15,6 +15,7 @@ import Nav from 'components/content/Nav';
 import NotFound from 'pages/404';
 import Simple from 'components/content/templates/Simple';
 import SwipeListener from 'swipe-listener';
+import { ThemeProvider } from '@mui/material/styles';
 import { styled } from 'components';
 import { useQuery } from '@apollo/client';
 import { useRouter } from 'next/router';

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -17,7 +17,7 @@ import { CssBaseline } from '@mui/material';
 import ErrorBoundary from 'components/error/ErrorBoundary';
 import { F } from 'i18n';
 import Head from 'next/head';
-import { ThemeProvider } from '@mui/material';
+import { ThemeProvider } from '@mui/material/styles';
 import UserContext from 'app/UserContext';
 import { UserPrivate } from 'data/graphql-generated';
 import { UserProvider } from '@auth0/nextjs-auth0';

diff --git a/pages/dashboard.tsx b/pages/dashboard.tsx
@@ -1,5 +1,5 @@
 import { Close as CloseIcon, Menu as MenuIcon } from '@mui/icons-material';
-import { Grid, IconButton, styled } from 'components';
+import { Grid, IconButton, styled, useTheme } from 'components';
 import { defineMessages, useIntl } from 'i18n';
 import { useContext, useState } from 'react';
 
@@ -15,7 +15,6 @@ import { UserRemotePublic } from 'data/graphql-generated';
 import authServerSideProps from 'app/authServerSideProps';
 import baseTheme from 'styles';
 import { transientOptions } from 'util/css';
-import { useTheme } from '@mui/material';
 
 const NAV_WIDTH = '235px';
 const MOBILE_NAV_WIDTH = '45px';

diff --git a/styles/components.ts b/styles/components.ts
@@ -1,4 +1,4 @@
-import { SimplePaletteColorOptions, createTheme } from '@mui/material';
+import { SimplePaletteColorOptions, createTheme } from '@mui/material/styles';
 
 import palette from './palette';
 import typography from './typography';

diff --git a/styles/theme.ts b/styles/theme.ts
@@ -2,7 +2,7 @@ import { breakpoints, shape } from './constants';
 
 import components from './components';
 import createCache from '@emotion/cache';
-import { createTheme } from '@mui/material';
+import { createTheme } from '@mui/material/styles';
 import flowersComponents from './flowers/components';
 import flowersGlobalCss from './flowers/globals';
 import flowersPalette from './flowers/palette';