Merge branch 'master' into feat/async-dispose

stryker-mutator · Jul 2, 2019 · 7cceddf · 7cceddf
2 parents bba9d3e + ff2ccfc
commit 7cceddf
Show file tree

Hide file tree

Showing 25 changed files with 17 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -35,8 +35,8 @@
     "sinon": "^7.2.0",
     "sinon-chai": "^3.2.0",
     "source-map-support": "^0.5.6",
-    "tslint": "~5.16.0",
-    "typescript": "~3.5.1"
+    "tslint": "~5.17.0",
+    "typescript": "~3.5.2"
   },
   "prettier": {
     "singleQuote": true

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "mutation-testing-report-schema": "^1.0.0",
-    "tslib": "~1.9.3"
+    "tslib": "~1.10.0"
   },
   "devDependencies": {
     "surrial": "~1.0.0",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -72,9 +72,9 @@
     "source-map": "~0.7.3",
     "surrial": "~1.0.0",
     "tree-kill": "~1.2.0",
-    "tslib": "~1.9.3",
+    "tslib": "~1.10.0",
     "typed-inject": "~2.0.0",
-    "typed-rest-client": "~1.4.0"
+    "typed-rest-client": "~1.5.0"
   },
   "devDependencies": {
     "@stryker-mutator/api": "^0.24.1",

diff --git a/.../core/test/helpers/registerChaiPlugins.ts → packages/core/test/helpers/initChai.ts b/.../core/test/helpers/registerChaiPlugins.ts → packages/core/test/helpers/initChai.ts
diff --git a/packages/html-reporter/src/templates/index.html b/packages/html-reporter/src/templates/index.html
@@ -2,6 +2,7 @@
 <html>
 
 <head>
+    <meta charset="utf-8">
     <script src="mutation-test-elements.js"></script>
 </head>
 
@@ -15,4 +16,4 @@
     <script src="bind-mutation-test-report.js"></script>
 </body>
 
-</html>
+</html>
diff --git a/...html-reporter/test/helpers/chaiHelpers.ts → ...es/html-reporter/test/helpers/initChai.ts b/...html-reporter/test/helpers/chaiHelpers.ts → ...es/html-reporter/test/helpers/initChai.ts
diff --git a/...ework/test/helpers/registerChaiPlugins.ts → ...asmine-framework/test/helpers/initChai.ts b/...ework/test/helpers/registerChaiPlugins.ts → ...asmine-framework/test/helpers/initChai.ts
diff --git a/packages/javascript-mutator/package.json b/packages/javascript-mutator/package.json
@@ -42,7 +42,7 @@
     "@babel/traverse": "~7.4.0",
     "@stryker-mutator/api": "^2.0.0",
     "lodash": "~4.17.4",
-    "tslib": "~1.9.3"
+    "tslib": "~1.10.0"
   },
   "peerDependencies": {
     "@stryker-mutator/core": "^2.0.0"

diff --git a/...tator/test/helpers/registerChaiPlugins.ts → ...vascript-mutator/test/helpers/initChai.ts b/...tator/test/helpers/registerChaiPlugins.ts → ...vascript-mutator/test/helpers/initChai.ts
diff --git a/...unner/test/helpers/registerChaiPlugins.ts → ...ages/jest-runner/test/helpers/initChai.ts b/...unner/test/helpers/registerChaiPlugins.ts → ...ages/jest-runner/test/helpers/initChai.ts
diff --git a/packages/karma-runner/package.json b/packages/karma-runner/package.json
@@ -48,7 +48,7 @@
     "@stryker-mutator/api": "^2.0.0",
     "decamelize": "^3.0.0",
     "semver": "~6.1.0",
-    "tslib": "~1.9.3"
+    "tslib": "~1.10.0"
   },
   "contributors": [
     "nicojs <jansennico@gmail.com>",

diff --git a/...es/karma-runner/test/helpers/chaiSetup.ts → ...ges/karma-runner/test/helpers/initChai.ts b/...es/karma-runner/test/helpers/chaiSetup.ts → ...ges/karma-runner/test/helpers/initChai.ts
diff --git a/packages/mocha-framework/package.json b/packages/mocha-framework/package.json
@@ -37,7 +37,7 @@
   "homepage": "https://github.com/stryker-mutator/stryker/tree/master/packages/mocha-framework#readme",
   "license": "Apache-2.0",
   "devDependencies": {
-    "tslib": "~1.9.3"
+    "tslib": "~1.10.0"
   },
   "peerDependencies": {
     "@stryker-mutator/core": "^2.0.0",

diff --git a/...ework/test/helpers/registerChaiPlugins.ts → .../mocha-framework/test/helpers/initChai.ts b/...ework/test/helpers/registerChaiPlugins.ts → .../mocha-framework/test/helpers/initChai.ts
diff --git a/packages/mocha-runner/package.json b/packages/mocha-runner/package.json
@@ -37,7 +37,7 @@
   "dependencies": {
     "@stryker-mutator/api": "^2.0.0",
     "multimatch": "~4.0.0",
-    "tslib": "~1.9.3"
+    "tslib": "~1.10.0"
   },
   "devDependencies": {
     "@stryker-mutator/test-helpers": "^2.0.0",

diff --git a/...unner/test/helpers/registerChaiPlugins.ts → ...ges/mocha-runner/test/helpers/initChai.ts b/...unner/test/helpers/registerChaiPlugins.ts → ...ges/mocha-runner/test/helpers/initChai.ts
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
@@ -40,7 +40,7 @@
     "@stryker-mutator/util": "^2.0.0",
     "lodash.flatmap": "~4.5.0",
     "semver": "~6.1.0",
-    "tslib": "~1.9.3"
+    "tslib": "~1.10.0"
   },
   "devDependencies": {
     "@stryker-mutator/mutator-specification": "^2.0.0",

diff --git a/.../util/test/helpers/registerChaiPlugins.ts → packages/util/test/helpers/initChai.ts b/.../util/test/helpers/registerChaiPlugins.ts → packages/util/test/helpers/initChai.ts
diff --git a/...es/wct-runner/test/helpers/chaiHelpers.ts → packages/wct-runner/test/helpers/initChai.ts b/...es/wct-runner/test/helpers/chaiHelpers.ts → packages/wct-runner/test/helpers/initChai.ts
diff --git a/...ges/wct-runner/test/helpers/sinonSetup.ts → ...ages/wct-runner/test/helpers/initSinon.ts b/...ges/wct-runner/test/helpers/sinonSetup.ts → ...ages/wct-runner/test/helpers/initSinon.ts
diff --git a/packages/webpack-transpiler/package.json b/packages/webpack-transpiler/package.json
@@ -38,8 +38,8 @@
     "@stryker-mutator/test-helpers": "^2.0.0",
     "@types/memory-fs": "~0.3.0",
     "@types/webpack": "~4.4.12",
-    "raw-loader": "~2.0.0",
-    "webpack": "~4.32.2"
+    "raw-loader": "~3.0.0",
+    "webpack": "~4.34.0"
   },
   "peerDependencies": {
     "@stryker-mutator/core": "^2.0.0",

diff --git a/...ck-transpiler/test/helpers/chaiPlugins.ts → ...bpack-transpiler/test/helpers/initChai.ts b/...ck-transpiler/test/helpers/chaiPlugins.ts → ...bpack-transpiler/test/helpers/initChai.ts
diff --git a/...pack-transpiler/test/helpers/sinonInit.ts → ...pack-transpiler/test/helpers/initSinon.ts b/...pack-transpiler/test/helpers/sinonInit.ts → ...pack-transpiler/test/helpers/initSinon.ts
diff --git a/perf/tasks/run-perf-tests.ts b/perf/tasks/run-perf-tests.ts
@@ -36,7 +36,7 @@ function execNpm(args: string[], testDir: string): Observable<string> {
   console.log(`Exec ${testDir} npm ${args.join(' ')}`);
 
   return new Observable(observer => {
-    const testProcess = execa('npm', args, { timeout: 500000, cwd: currentTestDir, stdio: 'pipe' });
+    const testProcess = execa('npm', args, { timeout: 0, cwd: currentTestDir, stdio: 'pipe' });
     let stderr = '';
     testProcess.stderr.on('data', chunk => stderr += chunk.toString());
     testProcess.stdout.on('data', chunk => observer.next(chunk.toString().trim()));

diff --git a/tsconfig.lint.json b/tsconfig.lint.json
@@ -1,8 +1,8 @@
 {
-  "extends": "tsconfig.settings.json",
+  "extends": "./tsconfig.settings.json",
   // This file is a workaround for: https://github.com/palantir/tslint/issues/4137
   "include": [
     "packages/*/src",
     "packages/*/test"
   ]
-}
+}