Merge branch 'master' into backend

2020-01-16 12:21:22 +03:00
parent 3581a818fc 5b211d80a9
commit f7adf0e379
9 changed files with 486 additions and 425 deletions
--- a/webpack/webpack.base.conf.js
+++ b/webpack/webpack.base.conf.js
@@ -27,8 +27,8 @@ module.exports = {
  },
  externals: [
    // remove the line below if you don't want to use builtin versions
-    'jquery', 'lodash', 'moment', 'angular',
-    'react', 'react-dom', '@grafana/ui', '@grafana/runtime','@grafana/data',
+    'jquery', 'lodash', 'moment', 'angular', 'emotion',
+    'react', 'react-dom', '@grafana/ui', '@grafana/data',
    function (context, request, callback) {
      var prefix = 'grafana/';
      if (request.indexOf(prefix) === 0) {