fixes after rebase

Author: willdurand

.eslintrc

@@ -5,17 +5,14 @@
     "plugin:jest/recommended",
     "plugin:@typescript-eslint/recommended"
   ],
-  "globals": {
-    "document": true
-  },
   "parser": "@typescript-eslint/parser",
   "rules": {
     // TS configuration for the `indent` rule.
     // https://github.com/typescript-eslint/typescript-eslint/blob/5b0b3d9edbcb3ab588a34c431037d9deece30824/packages/eslint-plugin/docs/rules/indent.md#options
     "indent": "off",
     "@typescript-eslint/indent": ["error", 2],
       "import/no-extraneous-dependencies": ["error", {
-        "devDependencies": ["**/*.test.*"]
+        "devDependencies": ["**/*.test.*", "**/*.spec.*"]
       }
     ],
     // We use `.tsx` instead of `.jsx` for files with JSX inside.
@@ -25,7 +22,14 @@
     ],
     // We decided to prefer types over interfaces.
     "@typescript-eslint/prefer-interface": "off",
-    "@typescript-eslint/explicit-member-accessibility": "off"
+    "@typescript-eslint/explicit-member-accessibility": "off",
+    // This rule conflicts with our convention.
+    "jest/valid-describe": "off",
+    // These rules are not compatible with Prettier.
+    "implicit-arrow-linebreak": "off",
+    "no-mixed-operators": "off",
+    "operator-linebreak": "off",
+    "react/jsx-one-expression-per-line": "off"
   },
   "settings": {
     "import/resolver": {

package.json

@@ -12,6 +12,7 @@
     "@types/redux-logger": "3.0.6",
     "express": "4.16.4",
     "http-proxy-middleware": "0.19.1",
+    "http-proxy-response-rewrite": "^0.0.1",
     "node-sass": "4.11.0",
     "react": "16.7.0",
     "react-dom": "16.7.0",
@@ -38,7 +39,6 @@
     "enzyme-adapter-react-16": "^1.7.1",
     "eslint-config-amo": "^1.11.0",
     "eslint-plugin-amo": "^1.9.1",
-    "http-proxy-response-rewrite": "^0.0.1",
     "jest-enzyme": "^7.0.1",
     "jest-enzyme": "^7.0.1",
     "jest-fetch-mock": "^2.1.0",

src/api/index.spec.tsx

@@ -1,12 +1,15 @@
-import { HttpMethod, callApi, logOutFromServer } from '.';
+/* global fetch, fetchMock */
 import {
-  initialState as defaultApiState,
+  ApiState,
   actions as apiActions,
+  initialState as defaultApiState,
 } from '../reducers/api';
 import configureStore from '../configureStore';
 
+import { HttpMethod, callApi, logOutFromServer } from '.';
+
 describe(__filename, () => {
-  const getApiState = ({ authToken = '12345' } = {}) => {
+  const getApiState = ({ authToken = '12345' } = {}): ApiState => {
     const store = configureStore();
 
     store.dispatch(apiActions.setAuthToken({ authToken }));
@@ -16,7 +19,7 @@ describe(__filename, () => {
   };
 
   describe('callApi', () => {
-    const callApiWithDefaultApiState = (params = {}) => {
+    const callApiWithDefaultApiState = (params = {}): object => {
       return callApi({ apiState: defaultApiState, endpoint: '/', ...params });
     };
 

src/api/index.tsx

@@ -1,3 +1,4 @@
+/* global fetch */
 import { ApiState } from '../reducers/api';
 
 export enum HttpMethod {
@@ -26,15 +27,17 @@ export const callApi = async ({
   version = 'v4',
 }: CallApiParams): Promise<object | { error: Error }> => {
   if (!endpoint.startsWith('/')) {
+    // eslint-disable-next-line no-param-reassign
     endpoint = `/${endpoint}`;
   }
   if (!endpoint.endsWith('/')) {
+    // eslint-disable-next-line no-param-reassign
     endpoint = `${endpoint}/`;
   }
 
-  const headers = {} as Headers;
+  const headers: Headers = {};
   if (apiState.authToken) {
-    headers['Authorization'] = `Bearer ${apiState.authToken}`;
+    headers.Authorization = `Bearer ${apiState.authToken}`;
   }
 
   try {
@@ -51,6 +54,7 @@ export const callApi = async ({
 
     return await response.json();
   } catch (error) {
+    // eslint-disable-next-line amo/only-log-strings, no-console
     console.error(error);
 
     return {

src/components/App/index.test.tsx

@@ -2,11 +2,12 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { Store } from 'redux';
 
-import App from '.';
 import styles from './styles.module.scss';
 import configureStore from '../../configureStore';
 import { actions as apiActions } from '../../reducers/api';
 
+import App from '.';
+
 describe(__filename, () => {
   type RenderParams = {
     store?: Store;

src/components/App/index.tsx

@@ -62,6 +62,7 @@ class AppBase extends React.Component<Props, State> {
       })) as State['profile'];
 
       if (profile && profile.name) {
+        // eslint-disable-next-line react/no-did-update-set-state
         this.setState({ profile });
       }
     }
@@ -92,13 +93,17 @@ class AppBase extends React.Component<Props, State> {
         <header className={styles.header}>
           {profile ? (
             <React.Fragment>
-              <h3>Hello {profile.name}!</h3>
+              <h3>
+                Hello
+                {profile.name}!
+              </h3>
 
               <p>Toggle this on and off to test out Redux:</p>
               <p>
                 <button
                   onClick={this.handleToggleClick}
                   style={{ padding: '32px' }}
+                  type="button"
                 >
                   {toggledOn ? 'OFF' : 'ON'}
                 </button>
@@ -108,7 +113,9 @@ class AppBase extends React.Component<Props, State> {
                 {isLoggingOut ? (
                   'See you next time... 😕'
                 ) : (
-                  <button onClick={this.logOut}>Log out</button>
+                  <button type="button" onClick={this.logOut}>
+                    Log out
+                  </button>
                 )}
               </p>
             </React.Fragment>

src/index.tsx

@@ -1,4 +1,4 @@
-/* global: document */
+/* global document */
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter } from 'react-router-dom';
@@ -7,7 +7,6 @@ import { Provider } from 'react-redux';
 import './index.css';
 import App from './components/App';
 import configureStore from './configureStore';
-import { actions as apiActions } from './reducers/api';
 
 const store = configureStore();
 

src/reducers/api.spec.tsx

@@ -3,6 +3,7 @@ import reducer, { actions, initialState } from './api';
 describe(__filename, () => {
   describe('reducer', () => {
     it('initializes the state', () => {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const state = reducer(undefined, { type: 'SOME_ACTION' } as any);
 
       expect(state).toEqual(initialState);

src/server/index.js

@@ -1,3 +1,4 @@
+/* eslint @typescript-eslint/no-var-requires: 0, no-console: 0, global-require: 0 */
 // @ts-ignore
 const fs = require('fs');
 const path = require('path');
@@ -57,6 +58,7 @@ const createServer = ({
             const cookies = proxyResponse.headers['set-cookie'].map((cookie) =>
               cookie.replace(/;\s*?(Secure)/i, ''),
             );
+            // eslint-disable-next-line no-param-reassign
             proxyResponse.headers['set-cookie'] = cookies;
           }
         },
@@ -100,6 +102,7 @@ const createServer = ({
         ws: true,
         onProxyRes: (proxyResponse, req, res) => {
           if (req.url === '/') {
+            // eslint-disable-next-line no-param-reassign
             proxyResponse.headers['cache-control'] = 'private, no-store';
 
             modifyResponse(

src/server/index.spec.js

@@ -1,4 +1,5 @@
 import path from 'path';
+
 import request from 'supertest';
 
 import { createServer, injectAuthenticationToken } from '.';