Merge pull request #371 from guardian/upgrade-eslint

Upgrade eslint
guardian · Oct 25, 2024 · cd33dba · cd33dba
2 parents adaf13f + f02b480
commit cd33dba
Show file tree

Hide file tree

Showing 47 changed files with 485 additions and 728 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -6,7 +6,7 @@
             "jsx": true
         }
     },
-    "parser": "babel-eslint",
+    "parser": "@babel/eslint-parser",
     "rules": {
         "semi": 2,
         "strict": 0

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1 @@
+c38afa310a6f479b2e1d54abbbb09fa7bbf0614f
diff --git a/package.json b/package.json
@@ -29,11 +29,12 @@
     "@babel/plugin-transform-object-assign": "^7.22.5",
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-react": "^7.22.15",
+    "@babel/eslint-parser": "7.25.9",
     "babel-jest": "^29.7.0",
     "babel-loader": "^9.1.3",
     "css-loader": "^6.8.1",
     "enzyme": "^3.10.0",
-    "eslint": "^4.18.2",
+    "eslint": "^8.57.0",
     "eslint-plugin-react": "^7.33.2",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
@@ -51,7 +52,6 @@
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@guardian/prosemirror-editor": "^0.2.0",
-    "babel-eslint": "^10.1.0",
     "copy-to-clipboard": "^3.0.5",
     "date-fns": "^1.28.0",
     "enzyme-adapter-react-16": "^1.15.7",

diff --git a/public/js/components/AppMessage/AppMessage.js b/public/js/components/AppMessage/AppMessage.js
@@ -5,7 +5,7 @@ export default class AppMessage extends React.Component {
 
   static propTypes = {
     error: PropTypes.string
-  }
+  };
 
   render() {
     return (

diff --git a/public/js/components/AtomCreate/AtomCreateExternalApp.js b/public/js/components/AtomCreate/AtomCreateExternalApp.js
@@ -7,7 +7,7 @@ class AtomCreateExternalApp extends React.Component {
 
   static propTypes = {
     atomType: AtomTypePropType
-  }
+  };
 
   render () {
     return (

diff --git a/public/js/components/AtomCreate/AtomCreateGenericInfo.js b/public/js/components/AtomCreate/AtomCreateGenericInfo.js
@@ -17,24 +17,24 @@ class AtomCreateGenericInfo extends React.Component {
     atomActions: PropTypes.shape({
       createAtom: PropTypes.func.isRequired
     }).isRequired
-  }
+  };
 
   state = {
     title: "",
     commissioningDesks: []
-  }
+  };
 
   updateTitle = (newTitle) => {
     this.setState({
       title: newTitle
     });
-  }
+  };
 
   updateTags = (tags) => {
     this.setState({
       commissioningDesks: tags
     });
-  }
+  };
 
   triggerAtomCreate = (e) => {
     e.preventDefault();
@@ -43,15 +43,15 @@ class AtomCreateGenericInfo extends React.Component {
       title: this.state.title,
       commissioningDesks: this.state.commissioningDesks
     });
-  }
+  };
 
   shouldEnableCreateButton = () => {
     if (!this.state.title || !this.state.title.length) {
       return false;
     }
 
     return true;
-  }
+  };
 
   render () {
 

diff --git a/public/js/components/AtomEdit/AtomEdit.js b/public/js/components/AtomEdit/AtomEdit.js
@@ -38,7 +38,7 @@ class AtomEdit extends React.Component {
       embeddedMode: PropTypes.string,
       isEmbedded: PropTypes.bool.isRequired
     })
-  }
+  };
 
   UNSAFE_componentWillMount() {
     subscribeToPresence(this.props.routeParams.atomType, this.props.routeParams.id);
@@ -52,7 +52,7 @@ class AtomEdit extends React.Component {
     } finally {
         this.props.atomActions.updateAtom(newAtom);
     }
-  }
+  };
 
   updateChartAtom = () => {
     try {
@@ -65,11 +65,11 @@ class AtomEdit extends React.Component {
           this.props.atomActions.updateAtom(atom);
         });
     }
