Skip to content

Commit bfb831a

kristerkari kristerkari

authored

Merge pull request #14 from kristerkari/feature/update-deps

Feature/update deps

2 parents e9b4690 + d63b8db commit bfb831aCopy full SHA for bfb831a

File tree

3 files changed

+349

-321

lines changed

package.json
src
- mediaquery.js
yarn.lock

3 files changed

+349

-321

lines changed

`‎package.json`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,24 +47,24 @@`
`47`	`47`	`]`
`48`	`48`	`},`
`49`	`49`	`"dependencies": {`
`50`		`- "deepmerge": "^2.1.0",`
`51`		`- "micro-memoize": "^2.0.1"`
	`50`	`+ "deepmerge": "^2.1.1",`
	`51`	`+ "micro-memoize": "^2.0.3"`
`52`	`52`	`},`
`53`	`53`	`"peerDependencies": {`
`54`	`54`	`"react-native": ">=0.45.0"`
`55`	`55`	`},`
`56`	`56`	`"devDependencies": {`
`57`	`57`	`"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",`
`60`	`60`	`"babel-preset-es2015": "^6.24.1",`
`61`	`61`	`"benchmark": "^2.1.4",`
`62`		`- "coveralls": "^3.0.0",`
	`62`	`+ "coveralls": "^3.0.2",`
`63`	`63`	`"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",`
`68`	`68`	`"rimraf": "^2.6.2",`
`69`	`69`	`"size-limit": "^0.18.3"`
`70`	`70`	`},`

`‎src/mediaquery.js`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -139,15 +139,15 @@ function toPx(length) {`
`139`	`139`	`case "rem":`
`140`	`140`	`return value * 16;`
`141`	`141`	`case "cm":`
`142`		`- return value * 96 / 2.54;`
	`142`	`+ return (value * 96) / 2.54;`
`143`	`143`	`case "mm":`
`144`		`- return value * 96 / 2.54 / 10;`
	`144`	`+ return (value * 96) / 2.54 / 10;`
`145`	`145`	`case "in":`
`146`	`146`	`return value * 96;`
`147`	`147`	`case "pt":`
`148`	`148`	`return value * 72;`
`149`	`149`	`case "pc":`
`150`		`- return value * 72 / 12;`
	`150`	`+ return (value * 72) / 12;`
`151`	`151`	`default:`
`152`	`152`	`return value;`
`153`	`153`	`}`

0 commit comments

Comments

(0)