dep updates (fe)
parent
6bc6e6ffec
commit
2ad20ea54d
|
@ -1,6 +1,5 @@
|
||||||
import { noop } from "lodash";
|
import { noop } from "lodash";
|
||||||
import { Everything } from "../interfaces";
|
import { Everything } from "../interfaces";
|
||||||
import { peripherals as Peripheral } from "./fake_state/peripherals";
|
|
||||||
import { auth } from "./fake_state/token";
|
import { auth } from "./fake_state/token";
|
||||||
import { bot } from "./fake_state/bot";
|
import { bot } from "./fake_state/bot";
|
||||||
import { config } from "./fake_state/config";
|
import { config } from "./fake_state/config";
|
||||||
|
@ -11,7 +10,6 @@ import { resources } from "./fake_state/resources";
|
||||||
export function fakeState(_: Function = noop): Everything {
|
export function fakeState(_: Function = noop): Everything {
|
||||||
return {
|
return {
|
||||||
dispatch: jest.fn(),
|
dispatch: jest.fn(),
|
||||||
Peripheral,
|
|
||||||
auth,
|
auth,
|
||||||
bot,
|
bot,
|
||||||
config,
|
config,
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
import { Everything } from "../../interfaces";
|
|
||||||
|
|
||||||
export const peripherals: Everything["Peripheral"] = {
|
|
||||||
"isEditing": true
|
|
||||||
};
|
|
|
@ -3,7 +3,6 @@ import { ConfigState } from "./config/interfaces";
|
||||||
import { BotState } from "./devices/interfaces";
|
import { BotState } from "./devices/interfaces";
|
||||||
import { Color as FarmBotJsColor } from "farmbot";
|
import { Color as FarmBotJsColor } from "farmbot";
|
||||||
import { DraggableState } from "./draggable/interfaces";
|
import { DraggableState } from "./draggable/interfaces";
|
||||||
import { PeripheralState } from "./controls/peripherals/interfaces";
|
|
||||||
import { RestResources } from "./resources/interfaces";
|
import { RestResources } from "./resources/interfaces";
|
||||||
|
|
||||||
/** Regimens and sequences may have a "color" which determines how it looks
|
/** Regimens and sequences may have a "color" which determines how it looks
|
||||||
|
@ -16,7 +15,6 @@ export interface Everything {
|
||||||
dispatch: Function;
|
dispatch: Function;
|
||||||
bot: BotState;
|
bot: BotState;
|
||||||
draggable: DraggableState;
|
draggable: DraggableState;
|
||||||
Peripheral: PeripheralState;
|
|
||||||
resources: RestResources;
|
resources: RestResources;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { Everything } from "../interfaces";
|
import { Everything } from "../interfaces";
|
||||||
import { Store as ReduxStore } from "redux";
|
import { Store as ReduxStore, Reducer, AnyAction } from "redux";
|
||||||
import { Actions } from "../constants";
|
import { Actions } from "../constants";
|
||||||
|
|
||||||
export type Store = ReduxStore<Everything>;
|
export type Store = ReduxStore<Everything>;
|
||||||
|
@ -18,3 +18,5 @@ export interface Thunk {
|
||||||
}
|
}
|
||||||
|
|
||||||
export type EnvName = "test" | "production" | "development" | "*";
|
export type EnvName = "test" | "production" | "development" | "*";
|
||||||
|
|
||||||
|
export type Reducers = Reducer<Omit<Everything, "dispatch">, AnyAction>;
|
||||||
|
|
|
@ -3,18 +3,18 @@ import { botReducer as bot } from "../devices/reducer";
|
||||||
import { configReducer as config } from "../config/reducer";
|
import { configReducer as config } from "../config/reducer";
|
||||||
import { draggableReducer as draggable } from "../draggable/reducer";
|
import { draggableReducer as draggable } from "../draggable/reducer";
|
||||||
import { combineReducers } from "redux";
|
import { combineReducers } from "redux";
|
||||||
import { ReduxAction } from "./interfaces";
|
import { ReduxAction, Reducers } from "./interfaces";
|
||||||
import { Session } from "../session";
|
import { Session } from "../session";
|
||||||
import { resourceReducer as resources } from "../resources/reducer";
|
import { resourceReducer as resources } from "../resources/reducer";
|
||||||
import { Everything } from "../interfaces";
|
import { Everything } from "../interfaces";
|
||||||
import { Actions } from "../constants";
|
import { Actions } from "../constants";
|
||||||
|
|
||||||
export const reducers = combineReducers({
|
export const reducers: Reducers = combineReducers({
|
||||||
auth,
|
auth,
|
||||||
bot,
|
bot,
|
||||||
config,
|
config,
|
||||||
draggable,
|
draggable,
|
||||||
resources
|
resources,
|
||||||
});
|
});
|
||||||
|
|
||||||
/** This is the topmost reducer in the application. If you need to preempt a
|
/** This is the topmost reducer in the application. If you need to preempt a
|
||||||
|
|
22
package.json
22
package.json
|
@ -24,18 +24,18 @@
|
||||||
"author": "farmbot.io",
|
"author": "farmbot.io",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/core": "7.7.5",
|
"@babel/core": "7.7.7",
|
||||||
"@blueprintjs/core": "3.22.2",
|
"@blueprintjs/core": "3.22.3",
|
||||||
"@blueprintjs/datetime": "3.15.1",
|
"@blueprintjs/datetime": "3.15.1",
|
||||||
"@blueprintjs/select": "3.11.2",
|
"@blueprintjs/select": "3.11.2",
|
||||||
"@types/enzyme": "3.10.4",
|
"@types/enzyme": "3.10.4",
|
||||||
"@types/jest": "24.0.23",
|
"@types/jest": "24.0.25",
|
||||||
"@types/lodash": "4.14.149",
|
"@types/lodash": "4.14.149",
|
||||||
"@types/markdown-it": "0.0.9",
|
"@types/markdown-it": "0.0.9",
|
||||||
"@types/moxios": "0.4.9",
|
"@types/moxios": "0.4.9",
|
||||||
"@types/node": "12.12.17",
|
"@types/node": "13.1.1",
|
||||||
"@types/promise-timeout": "1.3.0",
|
"@types/promise-timeout": "1.3.0",
|
||||||
"@types/react": "16.9.16",
|
"@types/react": "16.9.17",
|
||||||
"@types/react-color": "3.0.1",
|
"@types/react-color": "3.0.1",
|
||||||
"@types/react-dom": "16.9.4",
|
"@types/react-dom": "16.9.4",
|
||||||
"@types/react-redux": "7.1.5",
|
"@types/react-redux": "7.1.5",
|
||||||
|
@ -43,8 +43,8 @@
|
||||||
"boxed_value": "1.0.0",
|
"boxed_value": "1.0.0",
|
||||||
"browser-speech": "1.1.1",
|
"browser-speech": "1.1.1",
|
||||||
"coveralls": "3.0.9",
|
"coveralls": "3.0.9",
|
||||||
"enzyme": "3.10.0",
|
"enzyme": "3.11.0",
|
||||||
"enzyme-adapter-react-16": "1.15.1",
|
"enzyme-adapter-react-16": "1.15.2",
|
||||||
"farmbot": "9.0.1-rc0",
|
"farmbot": "9.0.1-rc0",
|
||||||
"i18next": "19.0.2",
|
"i18next": "19.0.2",
|
||||||
"install": "0.13.0",
|
"install": "0.13.0",
|
||||||
|
@ -62,20 +62,20 @@
|
||||||
"react-addons-test-utils": "15.6.2",
|
"react-addons-test-utils": "15.6.2",
|
||||||
"react-color": "2.17.3",
|
"react-color": "2.17.3",
|
||||||
"react-dom": "16.12.0",
|
"react-dom": "16.12.0",
|
||||||
"react-joyride": "2.1.1",
|
"react-joyride": "2.2.1",
|
||||||
"react-redux": "7.1.3",
|
"react-redux": "7.1.3",
|
||||||
"react-test-renderer": "16.12.0",
|
"react-test-renderer": "16.12.0",
|
||||||
"react-transition-group": "4.3.0",
|
"react-transition-group": "4.3.0",
|
||||||
"redux": "4.0.4",
|
"redux": "4.0.5",
|
||||||
"redux-immutable-state-invariant": "2.1.0",
|
"redux-immutable-state-invariant": "2.1.0",
|
||||||
"redux-thunk": "2.3.0",
|
"redux-thunk": "2.3.0",
|
||||||
"sass": "1.23.7",
|
"sass": "1.24.0",
|
||||||
"sass-lint": "1.13.1",
|
"sass-lint": "1.13.1",
|
||||||
"takeme": "0.11.3",
|
"takeme": "0.11.3",
|
||||||
"ts-jest": "24.2.0",
|
"ts-jest": "24.2.0",
|
||||||
"ts-lint": "4.5.1",
|
"ts-lint": "4.5.1",
|
||||||
"tslint": "5.20.1",
|
"tslint": "5.20.1",
|
||||||
"typescript": "3.7.3",
|
"typescript": "3.7.4",
|
||||||
"which": "2.0.2"
|
"which": "2.0.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
Loading…
Reference in New Issue