-  }
+  };
 
   updateFormErrors = (errors) => {
     this.props.formErrorActions.updateFormErrors(errors);
-  }
+  };
 
   renderSpecificEditor () {
 

diff --git a/public/js/components/AtomEdit/AtomEditHeader.js b/public/js/components/AtomEdit/AtomEditHeader.js
@@ -14,7 +14,7 @@ export default class AtomEditHeader extends React.Component {
   static propTypes = {
     atom: atomPropType.isRequired,
     onUpdate: PropTypes.func
-  }
+  };
 
   renderDate(dateType) {
 
@@ -48,7 +48,7 @@ export default class AtomEditHeader extends React.Component {
     return (
       <h4 className="atom-card__subheading">Title: {getTitleForAtom(atom)}</h4>
     );
-  }
+  };
 
 
   render () {

diff --git a/public/js/components/AtomEdit/CustomEditors/CTAEditor.js b/public/js/components/AtomEdit/CustomEditors/CTAEditor.js
@@ -15,7 +15,7 @@ export class CTAEditor extends React.Component {
     }).isRequired,
     onUpdate: PropTypes.func.isRequired,
     onFormErrorsUpdate: PropTypes.func
-  }
+  };
 
   render () {
 

diff --git a/public/js/components/AtomEdit/CustomEditors/ChartEditor.js b/public/js/components/AtomEdit/CustomEditors/ChartEditor.js
@@ -13,7 +13,7 @@ export class ChartEditor extends React.Component {
       stage: PropTypes.string.isRequired
     }).isRequired,
     onUpdate: PropTypes.func.isRequired
-  }
+  };
 
   state = {
     modalOpen: false

diff --git a/public/js/components/AtomEdit/CustomEditors/CommonsDivisionEditor.js b/public/js/components/AtomEdit/CustomEditors/CommonsDivisionEditor.js
@@ -12,7 +12,7 @@ export class CommonsDivisionEditor extends React.Component {
     atom: atomPropType.isRequired,
     onUpdate: PropTypes.func.isRequired,
     onFormErrorsUpdate: PropTypes.func
-  }
+  };
 
   renderDetails(details) {
     return (

diff --git a/public/js/components/AtomEdit/CustomEditors/ExplainerEditor.js b/public/js/components/AtomEdit/CustomEditors/ExplainerEditor.js
@@ -11,7 +11,7 @@ export class ExplainerEditor extends React.Component {
     atom: atomPropType.isRequired,
     onUpdate: PropTypes.func.isRequired,
     onFormErrorsUpdate: PropTypes.func
-  }
+  };
 
   render() {
     return (<ManagedForm data={this.props.atom} updateData={this.props.onUpdate} onFormErrorsUpdate={this.props.onFormErrorsUpdate} formName="explainerEditor">

diff --git a/public/js/components/AtomEdit/CustomEditors/QAndAEditor.js b/public/js/components/AtomEdit/CustomEditors/QAndAEditor.js
@@ -15,7 +15,7 @@ export class QAndAEditor extends React.Component {
     config: PropTypes.shape({
       gridUrl: PropTypes.string.isRequired
     }).isRequired
-  }
+  };
 
   render () {
     return (

diff --git a/public/js/components/AtomEdit/CustomEditors/TimelineEditor.js b/public/js/components/AtomEdit/CustomEditors/TimelineEditor.js
@@ -12,7 +12,7 @@ export class TimelineEditor extends React.Component {
     atom: atomPropType.isRequired,
     onUpdate: PropTypes.func.isRequired,
     onFormErrorsUpdate: PropTypes.func
-  }
+  };
 
   render () {
 

diff --git a/public/js/components/AtomEdit/EmbeddedAtomPick.js b/public/js/components/AtomEdit/EmbeddedAtomPick.js
@@ -7,18 +7,18 @@ class EmbeddedAtomPick extends React.Component {
   static propTypes = {
     atom: atomPropType.isRequired,
     publishAtom: PropTypes.func.isRequired
-  }
+  };
 
   triggerEmbedMessage = () => {
     window.parent.postMessage({
       atomId: this.props.atom.id,
       atomType: this.props.atom.atomType
     }, '*');
-  }
+  };
 
   triggerAtomPublished = () => {
     this.props.publishAtom(this.props.atom);
-  }
+  };
 
   atomHasBeenPublished(){
     return !!this.props.atom.contentChangeDetails.published;

diff --git a/public/js/components/AtomEmbed/CreateTargetForm.js b/public/js/components/AtomEmbed/CreateTargetForm.js
@@ -16,13 +16,13 @@ class CreateTargetForm extends React.Component {
     title: PropTypes.string.isRequired,
     triggerTargetFetch: PropTypes.func.isRequired,
     toggleEditMode: PropTypes.func.isRequired
-  }
+  };
 
   state = {
     creating: false,
     currentTarget: {},
     formHasError: true
-  }
+  };
 
 
   UNSAFE_componentWillMount() {
@@ -56,19 +56,19 @@ class CreateTargetForm extends React.Component {
         });
       }
     });
