Skip to content

Commit bfb831a

Browse files
authored
Merge pull request #14 from kristerkari/feature/update-deps
Feature/update deps
2 parents e9b4690 + d63b8db commit bfb831a

File tree

3 files changed

+349
-321
lines changed

3 files changed

+349
-321
lines changed

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,24 @@
4747
]
4848
},
4949
"dependencies": {
50-
"deepmerge": "^2.1.0",
51-
"micro-memoize": "^2.0.1"
50+
"deepmerge": "^2.1.1",
51+
"micro-memoize": "^2.0.3"
5252
},
5353
"peerDependencies": {
5454
"react-native": ">=0.45.0"
5555
},
5656
"devDependencies": {
5757
"babel-cli": "^6.26.0",
58-
"babel-core": "^6.26.0",
59-
"babel-jest": "^22.4.3",
58+
"babel-core": "^6.26.3",
59+
"babel-jest": "^23.2.0",
6060
"babel-preset-es2015": "^6.24.1",
6161
"benchmark": "^2.1.4",
62-
"coveralls": "^3.0.0",
62+
"coveralls": "^3.0.2",
6363
"husky": "^0.14.3",
64-
"jest": "^22.4.3",
65-
"lint-staged": "^7.0.4",
66-
"npmpub": "^3.1.0",
67-
"prettier": "^1.12.0",
64+
"jest": "^23.2.0",
65+
"lint-staged": "^7.2.0",
66+
"npmpub": "^4.0.1",
67+
"prettier": "^1.13.7",
6868
"rimraf": "^2.6.2",
6969
"size-limit": "^0.18.3"
7070
},

src/mediaquery.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,15 @@ function toPx(length) {
139139
case "rem":
140140
return value * 16;
141141
case "cm":
142-
return value * 96 / 2.54;
142+
return (value * 96) / 2.54;
143143
case "mm":
144-
return value * 96 / 2.54 / 10;
144+
return (value * 96) / 2.54 / 10;
145145
case "in":
146146
return value * 96;
147147
case "pt":
148148
return value * 72;
149149
case "pc":
150-
return value * 72 / 12;
150+
return (value * 72) / 12;
151151
default:
152152
return value;
153153
}

0 commit comments

Comments
 (0)