🏀

package.json

@@ -34,11 +34,11 @@
     "@types/handlebars": "^4.0.33",
     "@types/history": "^2.0.39",
     "@types/i18next": "^2.3.32",
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/lodash": "^4.14.67",
-    "@types/markdown-it": "0.0.1",
-    "@types/mqtt": "0.0.32",
-    "@types/node": "^6.0.63",
+    "@types/markdown-it": "^0.0.2",
+    "@types/mqtt": "^0.0.34",
+    "@types/node": "^8.0.6",
     "@types/react": "^15.0.33",
     "@types/react-color": "^2.11.4",
     "@types/react-dom": "^0.14.18",
@@ -50,45 +50,45 @@
     "coveralls": "^2.13.0",
     "css-loader": "^0.25.0",
     "deep-freeze": "^0.0.1",
-    "enzyme": "^2.8.1",
+    "enzyme": "^2.9.1",
     "extract-text-webpack-plugin": "^2.0.0-beta.5",
     "farmbot": "4.0.7",
     "farmbot-toastr": "^1.0.2",
     "fastclick": "^1.0.6",
     "file-loader": "^0.10.0",
-    "handlebars": "^4.0.5",
+    "handlebars": "^4.0.10",
     "i18next": "^3.4.3",
     "imports-loader": "^0.7.0",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "json-loader": "^0.5.4",
     "lodash": "^3.10.1",
     "markdown-it": "^8.2.1",
-    "markdown-it-emoji": "^1.3.0",
-    "moment": "2.15.2",
-    "node-sass": "^3.10.0",
+    "markdown-it-emoji": "^1.4.0",
+    "moment": "^2.18.1",
+    "node-sass": "^4.5.3",
     "optimize-css-assets-webpack-plugin": "^1.3.0",
-    "react": "^15.5.4",
+    "react": "^15.6.1",
     "react-addons-css-transition-group": "^15.6.0",
-    "react-addons-test-utils": "^15.5.1",
-    "react-color": "^2.11.1",
+    "react-addons-test-utils": "^15.6.0",
+    "react-color": "^2.13.0",
     "react-dom": "^15.5.4",
     "react-redux": "^4.4.1",
     "react-router": "^3.0.0",
-    "react-test-renderer": "^15.5.4",
+    "react-test-renderer": "^15.6.1",
     "redux": "^3.3.1",
     "redux-immutable-state-invariant": "^1.2.3",
     "redux-thunk": "^2.0.1",
     "sass-loader": "^4.0.2",
     "style-loader": "^0.13.0",
-    "ts-jest": "^19.0.9",
+    "ts-jest": "^20.0.6",
     "ts-loader": "^2.2.1",
-    "tslint": "4.5.1",
+    "tslint": "^5.4.3",
     "typescript": "^2.4.1",
     "url-loader": "^0.5.7",
     "webpack": "^2.2.0-rc.3",
     "webpack-uglify-js-plugin": "^1.1.9",
     "weinre": "^2.0.0-pre-I0Z7U9OV",
-    "yarn": "^0.23.4"
+    "yarn": "^0.24.5"
   },
   "devDependencies": {
     "jscpd": "^0.6.10",
@@ -108,7 +108,7 @@
       "tsx",
       "js"
     ],
-    "testResultsProcessor": "<rootDir>/node_modules/ts-jest/coverageprocessor.js",
+    "mapCoverage": true,
     "collectCoverage": true,
     "collectCoverageFrom": [
       "src/**/*.{ts,tsx}"

src/entry.tsx

@@ -9,16 +9,19 @@ import "./npm_addons";
 import { stopIE, attachToRoot } from "./util";
 
 stopIE();
-
+interface DebugStuff {
+  ip_address: string;
+}
 let r = (process.env.REVISION as string) || "REVISION INFO NOT AVAILABLE";
 console.log(r);
 
 /** For external device debugging purposes
  * See https://github.com/FarmBot/farmbot-web-frontend for details. */
-if (process.env.CONFIG
-  && process.env.CONFIG.ip_address
+let hmm = process.env.CONFIG as DebugStuff | undefined;
+if (hmm
+  && hmm.ip_address
   && process.env.NODE_ENV !== "production") {
-  let ip = process.env.CONFIG.ip_address;
+  let ip = hmm.ip_address;
   let script = document.createElement("script");
   script.src = `http://${ip}:8081/target/target-script-min.js#anonymous`;
   document.body.appendChild(script);

src/farm_designer/farm_events/calendar/selectors.ts

@@ -52,17 +52,17 @@ export function joinFarmEventsToExecutable(input: ResourceIndex): FarmEventWithE
   }));
 }
 
-function regimenCalendarItem(input: FarmEventWithRegimen):
-  NewCalendarItem {
-  let time = moment(input);
-  return {
-    dayOfMonth: time.day(),
-    month: time.format("MMM"),
-    executable_id: input.executable_id,
-    executable_type: input.executable_type,
-    farm_event_id: input.id || -1,
-    label: input.executable.name,
-    sortKey: time.unix(),
-    timeStr: time.format("hh mm dd yy")
-  };
-};
+// function regimenCalendarItem(input: FarmEventWithRegimen):
+//   NewCalendarItem {
+//   let time = moment(input as any);
+//   return {
+//     dayOfMonth: time.day(),
+//     month: time.format("MMM"),
+//     executable_id: input.executable_id,
+//     executable_type: input.executable_type,
+//     farm_event_id: input.id || -1,
+//     label: input.executable.name,
+//     sortKey: time.unix(),
+//     timeStr: time.format("hh mm dd yy")
+//   };
+// }

src/npm_addons.tsx

@@ -3,8 +3,8 @@
 // to load non-opensource tools, such as RollBar error reporting.
 declare var SHORT_REVISION: string;
 // Global variable so that the NPM_ADDON knows the version number of the FE.
-SHORT_REVISION = process.env.SHORT_REVISION;
+SHORT_REVISION = process.env.SHORT_REVISION || "";
 
 if (process.env.NPM_ADDON) {
-  require(process.env.NPM_ADDON);
+  require(process.env.NPM_ADDON as string);
 }