Bugfix/eslint (#162)

* eslint scripts and run --fix * govuk-react dependencies * missing dependencies raised by eslint * fix misc eslint issues * fixed eslint issues * updated documentMetadata with correct proptypes and addded eslint ignore * add ignore for Spinner eslint key issue * Fix unt test warning for document-footer-metadata * more eslint issues and fix glob to js files * resolve snyk issues * remove package lock in favour of yarn lock * correct glob for eslint script * eslint-disable-next-line instead of eslint-disable
govuk-react · Mar 22, 2018 · 56eaede · 56eaede
1 parent 86f6d1b
commit 56eaede
Show file tree

Hide file tree

Showing 40 changed files with 2,099 additions and 16,382 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -14,7 +14,7 @@
   },
   "overrides": [
     {
-      "files": [ "stories.js", "test.js", "scripts/**", "src/stories/**" ],
+      "files": [ "stories.js", "test.js", "example.js", "scripts/**", "src/stories/**" ],
       "rules": {
         "import/no-extraneous-dependencies": ["error", {"devDependencies": true}]
       }

diff --git a/.snyk b/.snyk
@@ -0,0 +1,200 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.10.2
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  'npm:braces:20180219':
+    - component-image > nunjucks > chokidar > anymatch > micromatch > braces:
+        reason: None given
+        expires: '2018-04-21T14:50:40.901Z'
+    - '@govuk-react/api-docs > component-image > nunjucks > chokidar > anymatch > micromatch > braces':
+        reason: None given
+        expires: '2018-04-21T14:50:40.901Z'
+  'npm:clean-css:20180306':
+    - '@govuk-react/storybook > @storybook/react > html-loader > html-minifier > clean-css':
+        reason: None given
+        expires: '2018-04-21T14:50:40.901Z'
+    - '@govuk-react/storybook > @storybook/react > html-webpack-plugin > html-minifier > clean-css':
+        reason: None given
+        expires: '2018-04-21T14:50:40.901Z'
+    - '@govuk-react/storybook-components > @storybook/react > html-loader > html-minifier > clean-css':
+        reason: None given
+        expires: '2018-04-21T14:50:40.901Z'
+    - '@govuk-react/storybook-components > @storybook/react > html-webpack-plugin > html-minifier > clean-css':
+        reason: None given
+        expires: '2018-04-21T14:50:40.901Z'
+  'npm:hoek:20180212':
+    - boom > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.901Z'
+    - cryptiles > boom > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.901Z'
+    - hawk > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.901Z'
+    - hawk > boom > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.901Z'
+    - hawk > sntp > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.901Z'
+    - hawk > cryptiles > boom > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.901Z'
+    - node-pre-gyp > hawk > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - node-pre-gyp > hawk > boom > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - node-pre-gyp > hawk > sntp > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - node-pre-gyp > hawk > cryptiles > boom > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - node-pre-gyp > request > hawk > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - node-pre-gyp > request > hawk > boom > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - node-pre-gyp > request > hawk > sntp > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - node-pre-gyp > request > hawk > cryptiles > boom > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - component-image > nunjucks > chokidar > fsevents > node-pre-gyp > hawk > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - component-image > nunjucks > chokidar > fsevents > node-pre-gyp > hawk > boom > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - component-image > nunjucks > chokidar > fsevents > node-pre-gyp > hawk > sntp > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - component-image > nunjucks > chokidar > fsevents > node-pre-gyp > hawk > cryptiles > boom > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - component-image > nunjucks > chokidar > fsevents > node-pre-gyp > request > hawk > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - component-image > nunjucks > chokidar > fsevents > node-pre-gyp > request > hawk > boom > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - component-image > nunjucks > chokidar > fsevents > node-pre-gyp > request > hawk > sntp > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - component-image > nunjucks > chokidar > fsevents > node-pre-gyp > request > hawk > cryptiles > boom > hoek:
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - '@govuk-react/api-docs > component-image > nunjucks > chokidar > fsevents > node-pre-gyp > hawk > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - '@govuk-react/api-docs > component-image > nunjucks > chokidar > fsevents > node-pre-gyp > hawk > boom > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - '@govuk-react/api-docs > component-image > nunjucks > chokidar > fsevents > node-pre-gyp > hawk > sntp > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - '@govuk-react/api-docs > component-image > nunjucks > chokidar > fsevents > node-pre-gyp > hawk > cryptiles > boom > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - '@govuk-react/api-docs > component-image > nunjucks > chokidar > fsevents > node-pre-gyp > request > hawk > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - '@govuk-react/api-docs > component-image > nunjucks > chokidar > fsevents > node-pre-gyp > request > hawk > boom > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - '@govuk-react/api-docs > component-image > nunjucks > chokidar > fsevents > node-pre-gyp > request > hawk > sntp > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - '@govuk-react/api-docs > component-image > nunjucks > chokidar > fsevents > node-pre-gyp > request > hawk > cryptiles > boom > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - '@govuk-react/storybook > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > hawk > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - '@govuk-react/storybook > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > hawk > boom > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - '@govuk-react/storybook > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > hawk > sntp > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.902Z'
+    - '@govuk-react/storybook > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > hawk > cryptiles > boom > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > hawk > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > hawk > boom > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > hawk > sntp > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > hawk > cryptiles > boom > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook-components > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > hawk > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook-components > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > hawk > boom > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook-components > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > hawk > sntp > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook-components > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > hawk > cryptiles > boom > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook-components > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > hawk > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook-components > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > hawk > boom > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook-components > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > hawk > sntp > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook-components > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > hawk > cryptiles > boom > hoek':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+  'npm:lodash:20180130':
+    - '@govuk-react/storybook > @storybook/react > @storybook/ui > react-treebeard > velocity-react > lodash':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook-components > @storybook/react > @storybook/ui > react-treebeard > velocity-react > lodash':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+  'npm:shelljs:20140723':
+    - '@govuk-react/storybook > @storybook/storybook-deployer > shelljs':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook > @storybook/react > shelljs':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+    - '@govuk-react/storybook-components > @storybook/react > shelljs':
+        reason: None given
+        expires: '2018-04-21T14:50:40.903Z'
+# patches apply the minimum changes required to fix a vulnerability
+patch:
+  'npm:debug:20170905':
+    - '@govuk-react/api-docs > component-image > nunjucks > chokidar > fsevents > node-pre-gyp > tar-pack > debug':
+        patched: '2018-03-22T14:48:48.694Z'
+    - '@govuk-react/storybook > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > tar-pack > debug':
+        patched: '2018-03-22T14:48:48.694Z'
+    - '@govuk-react/storybook-components > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > tar-pack > debug':
+        patched: '2018-03-22T14:48:48.694Z'
+    - component-image > nunjucks > chokidar > fsevents > node-pre-gyp > tar-pack > debug:
+        patched: '2018-03-22T14:48:48.694Z'
+  'npm:tough-cookie:20170905':
+    - '@govuk-react/api-docs > component-image > nunjucks > chokidar > fsevents > node-pre-gyp > request > tough-cookie':
+        patched: '2018-03-22T14:48:48.694Z'
+    - '@govuk-react/storybook > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > tough-cookie':
+        patched: '2018-03-22T14:48:48.694Z'
+    - '@govuk-react/storybook-components > @storybook/react > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > tough-cookie':
+        patched: '2018-03-22T14:48:48.694Z'
+    - component-image > nunjucks > chokidar > fsevents > node-pre-gyp > request > tough-cookie:
+        patched: '2018-03-22T14:48:48.694Z'
diff --git a/components/back-link/package.json b/components/back-link/package.json
@@ -19,7 +19,8 @@
     "cross-env": "^5.1.4",
     "enzyme": "^3.3.0",
     "react-dom": "^16.2.0",
-    "rimraf": "^2.6.2"
+    "rimraf": "^2.6.2",
+    "sinon": "^4.4.8"
   },
   "scripts": {
     "build": "npm run build:lib && npm run build:es",

diff --git a/components/breadcrumb/package.json b/components/breadcrumb/package.json
@@ -13,11 +13,13 @@
   "devDependencies": {
     "@babel/cli": "^7.0.0-beta.40",
     "@govuk-react/api-docs": "^0.1.22",
+    "@govuk-react/hoc": "^0.1.22",
     "@storybook/addon-actions": "^3.3.14",
     "@storybook/react": "^3.3.14",
     "cross-env": "^5.1.4",
     "enzyme": "^3.3.0",
     "react-dom": "^16.2.0",
+    "react-router-dom": "^4.2.2",
     "rimraf": "^2.6.2"
   },
   "scripts": {

diff --git a/components/document-footer-metadata/package.json b/components/document-footer-metadata/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.22",
   "dependencies": {
     "@govuk-react/constants": "^0.1.21",
+    "@govuk-react/unordered-list": "^0.1.22",
     "govuk-colours": "^1.0.3"
   },
   "peerDependencies": {
@@ -13,6 +14,7 @@
   "devDependencies": {
     "@babel/cli": "^7.0.0-beta.40",
     "@govuk-react/api-docs": "^0.1.22",
+    "@govuk-react/hoc": "^0.1.22",
     "@storybook/addon-actions": "^3.3.14",
     "@storybook/addons": "^3.3.14",
     "@storybook/react": "^3.3.14",

diff --git a/components/document-footer-metadata/src/index.js b/components/document-footer-metadata/src/index.js
@@ -27,7 +27,9 @@ const DocumentFooterMetadata = ({ from, partOf, other }) => {
           <p style={{ marginBottom: 0 }}>From:</p>
           <UnorderedList listStyleType="none">
             {from && from.map((child, i) => (
-              <Definition key={child.key || i}>{child}</Definition>
+              /* eslint-disable react/no-array-index-key */
+              <Definition key={i}>{child}</Definition>
+              /* eslint-enable react/no-array-index-key */
               ))}
           </UnorderedList>
         </div>}
@@ -81,9 +83,13 @@ DocumentFooterMetadata.defaultProps = {
 };
 
 DocumentFooterMetadata.propTypes = {
-  from: PropTypes.array,
-  partOf: PropTypes.array,
-  other: PropTypes.array,
+  from: PropTypes.arrayOf(PropTypes.node),
+  partOf: PropTypes.arrayOf(PropTypes.node),
+  other: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.number,
+    title: PropTypes.string,
+    content: PropTypes.node,
+  })),
 };
 
 export default DocumentFooterMetadata;
diff --git a/components/document-footer-metadata/src/test.js b/components/document-footer-metadata/src/test.js
@@ -8,8 +8,8 @@ const example = ['example'];
 const multiExample = ['example', 'exampleexample'];
 const otherExample = [{
   id: 0,
-  title: example,
-  content: example,
+  title: 'example',
+  content: ['example'],
 }];
 const wrapper = <DocumentFooterMetadata from={example} />;
 const wrapperMultiple = <DocumentFooterMetadata partOf={multiExample} />;

diff --git a/components/file-upload/package.json b/components/file-upload/package.json
@@ -3,6 +3,10 @@
   "version": "0.1.22",
   "dependencies": {
     "@govuk-react/constants": "^0.1.21",
+    "@govuk-react/error-text": "^0.1.22",
+    "@govuk-react/hint-text": "^0.1.22",
+    "@govuk-react/label": "^0.1.22",
+    "@govuk-react/label-text": "^0.1.22",
     "govuk-colours": "^1.0.3"
   },
   "peerDependencies": {

diff --git a/components/grid-row/package.json b/components/grid-row/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.22",
   "dependencies": {
     "@govuk-react/constants": "^0.1.21",
+    "@govuk-react/layout": "^0.1.22",
     "govuk-colours": "^1.0.3"
   },
   "peerDependencies": {

diff --git a/components/header/src/index.js b/components/header/src/index.js
@@ -7,8 +7,7 @@ import glamorous from 'glamorous';
 import React, { createElement } from 'react';
 import PropTypes from 'prop-types';
 
-import { MEDIA_QUERIES, NTA_LIGHT } from '@govuk-react/constants';
-import { LEVEL_SIZE, FONT_SIZES, LEVEL_TAG } from '@govuk-react/constants';
+import { MEDIA_QUERIES, NTA_LIGHT, LEVEL_SIZE, FONT_SIZES, LEVEL_TAG } from '@govuk-react/constants';
 
 const GHeader = glamorous(({ level, children, ...props }) =>
   createElement(LEVEL_TAG[level], props, children))(

diff --git a/components/header/src/presets.js b/components/header/src/presets.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import Header from '.';
 import { LEVEL_SIZE } from '@govuk-react/constants';
+import Header from '.';
 
 export const H1 = props => <Header level={1} size={LEVEL_SIZE[1]} {...props} />;
 export const H2 = props => <Header level={2} size={LEVEL_SIZE[2]} {...props} />;

diff --git a/components/input-field/package.json b/components/input-field/package.json
@@ -3,6 +3,11 @@
   "version": "0.1.22",
   "dependencies": {
     "@govuk-react/constants": "^0.1.21",
+    "@govuk-react/error-text": "^0.1.22",
+    "@govuk-react/hint-text": "^0.1.22",
+    "@govuk-react/input": "^0.1.22",
+    "@govuk-react/label": "^0.1.22",
+    "@govuk-react/label-text": "^0.1.22",
     "govuk-colours": "^1.0.3"
   },
   "peerDependencies": {

diff --git a/components/layout/src/stories.js b/components/layout/src/stories.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import Layout from '.';
 import GridRow from '@govuk-react/grid-row';
 import GridCol from '@govuk-react/grid-col';
+import Layout from '.';
 
 storiesOf('Layout', module).add('Column Full', () => (
   <Layout>

diff --git a/components/list-navigation/package.json b/components/list-navigation/package.json
@@ -15,6 +15,7 @@
   "devDependencies": {
     "@babel/cli": "^7.0.0-beta.40",
     "@govuk-react/api-docs": "^0.1.22",
+    "@govuk-react/hoc": "^0.1.22",
     "@storybook/addon-actions": "^3.3.14",
     "@storybook/addons": "^3.3.14",
     "@storybook/react": "^3.3.14",

diff --git a/components/list-navigation/src/example.js b/components/list-navigation/src/example.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import ListNavigation from './index';
 import { asAnchor } from '@govuk-react/hoc';
+import ListNavigation from './index';
 
 const AnchorTag = asAnchor('a');
 

diff --git a/components/list-navigation/src/stories.js b/components/list-navigation/src/stories.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import { asAnchor } from '@govuk-react/hoc';
 
 import ListNavigation from '.';
-import { asAnchor } from '@govuk-react/hoc';
 
 const AnchorTag = asAnchor('a');
 

diff --git a/components/multi-choice/package.json b/components/multi-choice/package.json
@@ -16,6 +16,7 @@
   "devDependencies": {
     "@babel/cli": "^7.0.0-beta.40",
     "@govuk-react/api-docs": "^0.1.22",
+    "@govuk-react/radio": "^0.1.22",
     "@storybook/addon-actions": "^3.3.14",
     "@storybook/react": "^3.3.14",
     "cross-env": "^5.1.4",

diff --git a/components/multi-choice/src/example.js b/components/multi-choice/src/example.js
@@ -1,6 +1,6 @@
 import React from 'react';
+import Radio from '@govuk-react/radio';
 import MultiChoice from '.';
-import Radio from '../Radio';
 
 export default () => (
   <MultiChoice label="example">

diff --git a/components/multi-choice/src/stories.js b/components/multi-choice/src/stories.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import Radio from '@govuk-react/radio';
 
-import Radio from '../Radio';
 import MultiChoice from '.';
 
 storiesOf('MultiChoice', module).add('MultiChoice', () => (