Skip to content

Commit 1e21aa8

Browse files
[core] Upgrade react and marked
1 parent 64b4dac commit 1e21aa8

File tree

123 files changed

+550
-522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+550
-522
lines changed

.size-limit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports = [
2727
name: 'The size of all the modules of material-ui.',
2828
webpack: true,
2929
path: 'packages/material-ui/build/index.js',
30-
limit: '94.5 KB',
30+
limit: '94.6 KB',
3131
},
3232
{
3333
name: 'The main bundle of the docs',

docs/src/modules/components/withRoot.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ function findActivePage(currentPages, router) {
260260

261261
function withRoot(Component) {
262262
class WithRoot extends React.Component {
263-
constructor(props, context) {
264-
super(props, context);
263+
constructor(props) {
264+
super(props);
265265

266266
this.redux = initRedux(this.props.reduxServerState || {});
267267
}

docs/src/modules/utils/generateMarkdown.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ function generateProps(reactAPI) {
185185
return textProps;
186186
}
187187

188-
let defaultValue = '';
188+
let defaultValue = '\u00a0';
189189

190190
if (prop.defaultValue) {
191191
defaultValue = `<span class="prop-default">${escapeCell(

docs/src/pages/demos/dialogs/ConfirmationDialog.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ const options = [
3333
];
3434

3535
class ConfirmationDialog extends React.Component {
36-
constructor(props, context) {
37-
super(props, context);
36+
constructor(props) {
37+
super(props);
3838

3939
this.state.value = this.props.value;
4040
}

docs/src/pages/demos/tables/CustomPaginationActionsTable.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ const styles = theme => ({
113113
});
114114

115115
class CustomPaginationActionsTable extends React.Component {
116-
constructor(props, context) {
117-
super(props, context);
116+
constructor(props) {
117+
super(props);
118118

119119
this.state = {
120120
data: [

docs/src/pages/demos/tables/EnhancedTable.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ const styles = theme => ({
176176
});
177177

178178
class EnhancedTable extends React.Component {
179-
constructor(props, context) {
180-
super(props, context);
179+
constructor(props) {
180+
super(props);
181181

182182
this.state = {
183183
order: 'asc',

examples/gatsby/src/withRoot.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import getPageContext from './getPageContext';
66

77
function withRoot(Component) {
88
class WithRoot extends React.Component {
9-
constructor(props, context) {
10-
super(props, context);
9+
constructor(props) {
10+
super(props);
1111

1212
this.pageContext = this.props.pageContext || getPageContext();
1313
}

examples/nextjs/src/withRoot.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import getPageContext from './getPageContext';
66

77
function withRoot(Component) {
88
class WithRoot extends React.Component {
9-
constructor(props, context) {
10-
super(props, context);
9+
constructor(props) {
10+
super(props);
1111

1212
this.pageContext = this.props.pageContext || getPageContext();
1313
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@
126126
"postcss": "^6.0.16",
127127
"prettier": "^1.8.2",
128128
"raw-loader": "^0.5.1",
129-
"react": "16.3.0",
129+
"react": "16.4.0",
130130
"react-autosuggest": "^9.3.2",
131131
"react-docgen": "^3.0.0-beta10",
132-
"react-dom": "16.3.0",
132+
"react-dom": "16.4.0",
133133
"react-inspector": "^2.2.2",
134134
"react-number-format": "^3.0.2",
135135
"react-redux": "^5.0.6",

packages/material-ui-docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"react-dom": "^16.3.0"
3737
},
3838
"dependencies": {
39-
"marked": "^0.3.12",
39+
"marked": "^0.4.0",
4040
"nprogress": "^0.2.0",
4141
"prismjs": "^1.8.4"
4242
},

0 commit comments

Comments
 (0)