From b51b681400cbaa15f7783ed3094954400812d8ff Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Mon, 13 Nov 2017 13:48:48 +0100
Subject: [PATCH] build: fixes build and jest tests on Windows

Fixes #9790
---
 jest.config.js |  9 +++++++--
 package.json   | 12 ++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index cbf4928f926..cbe77c4e30f 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,10 +1,15 @@
 
 module.exports = {
-  verbose: false,
+  verbose: true,
+  "globals": {
+    "ts-jest": {
+      "tsConfigFile": "tsconfig.json"
+    }
+  },
   "transform": {
     "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
   },
-  "moduleDirectories": ["<rootDir>/node_modules", "<rootDir>/public"],
+  "moduleDirectories": ["node_modules", "public"],
   "roots": [
     "<rootDir>/public"
   ],
diff --git a/package.json b/package.json
index 93edfbff2c5..9a6edfb8be9 100644
--- a/package.json
+++ b/package.json
@@ -95,12 +95,12 @@
     "zone.js": "^0.7.2"
   },
   "scripts": {
-    "dev": "node ./node_modules/.bin/webpack --progress --colors --config scripts/webpack/webpack.dev.js",
-    "watch": "node ./node_modules/.bin/webpack --progress --colors --watch --config scripts/webpack/webpack.dev.js",
-    "build": "node ./node_modules/.bin/grunt build",
-    "test": "node ./node_modules/.bin/grunt test",
-    "test:coverage": "node ./node_modules/.bin/grunt test --coverage=true",
-    "lint": "node ./node_modules/.bin/tslint -c tslint.json --project tsconfig.json --type-check",
+    "dev": "webpack --progress --colors --config scripts/webpack/webpack.dev.js",
+    "watch": "webpack --progress --colors --watch --config scripts/webpack/webpack.dev.js",
+    "build": "grunt build",
+    "test": "grunt test",
+    "test:coverage": "grunt test --coverage=true",
+    "lint": "tslint -c tslint.json --project tsconfig.json --type-check",
     "karma": "node ./node_modules/grunt-cli/bin/grunt karma:dev",
     "jest": "node ./node_modules/jest-cli/bin/jest.js --notify --watch",
     "precommit": "node ./node_modules/grunt-cli/bin/grunt precommit"