Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/loading box dependency #189

Merged
merged 9 commits into from Apr 6, 2018
Merged

Bugfix/loading box dependency #189

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8f35a90
remove package lock, using yarn as standard
penx Apr 6, 2018
96bbb40
update yarn lock
penx Apr 6, 2018
0cd91ea
remove loading box package lock
penx Apr 6, 2018
193b72a
fix to eslint command to include subfolders of src
penx Apr 6, 2018
4620b74
hoc devDependencies
penx Apr 6, 2018
b5f4b70
storybook dependencies
penx Apr 6, 2018
4d9ce93
@govuk-react/storybook as dependency of govuk-react (temporary)
penx Apr 6, 2018
cb00d34
loading-box as dependency of govuk-react
penx Apr 6, 2018
3612e24
don't run eslint on node_modules on travis
penx Apr 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12,105 changes: 0 additions & 12,105 deletions components/loading-box/package-lock.json
View file
Open in desktop

This file was deleted.

4,899 changes: 0 additions & 4,899 deletions package-lock.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
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
1 change: 1 addition & 0 deletions packages/govuk-react/package.json
View file
Open in desktop
Expand Up @@ -33,6 +33,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",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you haven't added @govuk-react/loading-box to this file...

"@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
View file
Open in desktop
@@ -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
View file
Open in desktop
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",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

think we should add in loading-box here

"@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
View file
Open in desktop
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
View file
Open in desktop
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