From 2ad20ea54d9f7f24e894c730cc362ec5683f51d0 Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Fri, 27 Dec 2019 12:58:44 -0800 Subject: [PATCH] dep updates (fe) --- frontend/__test_support__/fake_state.ts | 2 -- .../fake_state/peripherals.ts | 5 ----- frontend/interfaces.ts | 2 -- frontend/redux/interfaces.ts | 4 +++- frontend/redux/root_reducer.ts | 6 ++--- package.json | 22 +++++++++---------- 6 files changed, 17 insertions(+), 24 deletions(-) delete mode 100644 frontend/__test_support__/fake_state/peripherals.ts diff --git a/frontend/__test_support__/fake_state.ts b/frontend/__test_support__/fake_state.ts index 2f7883b3e..c398eddf7 100644 --- a/frontend/__test_support__/fake_state.ts +++ b/frontend/__test_support__/fake_state.ts @@ -1,6 +1,5 @@ import { noop } from "lodash"; import { Everything } from "../interfaces"; -import { peripherals as Peripheral } from "./fake_state/peripherals"; import { auth } from "./fake_state/token"; import { bot } from "./fake_state/bot"; import { config } from "./fake_state/config"; @@ -11,7 +10,6 @@ import { resources } from "./fake_state/resources"; export function fakeState(_: Function = noop): Everything { return { dispatch: jest.fn(), - Peripheral, auth, bot, config, diff --git a/frontend/__test_support__/fake_state/peripherals.ts b/frontend/__test_support__/fake_state/peripherals.ts deleted file mode 100644 index 43be291df..000000000 --- a/frontend/__test_support__/fake_state/peripherals.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { Everything } from "../../interfaces"; - -export const peripherals: Everything["Peripheral"] = { - "isEditing": true -}; diff --git a/frontend/interfaces.ts b/frontend/interfaces.ts index 9b298f6de..ce6a57604 100644 --- a/frontend/interfaces.ts +++ b/frontend/interfaces.ts @@ -3,7 +3,6 @@ import { ConfigState } from "./config/interfaces"; import { BotState } from "./devices/interfaces"; import { Color as FarmBotJsColor } from "farmbot"; import { DraggableState } from "./draggable/interfaces"; -import { PeripheralState } from "./controls/peripherals/interfaces"; import { RestResources } from "./resources/interfaces"; /** Regimens and sequences may have a "color" which determines how it looks @@ -16,7 +15,6 @@ export interface Everything { dispatch: Function; bot: BotState; draggable: DraggableState; - Peripheral: PeripheralState; resources: RestResources; } diff --git a/frontend/redux/interfaces.ts b/frontend/redux/interfaces.ts index 49860594f..6c10ca58a 100644 --- a/frontend/redux/interfaces.ts +++ b/frontend/redux/interfaces.ts @@ -1,5 +1,5 @@ import { Everything } from "../interfaces"; -import { Store as ReduxStore } from "redux"; +import { Store as ReduxStore, Reducer, AnyAction } from "redux"; import { Actions } from "../constants"; export type Store = ReduxStore; @@ -18,3 +18,5 @@ export interface Thunk { } export type EnvName = "test" | "production" | "development" | "*"; + +export type Reducers = Reducer, AnyAction>; diff --git a/frontend/redux/root_reducer.ts b/frontend/redux/root_reducer.ts index 74b22a4db..00879bc9a 100644 --- a/frontend/redux/root_reducer.ts +++ b/frontend/redux/root_reducer.ts @@ -3,18 +3,18 @@ import { botReducer as bot } from "../devices/reducer"; import { configReducer as config } from "../config/reducer"; import { draggableReducer as draggable } from "../draggable/reducer"; import { combineReducers } from "redux"; -import { ReduxAction } from "./interfaces"; +import { ReduxAction, Reducers } from "./interfaces"; import { Session } from "../session"; import { resourceReducer as resources } from "../resources/reducer"; import { Everything } from "../interfaces"; import { Actions } from "../constants"; -export const reducers = combineReducers({ +export const reducers: Reducers = combineReducers({ auth, bot, config, draggable, - resources + resources, }); /** This is the topmost reducer in the application. If you need to preempt a diff --git a/package.json b/package.json index 92e19cbb2..1e1904595 100644 --- a/package.json +++ b/package.json @@ -24,18 +24,18 @@ "author": "farmbot.io", "license": "MIT", "dependencies": { - "@babel/core": "7.7.5", - "@blueprintjs/core": "3.22.2", + "@babel/core": "7.7.7", + "@blueprintjs/core": "3.22.3", "@blueprintjs/datetime": "3.15.1", "@blueprintjs/select": "3.11.2", "@types/enzyme": "3.10.4", - "@types/jest": "24.0.23", + "@types/jest": "24.0.25", "@types/lodash": "4.14.149", "@types/markdown-it": "0.0.9", "@types/moxios": "0.4.9", - "@types/node": "12.12.17", + "@types/node": "13.1.1", "@types/promise-timeout": "1.3.0", - "@types/react": "16.9.16", + "@types/react": "16.9.17", "@types/react-color": "3.0.1", "@types/react-dom": "16.9.4", "@types/react-redux": "7.1.5", @@ -43,8 +43,8 @@ "boxed_value": "1.0.0", "browser-speech": "1.1.1", "coveralls": "3.0.9", - "enzyme": "3.10.0", - "enzyme-adapter-react-16": "1.15.1", + "enzyme": "3.11.0", + "enzyme-adapter-react-16": "1.15.2", "farmbot": "9.0.1-rc0", "i18next": "19.0.2", "install": "0.13.0", @@ -62,20 +62,20 @@ "react-addons-test-utils": "15.6.2", "react-color": "2.17.3", "react-dom": "16.12.0", - "react-joyride": "2.1.1", + "react-joyride": "2.2.1", "react-redux": "7.1.3", "react-test-renderer": "16.12.0", "react-transition-group": "4.3.0", - "redux": "4.0.4", + "redux": "4.0.5", "redux-immutable-state-invariant": "2.1.0", "redux-thunk": "2.3.0", - "sass": "1.23.7", + "sass": "1.24.0", "sass-lint": "1.13.1", "takeme": "0.11.3", "ts-jest": "24.2.0", "ts-lint": "4.5.1", "tslint": "5.20.1", - "typescript": "3.7.3", + "typescript": "3.7.4", "which": "2.0.2" }, "devDependencies": {