Merge commit '14611a8659a34376060c98aa94c1410def8e17c6' into merge-0.…

…20.0

packages/app/app/js/config/jquery.coffee

@@ -1,6 +1,6 @@
-do ($, _) ->
+$ = require("jquery")
 
-  $.expr.cacheLength = 1
+$.expr.cacheLength = 1
 
-  $.ajaxSetup
-    cache: false
+$.ajaxSetup
+  cache: false

packages/app/app/js/config/lodash.coffee

@@ -0,0 +1,13 @@
+_ = require("lodash")
+
+inflection = require("underscore.inflection")(_)
+
+## only export exactly what we need, nothing more!
+_.mixin({
+  clean:      require("underscore.string/clean")
+  count:      require("underscore.string/count")
+  isBlank:    require("underscore.string/isBlank")
+  toBoolean:  require("underscore.string/toBoolean")
+  capitalize: require("underscore.string/capitalize") ## its mo' better the lodash version
+  ordinalize: inflection.ordinalize
+})

packages/app/app/js/config/moment.coffee

@@ -1,17 +1,19 @@
-moment.locale('en', {
-    relativeTime : {
-        future: "in %s",
-        past:   "%s ago",
-        s:  "s",
-        m:  "1m",
-        mm: "%dm",
-        h:  "1h",
-        hh: "%dh",
-        d:  "1d",
-        dd: "%dd",
-        M:  "1mo",
-        MM: "%dmo",
-        y:  "1y",
-        yy: "%dy"
-    }
-});
+moment = require("moment")
+
+moment.locale("en", {
+  relativeTime: {
+      future: "in %s",
+      past:   "%s ago",
+      s:  "s",
+      m:  "1m",
+      mm: "%dm",
+      h:  "1h",
+      hh: "%dh",
+      d:  "1d",
+      dd: "%dd",
+      M:  "1mo",
+      MM: "%dmo",
+      y:  "1y",
+      yy: "%dy"
+  }
+})

packages/app/app/js/driver/commands_old/confirm.coffee

@@ -1,9 +1,10 @@
 do (Cypress, _) ->
 
-  Cypress.addParentCommand
+  Commands.addAll({
 
     ## allow the user to choose whether the confirmation
     ## message returns true or false.  need to patch
     ## window.confirm and store the last confirm message
     ## so we can async respond to it?
-    confirm: (bool = true) ->
+    confirm: (bool = true) ->
+  })