From 093d2cf4ead4bb54ce3d36ba8867e1bf73b9a1a0 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Sun, 29 Sep 2019 13:03:09 +0200
Subject: [PATCH] re-export styles from core

---
 packages/material-ui-styles/src/index.d.ts |  1 -
 packages/material-ui-styles/src/index.js   |  1 -
 packages/material-ui/src/index.d.ts        | 14 +++++++-------
 packages/material-ui/src/index.js          |  6 ++++--
 packages/material-ui/src/styles/index.d.ts |  6 +++---
 packages/material-ui/src/styles/index.js   |  7 ++++++-
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/packages/material-ui-styles/src/index.d.ts b/packages/material-ui-styles/src/index.d.ts
index 259d1b14373677..aa7660bf1d0c07 100644
--- a/packages/material-ui-styles/src/index.d.ts
+++ b/packages/material-ui-styles/src/index.d.ts
@@ -7,7 +7,6 @@ export { default as mergeClasses } from './mergeClasses';
 export { default as ServerStyleSheets } from './ServerStyleSheets';
 export { default as styled } from './styled';
 export { default as StylesProvider } from './StylesProvider';
-export * from './StylesProvider';
 export { default as ThemeProvider } from './ThemeProvider';
 export { default as useTheme } from '@material-ui/styles/useTheme';
 export { default as withStyles, CSSProperties, StyleRules, WithStyles } from './withStyles';
diff --git a/packages/material-ui-styles/src/index.js b/packages/material-ui-styles/src/index.js
index e2ce9d8201a9bd..95f5db7e6239dd 100644
--- a/packages/material-ui-styles/src/index.js
+++ b/packages/material-ui-styles/src/index.js
@@ -33,7 +33,6 @@ export { default as mergeClasses } from './mergeClasses';
 export { default as ServerStyleSheets } from './ServerStyleSheets';
 export { default as styled } from './styled';
 export { default as StylesProvider } from './StylesProvider';
-export * from './StylesProvider';
 export { default as ThemeProvider } from './ThemeProvider';
 export { default as useTheme } from './useTheme';
 export { default as withStyles } from './withStyles';
diff --git a/packages/material-ui/src/index.d.ts b/packages/material-ui/src/index.d.ts
index 054f4fa5d278a7..21f7ced7d1d663 100644
--- a/packages/material-ui/src/index.d.ts
+++ b/packages/material-ui/src/index.d.ts
@@ -53,23 +53,23 @@ import * as colors from './colors';
 
 export { colors };
 export {
+  createGenerateClassName,
   createMuiTheme,
   createStyles,
+  jssPreset,
   makeStyles,
+  MuiThemeProvider,
+  responsiveFontSizes,
+  ServerStyleSheets,
+  styled,
   StyleRulesCallback,
+  StylesProvider,
   Theme,
   useTheme,
   withStyles,
   WithStyles,
   withTheme,
   WithTheme,
-  MuiThemeProvider,
-  responsiveFontSizes,
-  styled,
-  StylesProvider,
-  StylesContext,
-  StylesOptions,
-  StylesProviderProps,
 } from './styles';
 
 export { default as AppBar } from './AppBar';
diff --git a/packages/material-ui/src/index.js b/packages/material-ui/src/index.js
index e6dd3168d84fff..72e60af7ab30be 100644
--- a/packages/material-ui/src/index.js
+++ b/packages/material-ui/src/index.js
@@ -2,17 +2,19 @@ import * as colors from './colors';
 
 export { colors };
 export {
+  createGenerateClassName,
   createMuiTheme,
   createStyles,
+  jssPreset,
   makeStyles,
   MuiThemeProvider,
   responsiveFontSizes,
+  ServerStyleSheets,
   styled,
+  StylesProvider,
   useTheme,
   withStyles,
   withTheme,
-  StylesProvider,
-  StylesContext,
 } from './styles';
 
 export { default as AppBar } from './AppBar';
diff --git a/packages/material-ui/src/styles/index.d.ts b/packages/material-ui/src/styles/index.d.ts
index 752a80ebfbe364..fe17fcaf7c1da7 100644
--- a/packages/material-ui/src/styles/index.d.ts
+++ b/packages/material-ui/src/styles/index.d.ts
@@ -23,8 +23,8 @@ export {
 export { default as withTheme, WithTheme } from './withTheme';
 export { default as styled, ComponentCreator, StyledProps } from './styled';
 export {
+  createGenerateClassName,
+  jssPreset,
+  ServerStyleSheets,
   StylesProvider,
-  StylesContext,
-  StylesOptions,
-  StylesProviderProps,
 } from '@material-ui/styles';
diff --git a/packages/material-ui/src/styles/index.js b/packages/material-ui/src/styles/index.js
index e59f65de2d368a..4b68360afe3ad2 100644
--- a/packages/material-ui/src/styles/index.js
+++ b/packages/material-ui/src/styles/index.js
@@ -9,4 +9,9 @@ export * from './transitions';
 export { default as useTheme } from './useTheme';
 export { default as withStyles } from './withStyles';
 export { default as withTheme } from './withTheme';
-export { StylesProvider, StylesContext } from '@material-ui/styles';
+export {
+  createGenerateClassName,
+  jssPreset,
+  ServerStyleSheets,
+  StylesProvider,
+} from '@material-ui/styles';