Skip to content

Commit

Permalink
Bugfix/loading box dependency (#189)
Browse files Browse the repository at this point in the history
`@govuk-react/loading-box` wasn't a sub dependency of govuk-react. We want issues like this to be picked up automatically.

eslint needs to be configured to pick up exports that aren't in package.json, but this can't be done right now, see import-js/eslint-plugin-import#1049.

In the meantime we are including @govuk-react/storybook as a dependency, which will help ensure the storybook sub dependencies are included.

Also:

- remove package lock, using yarn as standard
- update yarn lock
- remove loading box package lock
- fix to eslint command to include subfolders of src
- add  devDependencies to hoc package
- add  dependencies to storybook package
- govuk-react/storybook as dependency of govuk-react (temporary)
  • Loading branch information
penx committed Apr 6, 2018
1 parent 139b600 commit 53067aa
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 17,009 deletions.
12,105 changes: 0 additions & 12,105 deletions components/loading-box/package-lock.json

This file was deleted.

4,899 changes: 0 additions & 4,899 deletions package-lock.json

This file was deleted.

4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -5,8 +5,8 @@
"bootstrap": "lerna bootstrap",
"docs": "./packages/api-docs/bin/doc-component.js './components/**/lib/index.js' './API.md'",
"docs:components": "lerna run docs --parallel",
"eslint": "eslint ./{components,packages}/**/src/**.js",
"eslint:fix": "eslint --fix ./{components,packages}/*/src/**.js",
"eslint": "eslint ./{components,packages}/*/src/**/*.js",
"eslint:fix": "eslint --fix ./{components,packages}/*/src/**/*.js",
"build": "lerna run build --parallel",
"build:sync": "lerna run build",
"build:lib": "lerna run build:lib --parallel",
Expand Down
2 changes: 2 additions & 0 deletions packages/govuk-react/package.json
Expand Up @@ -23,6 +23,7 @@
"@govuk-react/layout": "^0.1.25",
"@govuk-react/list-item": "^0.1.25",
"@govuk-react/list-navigation": "^0.1.25",
"@govuk-react/loading-box": "^0.1.25",
"@govuk-react/multi-choice": "^0.1.25",
"@govuk-react/ordered-list": "^0.1.25",
"@govuk-react/pagination": "^0.1.25",
Expand All @@ -33,6 +34,7 @@
"@govuk-react/related-items": "^0.1.25",
"@govuk-react/search-box": "^0.1.25",
"@govuk-react/select": "^0.1.25",
"@govuk-react/storybook": "^0.1.25",
"@govuk-react/text-area": "^0.1.25",
"@govuk-react/unordered-list": "^0.1.25",
"govuk-colours": "^1.0.3"
Expand Down
2 changes: 2 additions & 0 deletions packages/govuk-react/src/index.js
@@ -1,5 +1,7 @@
// TODO: eslint needs to be configured to pick up exports that aren't in package.json
// see https://github.com/benmosher/eslint-plugin-import/issues/1049
// In the meantime we are including @govuk-react/storybook as a dependency,
// which will help ensure subdependencies are included.

// Components
export { default as BackLink } from '@govuk-react/back-link';
Expand Down
28 changes: 28 additions & 0 deletions packages/hoc/package.json
Expand Up @@ -13,7 +13,35 @@
},
"devDependencies": {
"@babel/cli": "^7.0.0-beta.40",
"@govuk-react/back-link": "^0.1.25",
"@govuk-react/breadcrumb": "^0.1.25",
"@govuk-react/button": "^0.1.25",
"@govuk-react/checkbox": "^0.1.25",
"@govuk-react/date-input": "^0.1.25",
"@govuk-react/error-text": "^0.1.25",
"@govuk-react/file-upload": "^0.1.25",
"@govuk-react/header": "^0.1.25",
"@govuk-react/hint-text": "^0.1.25",
"@govuk-react/input": "^0.1.25",
"@govuk-react/input-field": "^0.1.25",
"@govuk-react/label": "^0.1.25",
"@govuk-react/label-text": "^0.1.25",
"@govuk-react/list-item": "^0.1.25",
"@govuk-react/list-navigation": "^0.1.25",
"@govuk-react/multi-choice": "^0.1.25",
"@govuk-react/ordered-list": "^0.1.25",
"@govuk-react/pagination": "^0.1.25",
"@govuk-react/panel": "^0.1.25",
"@govuk-react/phase-badge": "^0.1.25",
"@govuk-react/phase-banner": "^0.1.25",
"@govuk-react/radio": "^0.1.25",
"@govuk-react/related-items": "^0.1.25",
"@govuk-react/search-box": "^0.1.25",
"@govuk-react/select": "^0.1.25",
"@govuk-react/text-area": "^0.1.25",
"@govuk-react/unordered-list": "^0.1.25",
"@storybook/addon-actions": "^3.3.14",
"@storybook/addon-knobs": "^3.4.0",
"@storybook/react": "^3.3.14",
"cross-env": "^5.1.4",
"enzyme": "^3.3.0",
Expand Down
1 change: 1 addition & 0 deletions packages/storybook/package.json
Expand Up @@ -19,6 +19,7 @@
"@govuk-react/layout": "^0.1.25",
"@govuk-react/list-item": "^0.1.25",
"@govuk-react/list-navigation": "^0.1.25",
"@govuk-react/loading-box": "^0.1.25",
"@govuk-react/ordered-list": "^0.1.25",
"@govuk-react/pagination": "^0.1.25",
"@govuk-react/panel": "^0.1.25",
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Expand Up @@ -5030,9 +5030,9 @@ flatten@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"

flow-bin@^0.68.0:
version "0.68.0"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.68.0.tgz#86c2d14857d306eb2e85e274f2eebf543564f623"
flow-bin@^0.69.0:
version "0.69.0"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.69.0.tgz#053159a684a6051fcbf0b71a2eb19a9679082da6"

flow-parser@^0.*:
version "0.68.0"
Expand Down

0 comments on commit 53067aa

Please sign in to comment.