Skip to content

Commit 5c77f8b

Browse files
authored
Merge pull request #148 from bootstrap-styled/dev
fix(dependencies): Upgrade many dependencies
2 parents 67c3d9c + 4936096 commit 5c77f8b

File tree

3 files changed

+33
-36
lines changed

3 files changed

+33
-36
lines changed

package.json

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -61,67 +61,65 @@
6161
],
6262
"license": "MIT",
6363
"devDependencies": {
64-
"@babel/cli": "^7.4.4",
65-
"@babel/core": "^7.4.5",
64+
"@babel/cli": "^7.6.0",
65+
"@babel/core": "^7.6.0",
6666
"@babel/plugin-external-helpers": "^7.2.0",
67-
"@babel/plugin-proposal-class-properties": "^7.4.4",
68-
"@babel/plugin-proposal-decorators": "^7.4.4",
67+
"@babel/plugin-proposal-class-properties": "^7.5.5",
68+
"@babel/plugin-proposal-decorators": "^7.6.0",
6969
"@babel/plugin-proposal-json-strings": "^7.2.0",
70-
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
70+
"@babel/plugin-proposal-object-rest-spread": "^7.5.5",
7171
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
7272
"@babel/plugin-syntax-import-meta": "^7.2.0",
73-
"@babel/plugin-transform-modules-commonjs": "^7.4.4",
74-
"@babel/plugin-transform-react-constant-elements": "^7.2.0",
73+
"@babel/plugin-transform-modules-commonjs": "^7.6.0",
74+
"@babel/plugin-transform-react-constant-elements": "^7.6.0",
7575
"@babel/plugin-transform-react-inline-elements": "^7.2.0",
76-
"@babel/preset-env": "^7.4.5",
76+
"@babel/preset-env": "^7.6.0",
7777
"@babel/preset-react": "^7.0.0",
7878
"@bootstrap-styled/documentation": "^2.0.0",
79-
"@bootstrap-styled/provider": "^1.4.2",
79+
"@bootstrap-styled/provider": "^1.5.1",
8080
"@rollup-umd/documentation": "^2.0.5",
8181
"@rollup-umd/rollup": "^1.0.13",
8282
"@semantic-release/changelog": "^3.0.4",
83-
"@semantic-release/git": "^7.0.12",
84-
"@semantic-release/github": "^5.4.0",
85-
"@semantic-release/npm": "^5.1.9",
86-
"babel-eslint": "^10.0.2",
87-
"babel-jest": "^24.8.0",
83+
"@semantic-release/git": "^7.0.16",
84+
"@semantic-release/github": "^5.4.3",
85+
"@semantic-release/npm": "^5.1.15",
86+
"babel-eslint": "^10.0.3",
87+
"babel-jest": "^24.9.0",
8888
"babel-loader": "^8.0.6",
8989
"babel-plugin-add-module-exports": "^1.0.2",
9090
"babel-plugin-array-includes": "^2.0.3",
91-
"babel-plugin-dynamic-import-node": "^2.2.0",
92-
"babel-plugin-react-intl": "^3.2.1",
91+
"babel-plugin-dynamic-import-node": "^2.3.0",
9392
"babel-plugin-react-transform": "^3.0.0",
94-
"babel-plugin-styled-components": "^1.10.1",
93+
"babel-plugin-styled-components": "^1.10.6",
9594
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
9695
"babel-preset-react-hmre": "^1.1.1",
97-
"cz-conventional-changelog": "^2.1.0",
96+
"cz-conventional-changelog": "^3.0.2",
9897
"enzyme": "^3.10.0",
9998
"enzyme-adapter-react-16": "^1.14.0",
100-
"eslint": "^5.16.0",
101-
"eslint-config-airbnb": "^17.1.0",
102-
"eslint-plugin-import": "^2.17.3",
103-
"eslint-plugin-jsx-a11y": "^6.2.1",
104-
"eslint-plugin-react": "^7.13.0",
99+
"eslint": "^6.3.0",
100+
"eslint-config-airbnb": "^17.1.1",
101+
"eslint-plugin-import": "^2.18.2",
102+
"eslint-plugin-jsx-a11y": "^6.2.3",
103+
"eslint-plugin-react": "^7.14.3",
105104
"immutable": "^4.0.0-rc.12",
106-
"jest-cli": "^24.8.0",
105+
"jest-cli": "^24.9.0",
107106
"jest-sonar-reporter": "^2.0.0",
108-
"lint-staged": "^8.2.1",
109-
"mini-html-webpack-plugin": "^1.0.0",
107+
"lint-staged": "^9.2.5",
110108
"pre-commit": "^1.2.2",
111109
"raf": "^3.4.1",
112110
"react": ">=16.0.0 <=16.8.6",
113111
"react-dom": ">=16.0.0 <=16.8.6",
114112
"react-test-renderer": ">=16.0.0 <=16.8.6",
115-
"rimraf": "^2.6.3",
116-
"rollup": "^1.15.6",
117-
"semantic-release": "^15.13.16",
118-
"styled-components": "^4.2.0",
113+
"rimraf": "^3.0.0",
114+
"rollup": "^1.21.2",
115+
"semantic-release": "^15.13.24",
116+
"styled-components": "^4.3.2",
119117
"stylelint": "^10.1.0",
120118
"stylelint-config-recommended": "^2.2.0",
121119
"stylelint-config-styled-components": "^0.1.1",
122120
"stylelint-processor-styled-components": "^1.8.0",
123121
"toctoc": "^0.3.2",
124-
"webpack": "^4.34.0"
122+
"webpack": "^4.39.3"
125123
},
126124
"jest": {
127125
"roots": [
@@ -178,11 +176,11 @@
178176
"dependencies": {
179177
"@bootstrap-styled/color": "^1.0.9",
180178
"@bootstrap-styled/css-mixins": "^2.0.7",
181-
"@bootstrap-styled/css-utils": "^1.3.1",
179+
"@bootstrap-styled/css-utils": "^1.3.2",
182180
"@bootstrap-styled/utils": "^1.8.0",
183181
"@rollup-umd/documentation-cli": "^1.1.3",
184182
"basic-math-utils": "^0.3.4",
185-
"bootstrap-styled": "^2.5.1",
183+
"bootstrap-styled": "^2.5.2",
186184
"classnames": "^2.2.6",
187185
"lodash.isfunction": "^3.0.9",
188186
"lodash.omit": "^4.5.0",

src/Modal/Fade.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ function Fade(props) {
8181
className,
8282
baseClass,
8383
isActive && baseClassActive
84-
), cssModule)
85-
}
84+
), cssModule)}
8685
{...childProps}
8786
>
8887
{children}

src/Progress/ProgressBar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class ProgressBar extends React.Component { // eslint-disable-line react/prefer-
8282
return (
8383
<div
8484
className={progressBarClasses}
85-
style={Object.assign({ width: this.getWidth(valueNow, valueMin, valueMax) }, { height })}
85+
style={({ width: this.getWidth(valueNow, valueMin, valueMax), height })}
8686
{...rest}
8787
>
8888
{children}

0 commit comments

Comments
 (0)