Merge remote-tracking branch 'upstream/master'

packages/cli/config/eslint.js

@@ -57,6 +57,19 @@ module.exports = {
       'warn',
       { vars: 'all', args: 'after-used', ignoreRestSiblings: true },
     ],
+
+    // Importing the entire MUI icons packages kills build performance as the list of icons is huge.
+    'no-restricted-imports': [
+      2,
+      {
+        paths: [
+          {
+            name: '@material-ui/icons',
+            message: "Please import '@material-ui/icons/<Icon>' instead.",
+          },
+        ],
+      },
+    ],
   },
   overrides: [
     {

packages/cli/templates/default-app/packages/app/src/App.tsx

@@ -1,6 +1,5 @@
-import { CssBaseline, makeStyles, ThemeProvider } from '@material-ui/core';
+import { makeStyles } from '@material-ui/core';
 import { createApp } from '@backstage/core';
-import { lightTheme } from '@backstage/theme';
 import React, { FC } from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import * as plugins from './plugins';
@@ -34,13 +33,9 @@ const App: FC<{}> = () => {
   useStyles();
   return (
     <AppProvider>
-      <ThemeProvider theme={lightTheme}>
-        <CssBaseline>
-          <Router>
-            <AppComponent />
-          </Router>
-        </CssBaseline>
-      </ThemeProvider>
+      <Router>
+        <AppComponent />
+      </Router>
     </AppProvider>
   );
 };