Skip to content

Commit

Permalink
Merge pull request #151 from nabeliwo/upgrade-dependencies
Browse files Browse the repository at this point in the history
Export loader component
  • Loading branch information
nabeliwo authored Jun 14, 2019
2 parents 9015460 + 74e5e55 commit e368e86
Show file tree
Hide file tree
Showing 4 changed files with 1,582 additions and 1,489 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ commands:
# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "yarn.lock" }}
- v2-dependencies-{{ checksum "yarn.lock" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-
- v2-dependencies-
- run: yarn install
- save_cache:
paths:
- node_modules
key: v1-dependencies-{{ checksum "yarn.lock" }}
key: v2-dependencies-{{ checksum "yarn.lock" }}
# run tests!
- run: yarn lint
- run: yarn test
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,35 @@
"version": "3.8.0",
"author": "SmartHR-UI Team",
"dependencies": {
"fixpack": "^2.3.1",
"lodash.merge": "^4.6.1",
"lodash.range": "^3.2.0"
},
"devDependencies": {
"@babel/core": "^7.2.2",
"@storybook/addon-actions": "^5.0.11",
"@storybook/addon-links": "^5.0.11",
"@storybook/addon-links": "^5.1.7",
"@storybook/addon-viewport": "^5.0.11",
"@storybook/addons": "^5.0.11",
"@storybook/cli": "^5.0.11",
"@storybook/cli": "^5.1.7",
"@storybook/react": "^5.0.11",
"@storybook/theming": "^5.0.11",
"@storybook/theming": "^5.1.7",
"@types/enzyme": "^3.9.1",
"@types/enzyme-adapter-react-16": "^1.0.5",
"@types/jest": "^24.0.12",
"@types/lodash.merge": "^4.6.4",
"@types/lodash.range": "^3.2.5",
"@types/react": "^16.8.16",
"@types/react-test-renderer": "^16.8.1",
"@types/storybook__addon-actions": "^3.4.2",
"@types/storybook__addon-actions": "^3.4.3",
"@types/storybook__react": "^4.0.1",
"@types/styled-components": "^4.1.14",
"@types/styled-components": "^4.1.16",
"babel-loader": "^8.0.5",
"enzyme": "^3.9.0",
"enzyme-adapter-react-16": "^1.12.1",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
"enzyme-to-json": "^3.3.5",
"eslint": "^5.16.0",
"eslint-config-smarthr": "^1.0.1",
"eslint-config-smarthr": "^1.0.2",
"fixpack": "^2.3.1",
"husky": "^2.2.0",
"jest": "^24.1.0",
"lint-staged": "^8.1.0",
Expand All @@ -42,8 +42,8 @@
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-test-renderer": "16.8.6",
"styled-components": "^4.2.0",
"stylelint": "^10.0.1",
"styled-components": "^4.3.1",
"stylelint": "^10.1.0",
"stylelint-config-prettier": "^5.1.0",
"stylelint-config-standard": "^18.2.0",
"stylelint-config-styled-components": "^0.1.1",
Expand Down
3 changes: 2 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// components
export { AppBar } from './components/AppBar'
export { LightBalloon, DarkBalloon } from './components/Balloon'
export { Checkbox } from './components/Checkbox'
export { CheckboxLabel } from './components/CheckboxLabel'
export { Dropdown, DropdownTrigger, DropdownContent } from './components/Dropdown'
export { Field, TextField, NumberField, PasswordField } from './components/Field'
export { Flash } from './components/Flash'
export { TextInput, NumberInput, PasswordInput } from './components/Input'
export { LightBalloon, DarkBalloon } from './components/Balloon'
export { Loader } from './components/Loader'
export { Modal, ModalWrapper, ModalTrigger, ModalEraser, ModalContent } from './components/Modal'
export { Pagination } from './components/Pagination'
export { Radio } from './components/Radio'
Expand Down
Loading

0 comments on commit e368e86

Please sign in to comment.