From f402822cea393ccce94ed39b33d97ce56a8ab5c4 Mon Sep 17 00:00:00 2001
From: Matthew Gadd <mgadd@sitepen.com>
Date: Tue, 21 Aug 2018 17:05:58 +0100
Subject: [PATCH] use official istanbul instrumenter (#140)

---
 package-lock.json  | 16 ++++++++++++++++
 package.json       |  1 +
 src/test.config.ts |  4 ++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7119ad70..c278013b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2694,6 +2694,11 @@
       "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.2.tgz",
       "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ=="
     },
+    "convert-source-map": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz",
+      "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU="
+    },
     "cookie": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
@@ -6702,6 +6707,17 @@
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
+    "istanbul-instrumenter-loader": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
+      "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
+      "requires": {
+        "convert-source-map": "^1.5.0",
+        "istanbul-lib-instrument": "^1.7.3",
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^0.3.0"
+      }
+    },
     "istanbul-lib-coverage": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz",
diff --git a/package.json b/package.json
index 42814684..b22d409d 100644
--- a/package.json
+++ b/package.json
@@ -112,6 +112,7 @@
     "gzip-size": "4.1.0",
     "html-webpack-plugin": "3.2.0",
     "imports-loader": "0.7.1",
+    "istanbul-instrumenter-loader": "3.0.1",
     "json-css-module-loader": "1.0.2",
     "jsonfile": "4.0.0",
     "loader-utils": "1.1.0",
diff --git a/src/test.config.ts b/src/test.config.ts
index 852c2f97..c9f1bb65 100644
--- a/src/test.config.ts
+++ b/src/test.config.ts
@@ -65,8 +65,8 @@ function webpackConfig(args: any): webpack.Configuration {
 	module.rules.push({
 		test: /src[\\\/].*\.ts(x)?$/,
 		use: {
-			loader: '@dojo/webpack-contrib/istanbul-loader',
-			options: { instrumenterOptions }
+			loader: 'istanbul-instrumenter-loader',
+			options: instrumenterOptions
 		},
 		enforce: 'post'
 	});