Fix breaking changes

This commit is contained in:
Jerko Steiner 2018-12-11 19:31:41 +01:00
parent 50ced279e5
commit d8ec33a22f
5 changed files with 1003 additions and 650 deletions

View File

@ -6,7 +6,8 @@
"jsx-quotes": ["error", "prefer-double"],
"padded-blocks": 0,
"import/first": 0,
"no-return-assign": 0
"no-return-assign": 0,
"indent": ["error", 2, { "MemberExpression": 0, "SwitchCase": 1, "flatTernaryExpressions": true }],
},
"globals": {
"expect": true,

1610
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -27,13 +27,23 @@
},
"babel": {
"presets": [
"es2015",
"es2016",
"react"
[
"@babel/preset-env",
{
"targets": {
"browsers": [
"last 2 versions",
"safari >= 7",
"ie >= 11"
]
}
}
],
"@babel/preset-react"
],
"plugins": [
"transform-object-rest-spread",
"transform-class-properties"
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-object-rest-spread"
]
},
"author": "Jerko Steiner",
@ -48,7 +58,7 @@
"react": "^16.6.3",
"react-dom": "^16.6.3",
"react-redux": "^6.0.0",
"react-transition-group": "^2.5.1",
"react-transition-group": "^1.2.1",
"redux": "^4.0.1",
"redux-logger": "^3.0.6",
"redux-promise-middleware": "^5.1.1",
@ -62,13 +72,14 @@
"uuid": "^3.3.2"
},
"devDependencies": {
"@babel/core": "^7.2.0",
"@babel/plugin-proposal-class-properties": "^7.2.1",
"@babel/plugin-proposal-object-rest-spread": "^7.2.0",
"@babel/preset-env": "^7.2.0",
"@babel/preset-react": "^7.0.0",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.6.0",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "^6.23.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-es2016": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babelify": "^10.0.0",
"chastifol": "^4.1.0",
"eslint": "^5.10.0",
@ -82,7 +93,6 @@
"jest-cli": "^23.6.0",
"node-sass": "^4.11.0",
"nodemon": "^1.18.8",
"react-addons-test-utils": "^15.5.1",
"redux-mock-store": "^1.2.3",
"supertest": "^3.0.0",
"uglify-js": "^3.4.9",

View File

@ -18,8 +18,8 @@ export class MediaStream {
}
export function getUserMedia () {
return !getUserMedia.shouldFail
? Promise.resolve(getUserMedia.stream)
: Promise.reject(new Error('test'))
? Promise.resolve(getUserMedia.stream)
: Promise.reject(new Error('test'))
}
getUserMedia.fail = shouldFail => getUserMedia.shouldFail = shouldFail
getUserMedia.stream = new MediaStream()

View File

@ -1,7 +1,7 @@
import CSSTransitionGroup from 'react-transition-group/CSSTransitionGroup'
import PropTypes from 'prop-types'
import React from 'react'
import classnames from 'classnames'
import { CSSTransitionGroup } from 'react-transition-group'
export const NotificationPropTypes = PropTypes.shape({
id: PropTypes.string.isRequired,