Skip to content

Commit

Permalink
[core] Update to the latest version of the main repo (mui#456)
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari authored and dtassone committed Nov 9, 2020
1 parent 2c055c8 commit afbbd0e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 19 deletions.
17 changes: 2 additions & 15 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
// const baseline = require('@material-ui/monorepo/.stylelintrc');

// module.exports = {
// ...baseline,
// }
const baseline = require('@material-ui/monorepo/.stylelintrc');

module.exports = {
processors: ['stylelint-processor-styled-components'],
extends: 'stylelint-config-standard',
rules: {
'value-no-vendor-prefix': true,
'property-no-vendor-prefix': true,
'no-empty-source': null,
'no-missing-end-of-source-newline': null,
'declaration-colon-newline-after': null,
'value-keyword-case': null,
},
...baseline,
};
1 change: 0 additions & 1 deletion packages/grid/data-grid/src/DataGrid.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable react/forbid-foreign-prop-types */
import * as React from 'react';
import PropTypes from 'prop-types';
// @ts-expect-error need to migrate helpers to TypeScript
Expand Down
2 changes: 2 additions & 0 deletions packages/grid/x-grid/src/XGrid.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ describe('<XGrid />', () => {
});

describe('keyboard', () => {
/* eslint-disable material-ui/disallow-active-element-as-key-event-target */
const KeyboardTest = () => {
const data = useData(100, 20);
const transformColSizes = (columns) => columns.map((column) => ({ ...column, width: 60 }));
Expand Down Expand Up @@ -153,6 +154,7 @@ describe('<XGrid />', () => {
await raf();
expect(getActiveCell()).to.equal('1-19');
});
/* eslint-enable material-ui/disallow-active-element-as-key-event-target */
});

it('should resize the width of the columns', async () => {
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2935,11 +2935,11 @@

"@material-ui/monorepo@https://github.com/mui-org/material-ui.git#master":
version "4.11.0"
resolved "https://github.com/mui-org/material-ui.git#4502b9bbe18e15c532940e3ef83b513721298b24"
resolved "https://github.com/mui-org/material-ui.git#85ea4e56f306b27325ae6e33d5bc35db8e6288e5"

"@material-ui/monorepo@https://github.com/mui-org/material-ui.git#next":
version "5.0.0-alpha.5"
resolved "https://github.com/mui-org/material-ui.git#f43417718baa7b25dd28ad32dc83f89bc19bef62"
version "5.0.0-alpha.13"
resolved "https://github.com/mui-org/material-ui.git#13f3e9d8db81b40e1b08f43e4d45e37f3926c37d"

"@material-ui/styles@^4.10.0":
version "4.10.0"
Expand Down

0 comments on commit afbbd0e

Please sign in to comment.