more fixes, more rebase

Author: willdurand

src/components/DiffView/index.spec.tsx

@@ -1,6 +1,6 @@
-/// <reference path="index.d.ts"/>
+// / <reference path="index.d.ts"/>
 
-import { shallow } from 'enzyme';
+import { ShallowWrapper, shallow } from 'enzyme';
 import React from 'react';
 import { Diff, parseDiff } from 'react-diff-view';
 
@@ -19,7 +19,7 @@ index 5ca1a30..4e2c90f 100644
 +  expect(root).toHaveProp('viewType', viewType);
  });`;
 
-  const render = (props = {}) => {
+  const render = (props = {}): ShallowWrapper => {
     return shallow(<DiffView diff={basicDiff} {...props} />);
   };
 

src/components/DiffView/index.tsx

@@ -20,7 +20,13 @@ class DiffView extends React.Component<Props> {
     return (
       <div>
         {files.map(({ hunks, type }, index: number) => (
-          <Diff diffType={type} hunks={hunks} key={index} viewType={viewType} />
+          <Diff
+            diffType={type}
+            hunks={hunks}
+            // eslint-disable-next-line react/no-array-index-key
+            key={`diff-${index}`}
+            viewType={viewType}
+          />
         ))}
       </div>
     );