Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[react] Upgrade to React@15.5.3 #6543

Merged
merged 1 commit into from
Apr 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ node_modules
/packages/**/lib
/packages/material-ui-icons
/packages/material-ui-codemod/modules/v0.15.0
/src/svg-icons
/test/coverage
/test/regressions/site/build
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ module.exports = {
ignoreUrls: true,
}], // airbnb is allowing some edge cases
'no-console': 'error', // airbnb is using warn
'no-alert': 'error', // airbnb is using warn
'no-param-reassign': 'off', // Not our taste?
'no-prototype-builtins': 'off', // airbnb use error
'no-use-before-define': ['error', { 'functions': false }], // airbnb have functions: true, annoying
Expand Down
15 changes: 8 additions & 7 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,32 @@
"clean": "rimraf build"
},
"devDependencies": {
"babel-cli": "^6.24.0",
"babel-cli": "^6.24.1",
"babel-loader": "^6.4.1",
"babel-preset-es2015": "^6.24.0",
"babel-preset-react": "^6.23.0",
"babel-preset-stage-1": "^6.22.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-1": "^6.24.1",
"cross-env": "^4.0.0",
"css-loader": "^0.28.0",
"file-loader": "^0.11.1",
"img-loader": "^2.0.0",
"object-assign": "^4.1.1",
"raw-loader": "^0.5.1",
"react-hot-loader": "3.0.0-beta.6",
"redbox-react": "^1.3.4",
"redbox-react": "^1.3.5",
"rimraf": "^2.6.1",
"style-loader": "^0.16.1",
"webpack": "^2.3.2",
"webpack": "^2.3.3",
"webpack-dev-server": "^2.4.2"
},
"dependencies": {
"babel-runtime": "^6.23.0",
"marked": "^0.3.6",
"prismjs": "^1.6.0",
"react-redux": "^5.0.3",
"react-router": "^3.0.2",
"react-router-scroll": "^0.4.1",
"react-swipeable-views": "^0.10.7",
"react-swipeable-views": "^0.12.0",
"redux": "^3.5.2"
}
}
3 changes: 2 additions & 1 deletion docs/src/components/ApiMenu.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow weak

import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import ApiMenuComponents from 'docs/src/components/ApiMenuComponents';
import { demoComponentsTree } from 'docs/src/components/files';

Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/ApiMenuComponents.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow weak

import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Link } from 'react-router';
import IconButton from 'material-ui/IconButton';
import { Menu, MenuItem } from 'material-ui/Menu';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/App.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow weak

import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import MuiThemeProvider, { MUI_SHEET_ORDER } from 'material-ui/styles/MuiThemeProvider';
import createPalette from 'material-ui/styles/palette';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/AppContent.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow weak

import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { createStyleSheet } from 'jss-theme-reactor';
import customPropTypes from 'material-ui/utils/customPropTypes';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/AppDrawer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow weak

import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Link } from 'react-router';
import { createStyleSheet } from 'jss-theme-reactor';
import shallowEqual from 'recompose/shallowEqual';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/AppDrawerNavItem.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow weak

import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Link } from 'react-router';
import classNames from 'classnames';
import { createStyleSheet } from 'jss-theme-reactor';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/AppFrame.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow weak

import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import compose from 'recompose/compose';
import { createStyleSheet } from 'jss-theme-reactor';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/Demo.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow weak

import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { createStyleSheet } from 'jss-theme-reactor';
import shallowEqual from 'recompose/shallowEqual';
import customPropTypes from 'material-ui/utils/customPropTypes';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/DemoButton.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow weak

import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import { Link } from 'react-router';
import IconButton from 'material-ui/IconButton';
import PlayCircleOutlineIcon from 'material-ui-icons/PlayCircleOutline';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/MarkdownDocs.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow weak

import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import { createStyleSheet } from 'jss-theme-reactor';
import customPropTypes from 'material-ui/utils/customPropTypes';
import Button from 'material-ui/Button';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/MarkdownElement.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow weak

import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { createStyleSheet } from 'jss-theme-reactor';
import marked from 'marked';
Expand Down
4 changes: 2 additions & 2 deletions docs/src/pages/component-demos/chips/Chips.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ const styleSheet = createStyleSheet('Chips', (theme) => ({
}));

function handleRequestDelete() {
alert('You clicked the delete icon.'); // eslint-ignore-line no-alert
alert('You clicked the delete icon.'); // eslint-disable-line no-alert
}

function handleClick() {
alert('You clicked the Chip.'); // eslint-ignore-line no-alert
alert('You clicked the Chip.'); // eslint-disable-line no-alert
}

export default function Chips(props, context) {
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/component-demos/chips/ChipsArray.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default class ChipsArray extends Component {

handleRequestDelete = (key) => {
if (key === 3) {
alert('Why would you want to delete React?! :)'); // eslint-ignore-line no-alert
alert('Why would you want to delete React?! :)'); // eslint-disable-line no-alert
return;
}

Expand Down
3 changes: 2 additions & 1 deletion docs/src/pages/component-demos/dialogs/ConfirmationDialog.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// @flow weak
/* eslint-disable react/no-multi-comp */

import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { createStyleSheet } from 'jss-theme-reactor';
import customPropTypes from 'material-ui/utils/customPropTypes';
import Button from 'material-ui/Button';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/pages/component-demos/tables/EnhancedTable.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// @flow weak
/* eslint-disable react/no-multi-comp */

import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { createStyleSheet } from 'jss-theme-reactor';
import keycode from 'keycode';
import customPropTypes from 'material-ui/utils/customPropTypes';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/pages/component-demos/tabs/BasicTabs.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// @flow weak
/* eslint-disable react/no-multi-comp */

import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { createStyleSheet } from 'jss-theme-reactor';
import customPropTypes from 'material-ui/utils/customPropTypes';
import Paper from 'material-ui/Paper';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/pages/component-demos/tabs/FullWidthTabs.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// @flow weak
/* eslint-disable react/no-multi-comp */

import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { createStyleSheet } from 'jss-theme-reactor';
import SwipeableViews from 'react-swipeable-views';
import customPropTypes from 'material-ui/utils/customPropTypes';
Expand Down
2 changes: 1 addition & 1 deletion docs/webpack.dll.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const packageJson = require('./package.json');
const packageJsonSrc = require('../package.json');

const excludedDeps = [
'lodash', 'recompose', 'object-assign', 'material-ui-icons',
'lodash', 'recompose', 'object-assign', 'material-ui-icons', 'babel-runtime',
];

const deps = [
Expand Down
2 changes: 1 addition & 1 deletion docs/webpack.dll.prod.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const packageJson = require('./package.json');
const packageJsonSrc = require('../package.json');

const excludedDeps = [
'lodash', 'recompose', 'object-assign', 'material-ui-icons',
'lodash', 'recompose', 'object-assign', 'material-ui-icons', 'babel-runtime',
];

const deps = []
Expand Down
Loading