Merge pull request #3156 from benjiwheeler/eslint-upgrade-many

updated several eslint-related packages, fixed lint errors
This commit is contained in:
Benjamin Wheeler 2019-07-22 21:46:53 -04:00 committed by GitHub
commit 421bac2756
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 748 additions and 547 deletions

1257
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -58,7 +58,7 @@
"autoprefixer": "6.3.6",
"babel-cli": "6.26.0",
"babel-core": "6.23.1",
"babel-eslint": "8.0.2",
"babel-eslint": "10.0.2",
"babel-loader": "7.1.0",
"babel-plugin-transform-object-rest-spread": "6.26.0",
"babel-preset-es2015": "6.22.0",
@ -71,11 +71,11 @@
"copy-webpack-plugin": "0.2.0",
"create-react-class": "15.6.2",
"css-loader": "0.23.1",
"eslint": "4.7.1",
"eslint": "5.16.0",
"eslint-config-scratch": "5.0.0",
"eslint-plugin-cypress": "^2.0.1",
"eslint-plugin-json": "1.2.0",
"eslint-plugin-react": "7.4.0",
"eslint-plugin-json": "1.4.0",
"eslint-plugin-react": "7.14.2",
"exenv": "1.2.0",
"fastly": "1.2.1",
"file-loader": "4.0.0",

View file

@ -7,5 +7,10 @@ module.exports = {
globals: {
process: true
},
plugins: ['json']
plugins: ['json'],
settings: {
react: {
version: '16.2' // Prevent 16.3 lifecycle method errors
}
}
};

View file

@ -31,6 +31,7 @@ const InstallScratchLink = ({
'https://www.microsoft.com/store/productId/9N48XLLCZH0X' :
'https://itunes.apple.com/us/app/scratch-link/id1408863490'
}
rel="noopener noreferrer"
target="_blank"
>
<img

View file

@ -5,6 +5,7 @@ const ProjectCard = props => (
<a
className="project-card"
href={props.cardUrl}
rel="noopener noreferrer"
target="_blank"
>
<div className="project-card-image">

View file

@ -53,7 +53,12 @@ const Grid = props => (
Grid.propTypes = {
className: PropTypes.string,
itemType: PropTypes.string,
items: PropTypes.arrayOf(PropTypes.object)
items: PropTypes.arrayOf(PropTypes.object),
showAvatar: PropTypes.bool,
showFavorites: PropTypes.bool,
showLoves: PropTypes.bool,
showRemixes: PropTypes.bool,
showViews: PropTypes.bool
};
Grid.defaultProps = {

View file

@ -29,7 +29,7 @@ class Microworld extends React.Component {
};
}
markVideoOpen (key) {
/*
/*
When a video is clicked, mark it as an open video, so the video Modal will open.
Key is the number of the video, so distinguish between different videos on the page
*/
@ -88,7 +88,7 @@ class Microworld extends React.Component {
}
renderEditorWindow () {
const projectId = this.props.microworldData.microworld_project_id;
if (!projectId) {
return null;
}

View file

@ -56,6 +56,7 @@ const TTTModal = props => (
<div className="ttt-item">
<a
href={props.cardsUrl}
rel="noopener noreferrer"
target="_blank"
>
<FormattedMessage id="ideas.downloadPDF" />
@ -72,6 +73,7 @@ const TTTModal = props => (
<div className="ttt-item">
<a
href={props.guideUrl}
rel="noopener noreferrer"
target="_blank"
>
<FormattedMessage id="ideas.downloadPDF" />

View file

@ -51,7 +51,12 @@ const ThumbnailColumn = props => (
ThumbnailColumn.propTypes = {
className: PropTypes.string,
itemType: PropTypes.string,
items: PropTypes.arrayOf(PropTypes.object)
items: PropTypes.arrayOf(PropTypes.object),
showAvatar: PropTypes.bool,
showFavorites: PropTypes.bool,
showLoves: PropTypes.bool,
showRemixes: PropTypes.bool,
showViews: PropTypes.bool
};
ThumbnailColumn.defaultProps = {

View file

@ -158,6 +158,7 @@ class Ideas extends React.Component {
href={this.props.intl.formatMessage({
id: 'cards.scratch-cards-allLink'
})}
rel="noopener noreferrer"
target="_blank"
>
<Button className="ideas-button">