Merge branch 'master' into scalable-sidebar-new-implementation

packages/theme/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @backstage/theme
 
+## 0.2.11
+
+### Patch Changes
+
+- 75bc878221: Internal refactor to avoid importing all of `@material-ui/core`.
+
 ## 0.2.10
 
 ### Patch Changes

packages/theme/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/theme",
   "description": "material-ui theme for use with Backstage.",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -31,7 +31,7 @@
     "@material-ui/core": "^4.12.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9"
+    "@backstage/cli": "^0.8.0"
   },
   "files": [
     "dist"

packages/theme/src/baseTheme.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { createTheme as createMuiTheme } from '@material-ui/core';
+import { createTheme as createMuiTheme } from '@material-ui/core/styles';
 import { darken, lighten } from '@material-ui/core/styles/colorManipulator';
 import { Overrides } from '@material-ui/core/styles/overrides';