Bump less-loader from 7.0.1 to 7.0.2

Bumps [less-loader](https://github.com/webpack-contrib/less-loader) from 7.0.1 to 7.0.2. - [Release notes](https://github.com/webpack-contrib/less-loader/releases) - [Changelog](https://github.com/webpack-contrib/less-loader/blob/master/CHANGELOG.md) - [Commits](webpack-contrib/less-loader@v7.0.1...v7.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
mui · Oct 18, 2020 · 650694e · 650694e
1 parent 49237cd
commit 650694e
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 104 deletions.
diff --git a/packages/demo-app/package.json b/packages/demo-app/package.json
@@ -26,13 +26,9 @@
     "@types/styled-components": "^5.0.1",
     "clean-webpack-plugin": "^3.0.0",
     "copy-webpack-plugin": "^6.0.3",
-    "css-loader": "^4.2.1",
     "html-webpack-plugin": "^4.5.0",
-    "less": "^3.10.3",
-    "less-loader": "^7.0.1",
     "node-fetch": "^2.6.0",
     "source-map-loader": "^1.0.2",
-    "style-loader": "^2.0.0",
     "ts-loader": "^8.0.2",
     "typescript": "^3.9.6",
     "webpack": "^4.41.5",

diff --git a/packages/demo-app/src/app/app.less b/packages/demo-app/src/app/app.less
diff --git a/packages/demo-app/src/app/app.tsx b/packages/demo-app/src/app/app.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { HashRouter, Route, Switch } from 'react-router-dom';
-import styled from 'styled-components';
+import styled, { createGlobalStyle } from 'styled-components';
 import './app.less';
 import { DemoAppBar } from './app-bar';
 import { AppDrawer } from './app-drawer';
@@ -9,6 +9,106 @@ import { ThemeProvider, useTheme } from './demos/theme';
 import { RealDataGridDemo } from './demos/grid/real-data-grid.demo';
 import { AppIntro } from './app-intro';
 
+const GlobalStyle = createGlobalStyle`
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+    sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+code {
+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+    monospace;
+}
+
+#root {
+  min-width: 100%;
+  min-height: 100%;
+  display: flex;
+  position: absolute;
+}
+
+.app {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
+
+.main-container {
+  position: relative;
+  flex-grow: 1;
+  box-sizing: border-box;
+}
+
+.fill-space, .fill-abs, .fill {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+}
+
+.flex-col {
+  display: flex;
+  flex-direction: column;
+}
+
+.flex-row {
+  display: flex;
+  flex-direction: row;
+}
+
+.grow {
+  flex-grow: 1;
+}
+
+.center {
+  justify-content: center;
+}
+
+.action-bar {
+  display: flex;
+  justify-content: center;
+
+  button {
+    margin-right: 20px;
+  }
+}
+.storybook-img {
+  width: 30px;
+}
+
+@media screen and (max-width: 768px) {
+  .big-device {
+    display: none !important;
+  }
+}
+
+.negative {
+  color: #d20704;
+}
+
+.positive {
+  color: #008508;
+}
+
+.info-icon {
+  color: #2196f3;
+  align-self: center;
+}
+
+.bad {
+  background: rgba(255,128,171,.4);
+}
+
+.good {
+  background: rgba(185,246,202,.4);
+}
+`;
+
 const StyledApp = styled.div`
   background: ${(p) => p.theme.colors.background};
 `;
@@ -23,6 +123,7 @@ export function App() {
   const { theme, themeId, toggleTheme, isDark } = useTheme();
   return (
     <ThemeProvider theme={theme}>
+      <GlobalStyle />
       <HashRouter>
         <StyledApp className="app">
           <DemoAppBar

diff --git a/packages/demo-app/webpack.common.js b/packages/demo-app/webpack.common.js
@@ -23,7 +23,7 @@ module.exports = {
       },
       {
         test: /\.less|\.css$/,
-        use: ['style-loader', 'css-loader', 'less-loader'],
+        use: ['css-loader', 'less-loader'],
       },
       {
         test: /\.(png|svg|jpg|jpeg|gif|ico)$/,

diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js
@@ -38,10 +38,6 @@ module.exports = {
         test: /\.md$/,
         loader: 'raw-loader',
       },
-      {
-        test: /\.css$/,
-        loader: 'style-loader!css-loader',
-      },
     ],
   },
 };
diff --git a/yarn.lock b/yarn.lock
@@ -14314,7 +14314,7 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-klona@^2.0.3:
+klona@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
   integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
@@ -14387,13 +14387,13 @@ lerna@^3.20.2:
     npmlog "^4.1.2"
 
 less-loader@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.0.1.tgz#115ef3b2817f6f9e14ade6de3509b878c1bc0c13"
-  integrity sha512-TO0+5HuDJhHArpOWnjzPMQ0xfdvyo0nxF75NNnSZ/n8b08aDuhk91/zV9sqYHzPfWvBh1PjpX/pTEEi2QnmaYA==
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.0.2.tgz#0d73a49ec32a9d3ff12614598e6e2b47fb2a35c4"
+  integrity sha512-7MKlgjnkCf63E3Lv6w2FvAEgLMx3d/tNBExITcanAq7ys5U8VPWT3F6xcRjYmdNfkoQ9udoVFb1r2azSiTnD6w==
   dependencies:
-    klona "^2.0.3"
+    klona "^2.0.4"
     loader-utils "^2.0.0"
-    schema-utils "^2.7.1"
+    schema-utils "^3.0.0"
 
 less@^3.10.3:
   version "3.11.3"