more fixes

Author: willdurand

.eslintrc

@@ -3,8 +3,11 @@
     "amo",
     "plugin:amo/typescript",
     "plugin:jest/recommended",
-    "plugin:@typescript-eslint/recommended"
+    "plugin:@typescript-eslint/recommended",
   ],
+  "env": {
+    "browser": true,
+  },
   "rules": {
     // TS configuration for the `indent` rule.
     // https://github.com/typescript-eslint/typescript-eslint/blob/5b0b3d9edbcb3ab588a34c431037d9deece30824/packages/eslint-plugin/docs/rules/indent.md#options
@@ -30,6 +33,11 @@
     "react/jsx-one-expression-per-line": "off",
     // Report an error when a variable is not used.
     "@typescript-eslint/no-unused-vars": "error",
+    // The beauty of TS is that it infers types quite well, so let's not write
+    // too much code.
+    "@typescript-eslint/explicit-function-return-type": "off",
+    // TODO: re-enable this rule once https://github.com/mozilla/addons-code-manager/issues/85 lands.
+    "amo/only-log-strings": "off",
   },
   "settings": {
     "import/resolver": {

package.json

@@ -14,7 +14,7 @@
     "bootstrap": "4.2.1",
     "express": "4.16.4",
     "http-proxy-middleware": "0.19.1",
-    "http-proxy-response-rewrite": "^0.0.1",
+    "http-proxy-response-rewrite": "0.0.1",
     "node-sass": "4.11.0",
     "react": "16.7.0",
     "react-bootstrap": "1.0.0-beta.5",
@@ -57,7 +57,7 @@
     "build": "react-scripts build",
     "dev": "cat .env.common-local .env.dev > .env.local && yarn start-dev",
     "eject": "react-scripts eject",
-    "eslint": "eslint --ext .js --ext tsx src/",
+    "eslint": "eslint --ext js --ext tsx src/",
     "lint": "yarn eslint",
     "prettier": "prettier --write '**'",
     "prettier-ci": "prettier --list-different '**' || (echo '\n\nThis failure means you did not run `yarn prettier-dev` before committing\n\n' && exit 1)",

src/api/index.spec.tsx

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

src/api/index.tsx

@@ -1,4 +1,3 @@
-/* global fetch */
 import { ApiState } from '../reducers/api';
 
 export enum HttpMethod {
@@ -28,13 +27,12 @@ export const callApi = async ({
   method = HttpMethod.GET,
   version = 'v4',
 }: CallApiParams): Promise<CallApiResponse> => {
-  if (!endpoint.startsWith('/')) {
-    // eslint-disable-next-line no-param-reassign
-    endpoint = `/${endpoint}`;
+  let adjustedEndpoint = endpoint;
+  if (!adjustedEndpoint.startsWith('/')) {
+    adjustedEndpoint = `/${adjustedEndpoint}`;
   }
-  if (!endpoint.endsWith('/')) {
-    // eslint-disable-next-line no-param-reassign
-    endpoint = `${endpoint}/`;
+  if (!adjustedEndpoint.endsWith('/')) {
+    adjustedEndpoint = `${adjustedEndpoint}/`;
   }
 
   const headers: Headers = {};
@@ -43,21 +41,23 @@ export const callApi = async ({
   }
 
   try {
-    const response = await fetch(`/api/${version}${endpoint}`, {
+    const response = await fetch(`/api/${version}${adjustedEndpoint}`, {
       method,
       headers,
     });
 
     if (!response.ok) {
       throw new Error(
-        `Unexpected status for ${method} ${endpoint}: ${response.status}`,
+        `Unexpected status for ${method} ${adjustedEndpoint}: ${
+          response.status
+        }`,
       );
     }
 
     return await response.json();
   } catch (error) {
-    // eslint-disable-next-line amo/only-log-strings, no-console
-    console.error(error);
+    // eslint-disable-next-line no-console
+    console.debug(error);
 
     return {
       error,

src/components/App/index.spec.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ShallowWrapper, shallow } from 'enzyme';
+import { shallow } from 'enzyme';
 import { Store } from 'redux';
 
 import styles from './styles.module.scss';
@@ -17,7 +17,7 @@ describe(__filename, () => {
   const render = ({
     store = configureStore(),
     authToken = 'some-token',
-  }: RenderParams = {}): ShallowWrapper => {
+  }: RenderParams = {}) => {
     // TODO: Use shallowUntilTarget()
     // https://github.com/mozilla/addons-code-manager/issues/15
     const root = shallow(<App authToken={authToken} />, {

src/components/App/index.tsx

@@ -42,15 +42,15 @@ class AppBase extends React.Component<Props, State> {
     };
   }
 
-  componentDidMount(): void {
+  componentDidMount() {
     const { authToken, dispatch } = this.props;
 
     if (authToken) {
       dispatch(apiActions.setAuthToken({ authToken }));
     }
   }
 
-  async componentDidUpdate(prevProps: Props): Promise<void> {
+  async componentDidUpdate(prevProps: Props) {
     const { apiState } = this.props;
 
     if (
@@ -69,7 +69,7 @@ class AppBase extends React.Component<Props, State> {
     }
   }
 
-  logOut = async (): Promise<void> => {
+  logOut = async () => {
     const { apiState } = this.props;
 
     this.setState({ isLoggingOut: true });
@@ -79,15 +79,13 @@ class AppBase extends React.Component<Props, State> {
     this.setState({ profile: null, isLoggingOut: false });
   };
 
-  handleToggleClick = (
-    event: React.SyntheticEvent<HTMLButtonElement>,
-  ): void => {
+  handleToggleClick = (event: React.SyntheticEvent<HTMLButtonElement>) => {
     const { dispatch } = this.props;
     event.preventDefault();
     dispatch(exampleActions.toggle());
   };
 
-  render(): React.ReactNode {
+  render() {
     const { toggledOn } = this.props;
     const { profile, isLoggingOut } = this.state;
 

src/components/DiffView/index.spec.tsx

@@ -1,4 +1,4 @@
-import { ShallowWrapper, shallow } from 'enzyme';
+import { shallow } from 'enzyme';
 import React from 'react';
 import { Diff, parseDiff } from 'react-diff-view';
 
@@ -37,7 +37,7 @@ index 0cfbf08..e69de29 100644
 @@ -1 +0,0 @@
 -2`;
 
-  const render = (props = {}): ShallowWrapper => {
+  const render = (props = {}) => {
     return shallow(<DiffView diff={basicDiff} {...props} />);
   };
 

src/components/LoginButton/index.tsx

@@ -4,13 +4,13 @@ import { Button } from 'react-bootstrap';
 import styles from './styles.module.scss';
 
 export class LoginButtonBase extends React.Component {
-  getFxaURL(): string {
+  getFxaURL() {
     const fxaConfig = process.env.REACT_APP_FXA_CONFIG;
 
     return `/api/v4/accounts/login/start/?config=${fxaConfig}&to=/`;
   }
 
-  render(): React.ReactNode {
+  render() {
     return (
       <Button href={this.getFxaURL()} className={styles.link}>
         Log in

src/configureStore.tsx

@@ -2,7 +2,6 @@ import {
   Action,
   AnyAction,
   Dispatch,
-  Reducer,
   Store,
   applyMiddleware,
   combineReducers,
@@ -23,7 +22,7 @@ export type ApplicationState = {
   example: ExampleState;
 };
 
-const createRootReducer = (): Reducer<ApplicationState> => {
+const createRootReducer = () => {
   return combineReducers<ApplicationState>({ api, example });
 };
 

src/index.tsx

@@ -1,4 +1,3 @@
-/* global document */
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter } from 'react-router-dom';