diff --git a/package.json b/package.json index 686c3f6d..ee16814a 100644 --- a/package.json +++ b/package.json @@ -39,48 +39,45 @@ }, "dependencies": { "@types/hoist-non-react-statics": "^3.3.1", - "@types/react-redux": "^7.0.9", - "@types/react-select": "^2.0.19", + "@types/react-redux": "^7.1.4", + "@types/react-select": "^3.0.4", "casparcg-connection": "^4.7.0", "classnames": "^2.2.6", "emberplus": "https://github.com/olzzon/tv-automation-emberplus-connection.git", "osc": "2.3.1", - "react": "^16.8.6", - "react-dom": "^16.8.6", - "react-redux": "^7.0.3", - "react-select": "^3.0.3", - "redux": "^4.0.1", - "tv-automation-server-core-integration": "^1.1.0", - "typescript": "^3.5.1", - "webmidi": "^2.3.3" + "react": "^16.10.1", + "react-dom": "^16.10.1", + "react-redux": "^7.1.1", + "react-select": "^3.0.6", + "redux": "^4.0.4", + "typescript": "^3.6.3", + "webmidi": "^2.5.1" }, "devDependencies": { - "@babel/core": "^7.4.5", - "@babel/plugin-proposal-class-properties": "^7.4.4", - "@babel/plugin-proposal-object-rest-spread": "^7.4.4", + "@babel/core": "^7.6.2", + "@babel/plugin-proposal-class-properties": "^7.5.5", + "@babel/plugin-proposal-object-rest-spread": "^7.6.2", "@babel/plugin-syntax-object-rest-spread": "^7.2.0", - "@babel/preset-env": "^7.4.5", + "@babel/preset-env": "^7.6.2", "@babel/preset-react": "^7.0.0", - "@babel/preset-typescript": "^7.3.3", - "@types/react": "^16.8.19", - "@types/react-dom": "^16.8.4", + "@babel/preset-typescript": "^7.6.0", "babel-loader": "^8.0.6", "babili-webpack-plugin": "^0.1.2", - "css-loader": "^2.1.1", - "electron": "^4.1.5", - "electron-packager": "^13.1.1", - "file-loader": "^3.0.1", + "css-loader": "^3.2.0", + "electron": "^6.0.10", + "electron-packager": "^14.0.6", + "file-loader": "^4.2.0", "html-webpack-plugin": "^3.2.0", - "mini-css-extract-plugin": "^0.5.0", + "mini-css-extract-plugin": "^0.8.0", "postcss-cssnext": "^3.1.0", "postcss-import": "^12.0.1", "postcss-loader": "^3.0.0", - "postcss-nested": "^4.1.1", + "postcss-nested": "^4.1.2", "postcss-pxtorem": "^4.0.1", - "style-loader": "^0.23.1", - "ts-loader": "^6.0.1", - "webpack": "^4.32.2", - "webpack-cli": "^3.3.2", - "webpack-dev-server": "^3.4.1" + "style-loader": "^1.0.0", + "ts-loader": "^6.2.0", + "webpack": "^4.41.0", + "webpack-cli": "^3.3.9", + "webpack-dev-server": "^3.8.1" } } diff --git a/src/components/Channels.tsx b/src/components/Channels.tsx index 842944e9..a0c51918 100644 --- a/src/components/Channels.tsx +++ b/src/components/Channels.tsx @@ -69,7 +69,7 @@ class Channels extends React.Component { render() { return (
- {(typeof this.props.store.settings[0].showOptions === "number") ? + {(typeof this.props.store.settings[0].showOptions === 'number') ? : "" diff --git a/src/reducers/channelsReducer.ts b/src/reducers/channelsReducer.ts index c1a58707..e161294c 100644 --- a/src/reducers/channelsReducer.ts +++ b/src/reducers/channelsReducer.ts @@ -57,7 +57,7 @@ export const channels = ((state = defaultChannelsReducerState([1]), action: any) nextState[0].channel[action.channel].outputLevel = parseFloat(action.level); return nextState; case 'SET_VU_LEVEL': //channel: level: - if (typeof nextState[0].vuMeters[action.channel] != 'undefined') { + if (typeof nextState[0].vuMeters[action.channel] !== 'undefined') { nextState[0].vuMeters[action.channel].vuVal = parseFloat(action.level); } return nextState; diff --git a/src/reducers/fadersReducer.ts b/src/reducers/fadersReducer.ts index d5597504..c3fbdb54 100644 --- a/src/reducers/fadersReducer.ts +++ b/src/reducers/fadersReducer.ts @@ -59,7 +59,7 @@ export const faders = ((state = defaultFadersReducerState(1), action: any): Arra switch(action.type) { case 'SET_VU_LEVEL': //channel: level: - if (typeof nextState[0].vuMeters[action.channel] != 'undefined') { + if (typeof nextState[0].vuMeters[action.channel] !== 'undefined') { nextState[0].vuMeters[action.channel].vuVal = parseFloat(action.level); } return nextState; diff --git a/src/reducers/settingsReducer.ts b/src/reducers/settingsReducer.ts index a85a9558..a04fc839 100644 --- a/src/reducers/settingsReducer.ts +++ b/src/reducers/settingsReducer.ts @@ -60,7 +60,7 @@ export const settings = (state = defaultSettingsReducerState, action: any): Arra nextState[0].showSettings = !nextState[0].showSettings; return nextState; case 'TOGGLE_SHOW_OPTION': - nextState[0].showOptions = typeof nextState[0].showOptions === "number" ? false : action.channel; + nextState[0].showOptions = typeof nextState[0].showOptions === 'number' ? false : action.channel; return nextState; case 'TOGGLE_SHOW_SNAPS': nextState[0].showSnaps = !nextState[0].showSnaps; diff --git a/src/utils/QlClMixerConnection.ts b/src/utils/QlClMixerConnection.ts index e5457b10..14a30699 100644 --- a/src/utils/QlClMixerConnection.ts +++ b/src/utils/QlClMixerConnection.ts @@ -146,7 +146,7 @@ export class QlClMixerConnection { sendOutMessage(oscMessage: string, channelIndex: number, value: string | number, type: string) { let valueNumber: number - if (typeof(value) === 'string') { + if (typeof value === 'string') { value = parseFloat(value) }