From 079f2c437f9f435a4ef141a23a593807e2e17e59 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 18 Oct 2020 18:54:21 +0000 Subject: [PATCH 1/2] 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](https://github.com/webpack-contrib/less-loader/compare/v7.0.1...v7.0.2) Signed-off-by: dependabot-preview[bot] --- packages/demo-app/package.json | 4 -- packages/demo-app/src/app/app.less | 88 ------------------------ packages/demo-app/src/app/app.tsx | 103 +++++++++++++++++++++++++++- packages/demo-app/webpack.common.js | 4 -- webpackBaseConfig.js | 4 -- yarn.lock | 95 ++----------------------- 6 files changed, 107 insertions(+), 191 deletions(-) delete mode 100644 packages/demo-app/src/app/app.less diff --git a/packages/demo-app/package.json b/packages/demo-app/package.json index a0c4c29791c72..51e7230984a18 100644 --- 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 deleted file mode 100644 index 2ced624ede24d..0000000000000 --- a/packages/demo-app/src/app/app.less +++ /dev/null @@ -1,88 +0,0 @@ -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; - //overflow: auto; -} -.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); -} diff --git a/packages/demo-app/src/app/app.tsx b/packages/demo-app/src/app/app.tsx index db6bac016c01a..8690fc65b8744 100644 --- 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 ( + Date: Mon, 19 Oct 2020 15:06:25 +0200 Subject: [PATCH 2/2] fix lint --- packages/demo-app/src/app/app.tsx | 156 +++++++++++++++--------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/packages/demo-app/src/app/app.tsx b/packages/demo-app/src/app/app.tsx index 8690fc65b8744..b0a5c4c1363b7 100644 --- a/packages/demo-app/src/app/app.tsx +++ b/packages/demo-app/src/app/app.tsx @@ -10,103 +10,103 @@ 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; -} + 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; -} + code { + font-family: 'source-code-pro', 'Menlo', 'Monaco', 'Consolas', 'Courier New', monospace; + } -#root { - min-width: 100%; - min-height: 100%; - display: flex; - position: absolute; -} + #root { + min-width: 100%; + min-height: 100%; + display: flex; + position: absolute; + } -.app { - display: flex; - flex-direction: column; - width: 100%; -} + .app { + display: flex; + flex-direction: column; + width: 100%; + } -.main-container { - position: relative; - flex-grow: 1; - box-sizing: border-box; -} + .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; -} + .fill-space, + .fill-abs, + .fill { + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + } -.flex-col { - display: flex; - flex-direction: column; -} + .flex-col { + display: flex; + flex-direction: column; + } -.flex-row { - display: flex; - flex-direction: row; -} + .flex-row { + display: flex; + flex-direction: row; + } -.grow { - flex-grow: 1; -} + .grow { + flex-grow: 1; + } -.center { - justify-content: center; -} + .center { + justify-content: center; + } -.action-bar { - display: flex; - justify-content: center; + .action-bar { + display: flex; + justify-content: center; - button { - margin-right: 20px; + button { + margin-right: 20px; + } } -} -.storybook-img { - width: 30px; -} -@media screen and (max-width: 768px) { - .big-device { - display: none !important; + .storybook-img { + width: 30px; } -} -.negative { - color: #d20704; -} + @media screen and (max-width: 768px) { + .big-device { + display: none !important; + } + } -.positive { - color: #008508; -} + .negative { + color: #d20704; + } -.info-icon { - color: #2196f3; - align-self: center; -} + .positive { + color: #008508; + } -.bad { - background: rgba(255,128,171,.4); -} + .info-icon { + color: #2196f3; + align-self: center; + } -.good { - background: rgba(185,246,202,.4); -} + .bad { + background: rgba(255, 128, 171, 0.4); + } + + .good { + background: rgba(185, 246, 202, 0.4); + } `; const StyledApp = styled.div`