From 9bfda72a55e72c99c3177952fbf891d766f3e210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 28 Sep 2017 13:06:23 +0200
Subject: [PATCH] tech: reverted to systemjs

---
 package.json                                              | 2 +-
 .../datasource/elasticsearch/specs/query_def_specs.ts     | 2 +-
 yarn.lock                                                 | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 77d234e6f92..00c5e85e9c5 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "phantomjs-prebuilt": "^2.1.15",
     "rxjs": "^5.4.3",
     "sass-lint": "^1.10.2",
-    "systemjs": "0.20.19"
+    "systemjs": "0.19.41"
   },
   "scripts": {
     "build": "./node_modules/grunt-cli/bin/grunt",
diff --git a/public/app/plugins/datasource/elasticsearch/specs/query_def_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/query_def_specs.ts
index e89c9774769..d46fc1aa933 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/query_def_specs.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/query_def_specs.ts
@@ -1,7 +1,7 @@
 
 import {describe, it, expect} from 'test/lib/common';
 
-import queryDef from '../query_def';
+import * as queryDef from '../query_def';
 
 describe('ElasticQueryDef', function() {
 
diff --git a/yarn.lock b/yarn.lock
index f5105d40f03..a6867bfc18b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4448,9 +4448,11 @@ systemjs-builder@^0.16.10:
     traceur "0.0.105"
     uglify-js "^2.6.1"
 
-systemjs@0.20.19:
-  version "0.20.19"
-  resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.20.19.tgz#c2b9e79c19f4bea53a19b1ed3f974ffb463be949"
+systemjs@0.19.41:
+  version "0.19.41"
+  resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.19.41.tgz#835d2c0f10bf403b551fedc875f84bb44a02c4eb"
+  dependencies:
+    when "^3.7.5"
 
 systemjs@^0.19.46:
   version "0.19.47"