spacecruft
/
Farmbot-Web-App
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Dependency hell

pull/442/head
Rick Carlino 2017-09-01 10:58:36 -05:00
parent 4d72c81454
commit 427abe10ca
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package.json
View File

@ -28,24 +28,24 @@
"dependencies": {
"@blueprintjs/core": "^1.25.1",
"@blueprintjs/datetime": "^1.20.0",
"@blueprintjs/labs": "^0.8.0",
"@blueprintjs/labs": "^0.4.0",
"@types/deep-freeze": "^0.1.1",
"@types/enzyme": "^2.8.6",
"@types/fastclick": "^1.0.28",
"@types/handlebars": "^4.0.35",
"@types/history": "^4.6.0",
"@types/i18next": "^8.4.2",
"@types/i18next": "^2.3.32",
"@types/jest": "^20.0.7",
"@types/lodash": "^4.14.73",
"@types/markdown-it": "^0.0.3",
"@types/markdown-it": "^0.0.2",
"@types/moxios": "^0.4.3",
"@types/mqtt": "^0.0.34",
"@types/node": "^8.0.24",
"@types/react": "16.0.5",
"@types/react": "15.0.39",
"@types/react-color": "^2.13.0",
"@types/react-dom": "^15.5.3",
"@types/react-redux": "^5.0.6",
"@types/react-router": "4",
"@types/react-redux": "^4.4.47",
"@types/react-router": "3",
"@types/redux": "^3.6.31",
"axios": "^0.16.2",
"boxed_value": "^1.0.0",
@ -53,13 +53,13 @@
"css-loader": "^0.28.5",
"deep-freeze": "^0.0.1",
"enzyme": "^2.9.1",
"extract-text-webpack-plugin": "^3.0.0",
"farmbot": "4.4.0",
"extract-text-webpack-plugin": "^2.1.2",
"farmbot": "4.3.10",
"farmbot-toastr": "^1.0.3",
"fastclick": "^1.0.6",
"file-loader": "^0.11.2",
"handlebars": "^4.0.10",
"i18next": "^9.0.0",
"i18next": "^8.4.3",
"imports-loader": "^0.7.0",
"jest": "^20.0.4",
"json-loader": "^0.5.7",
@ -69,14 +69,14 @@
"moment": "^2.18.1",
"moxios": "^0.4.0",
"node-sass": "^4.5.3",
"optimize-css-assets-webpack-plugin": "^3.1.1",
"optimize-css-assets-webpack-plugin": "^2.0.0",
"react": "^15.6.1",
"react-addons-css-transition-group": "^15.6.0",
"react-addons-test-utils": "^15.6.0",
"react-color": "^2.13.5",
"react-dom": "^15.6.1",
"react-redux": "^5.0.6",
"react-router": "^4.2.0",
"react-router": "^3.0.0",
"react-test-renderer": "^15.6.1",
"redux": "^3.7.2",
"redux-immutable-state-invariant": "^2.0.0",
@ -88,7 +88,7 @@
"ts-lint": "^4.5.1",
"ts-loader": "^2.3.3",
"tslint": "^5.7.0",
"typescript": "^2.5.2",
"typescript": "^2.4.2",
"url-loader": "^0.5.9",
"webpack": "^3.5.5",
"webpack-uglify-js-plugin": "^1.1.9",

3
webpack/constants.ts
View File

@ -78,6 +78,9 @@ export namespace ToolTips {
export const MAX_SPEED =
`Maximum travel speed after acceleration in motor steps per second.`;
export const HOME_SPEED =
`Maximum travel speed after acceleration in motor steps per second for homing.`;
export const MIN_SPEED =
`Minimum movement speed. Also used for homing, calibration, and movements
across home.`;

9
webpack/devices/components/hardware_settings/motors.tsx
View File

@ -53,7 +53,6 @@ export function Motors({ dispatch, bot }: MotorsProps) {
settingToggle("param_e_stop_on_mov_err", bot, undefined)} />
</Col>
</Row>
{/* Hmmm... */}
<NumericMCUInputGroup
name={t("Max Speed (steps/s)")}
tooltip={t(ToolTips.MAX_SPEED)}
@ -62,6 +61,14 @@ export function Motors({ dispatch, bot }: MotorsProps) {
z={"movement_max_spd_z"}
bot={bot}
dispatch={dispatch} />
<NumericMCUInputGroup
name={t("Homing Speed (steps/s)")}
tooltip={t(ToolTips.MAX_SPEED)}
x={"movement_home_spd_x"}
y={"movement_home_spd_y"}
z={"movement_home_spd_z"}
bot={bot}
dispatch={dispatch} />
<NumericMCUInputGroup
name={t("Minimum Speed (steps/s)")}
tooltip={t(ToolTips.MIN_SPEED)}

4
yarn.lock
View File

@ -5868,10 +5868,6 @@ typescript@^2.0.9, typescript@^2.3.4, typescript@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844"
typescript@^2.5.2:
version "2.5.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"
ua-parser-js@^0.7.9:
version "0.7.12"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"