diff --git a/public/app/core/jquery_extended.js b/public/app/core/jquery_extended.js
deleted file mode 100644
index 449afcf2019..00000000000
--- a/public/app/core/jquery_extended.js
+++ /dev/null
@@ -1,44 +0,0 @@
-define(['jquery', 'angular', 'lodash'],
-function ($, angular, _) {
-  'use strict';
-
-  var $win = $(window);
-
-  $.fn.place_tt = (function () {
-    var defaults = {
-      offset: 5,
-    };
-
-    return function (x, y, opts) {
-      opts = $.extend(true, {}, defaults, opts);
-
-      return this.each(function () {
-        var $tooltip = $(this), width, height;
-
-        $tooltip.addClass('grafana-tooltip');
-
-        $("#tooltip").remove();
-        $tooltip.appendTo(document.body);
-
-        if (opts.compile) {
-          angular.element(document).injector().invoke(["$compile", "$rootScope", function($compile, $rootScope) {
-            var tmpScope = $rootScope.$new(true);
-            _.extend(tmpScope, opts.scopeData);
-
-            $compile($tooltip)(tmpScope);
-            tmpScope.$digest();
-            tmpScope.$destroy();
-          }]);
-        }
-
-        width = $tooltip.outerWidth(true);
-        height = $tooltip.outerHeight(true);
-
-        $tooltip.css('left', x + opts.offset + width > $win.width() ? x - opts.offset - width : x + opts.offset);
-        $tooltip.css('top', y + opts.offset + height > $win.height() ? y - opts.offset - height : y + opts.offset);
-      });
-    };
-  })();
-
-  return $;
-});
diff --git a/public/app/core/jquery_extended.ts b/public/app/core/jquery_extended.ts
new file mode 100644
index 00000000000..7932d495ab0
--- /dev/null
+++ b/public/app/core/jquery_extended.ts
@@ -0,0 +1,50 @@
+import $ from 'jquery';
+import angular from 'angular';
+import _ from 'lodash';
+
+var $win = $(window);
+
+$.fn.place_tt = (function() {
+  var defaults = {
+    offset: 5,
+  };
+
+  return function(x, y, opts) {
+    opts = $.extend(true, {}, defaults, opts);
+
+    return this.each(function() {
+      var $tooltip = $(this),
+        width,
+        height;
+
+      $tooltip.addClass('grafana-tooltip');
+
+      $('#tooltip').remove();
+      $tooltip.appendTo(document.body);
+
+      if (opts.compile) {
+        angular
+          .element(document)
+          .injector()
+          .invoke([
+            '$compile',
+            '$rootScope',
+            function($compile, $rootScope) {
+              var tmpScope = $rootScope.$new(true);
+              _.extend(tmpScope, opts.scopeData);
+
+              $compile($tooltip)(tmpScope);
+              tmpScope.$digest();
+              tmpScope.$destroy();
+            },
+          ]);
+      }
+
+      width = $tooltip.outerWidth(true);
+      height = $tooltip.outerHeight(true);
+
+      $tooltip.css('left', x + opts.offset + width > $win.width() ? x - opts.offset - width : x + opts.offset);
+      $tooltip.css('top', y + opts.offset + height > $win.height() ? y - opts.offset - height : y + opts.offset);
+    });
+  };
+})();
diff --git a/public/app/core/lodash_extended.js b/public/app/core/lodash_extended.js
deleted file mode 100644
index 6487b19193e..00000000000
--- a/public/app/core/lodash_extended.js
+++ /dev/null
@@ -1,32 +0,0 @@
-define([
-  'lodash-src'
-],
-function () {
-  'use strict';
-
-  var _ = window._;
-
-  /*
-    Mixins :)
-  */
-  _.mixin({
-    move: function (array, fromIndex, toIndex) {
-      array.splice(toIndex, 0, array.splice(fromIndex, 1)[0]);
-      return array;
-    },
-    // If variable is value, then return alt. If variable is anything else, return value;
-    toggle: function (variable, value, alt) {
-      return variable === value ? alt : value;
-    },
-    toggleInOut: function(array,value) {
-      if(_.includes(array,value)) {
-        array = _.without(array,value);
-      } else {
-        array.push(value);
-      }
-      return array;
-    }
-  });
-
-  return _;
-});
diff --git a/public/app/core/lodash_extended.ts b/public/app/core/lodash_extended.ts
new file mode 100644
index 00000000000..1a8820fb0db
--- /dev/null
+++ b/public/app/core/lodash_extended.ts
@@ -0,0 +1,11 @@
+import _ from 'lodash';
+
+/*
+  Mixins :)
+*/
+_.mixin({
+  move: function(array, fromIndex, toIndex) {
+    array.splice(toIndex, 0, array.splice(fromIndex, 1)[0]);
+    return array;
+  },
+});