-  }
+  };
 
   updateCurrentTarget = (newTarget) => {
     this.setState({
       currentTarget: newTarget
     });
-  }
+  };
 
   updateFormErrorState = (errorState) => {
     this.setState({
       formHasError: errorState
     });
-  }
+  };
 
   render() {
     return (

diff --git a/public/js/components/AtomRoot/AtomRoot.js b/public/js/components/AtomRoot/AtomRoot.js
@@ -29,7 +29,7 @@ class AtomRoot extends React.Component {
       liveCapiUrl: PropTypes.string
     }),
     children: PropTypes.element.isRequired
-  }
+  };
 
 
   UNSAFE_componentWillMount() {

diff --git a/public/js/components/AtomStats/AtomStats.js b/public/js/components/AtomStats/AtomStats.js
@@ -21,7 +21,7 @@ class AtomStats extends React.Component {
       composerUrl: PropTypes.string.isRequired,
       viewerUrl: PropTypes.string.isRequired
     }).isRequired
-  }
+  };
 
   UNSAFE_componentWillMount() {
     this.props.atomActions.getAtomUsages(this.props.routeParams.atomType, this.props.routeParams.id);
@@ -54,7 +54,7 @@ class AtomStats extends React.Component {
         </li>
       );
     }
-  }
+  };
 
   renderAtomUsages = () => {
     if (this.props.atomUsages && this.props.atomUsages.length > 0) {
@@ -68,7 +68,7 @@ class AtomStats extends React.Component {
         <div>This atom is not currently used in any content.</div>
       );
     }
-  }
+  };
 
   renderSuggestedContent = () => {
     if (this.props.suggestedContent && this.props.suggestedContent.length > 0) {
@@ -82,7 +82,7 @@ class AtomStats extends React.Component {
         <div>No suggested content for the last 7 days.</div>
       );
     }
-  }
+  };
 
   render() {
     return (

diff --git a/public/js/components/ContentSuggestions/ContentSuggestions.js b/public/js/components/ContentSuggestions/ContentSuggestions.js
@@ -16,7 +16,7 @@ class ContentSuggestions extends React.Component {
       viewerUrl: PropTypes.string.isRequired,
       liveCapiUrl: PropTypes.string
     }).isRequired
-  }
+  };
 
   UNSAFE_componentWillMount() {
     this.props.atomActions.getSuggestionsForLatestContent();
@@ -35,7 +35,7 @@ class ContentSuggestions extends React.Component {
         </div>
       </li>
     );
-  }
+  };
 
   renderContent = content => {
     const composerLink = `${this.props.config.composerUrl}/content/${content.internalComposerCode}`;
@@ -61,7 +61,7 @@ class ContentSuggestions extends React.Component {
         </div>
       </div>
     );
-  }
+  };
 
   renderAtomsArray = (atomsArray) => {
     return (
@@ -72,7 +72,7 @@ class ContentSuggestions extends React.Component {
         </ul>
       </div>
     );
-  }
+  };
 
   renderContentAndSuggestions = (item, i) => {
     return (
@@ -81,7 +81,7 @@ class ContentSuggestions extends React.Component {
         { this.renderAtomsArray(item.atoms) }
       </li>
     );
-  }
+  };
 
   renderSuggestionsForLatestContent() {
     if (this.props.suggestionsForLatestContent) {

diff --git a/public/js/components/ContentSuggestions/CopyUrlButton.js b/public/js/components/ContentSuggestions/CopyUrlButton.js
@@ -10,11 +10,11 @@ class CopyUrlButton extends React.Component {
     config: PropTypes.shape({
       capiLiveUrl: PropTypes.string
     }).isRequired
-  }
+  };
 
   state = {
     copied: false
-  }
+  };
 
   generateEmbedUrl() {
     if (!this.props.atom) {
@@ -33,7 +33,7 @@ class CopyUrlButton extends React.Component {
     setTimeout(() => {
       this.setState({copied: false});
     }, 5000);
-  }
+  };
 
   render() {
     return (

diff --git a/public/js/components/ExternalAtom/ExternalAtom.js b/public/js/components/ExternalAtom/ExternalAtom.js
@@ -15,7 +15,7 @@ class ExternalAtom extends React.Component {
     externalAtomActions: PropTypes.shape({
       getExternalAtom: PropTypes.func.isRequired
     })
-  }
+  };
 
   UNSAFE_componentWillMount() {
       this.props.externalAtomActions.getExternalAtom(this.props.routeParams.atomType, this.props.routeParams.id);
@@ -28,7 +28,7 @@ class ExternalAtom extends React.Component {
         <a target="_blank" rel="noreferrer" href={getAtomEditorUrl(atom)} className="link">Open dedicated {_capitalize(atom.atomType)} atom editor</a>
       </div>
     );
-  }
+  };
 
   render () {
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ class AtomRoot extends React.Component { @@
           liveCapiUrl: PropTypes.string
         }),
         children: PropTypes.element.isRequired
-      }
+      };
       UNSAFE_componentWillMount() {
@@ Expand Down @@