Auto-merge for PR #726 via VersionBot

dev: Add package.json tasks to aid debugging supervisor tests

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v7.17.0 - 2018-08-16
+
+* Fix: Fix importing of service type location #726 [Cameron Diver]
+* Dev: Add package.json tasks to aid debugging supervisor tests #726 [Cameron Diver]
+
 ## v7.16.7 - 2018-08-16
 
 * Update docker-toolbelt to pull in typings #727 [Cameron Diver]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "resin-supervisor",
   "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
-  "version": "7.16.7",
+  "version": "7.17.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -12,6 +12,9 @@
     "build": "webpack",
     "lint": "resin-lint --typescript src/ test/",
     "test": "npm run lint && JUNIT_REPORT_PATH=report.xml mocha --exit -r ts-node/register -r coffee-script/register -r register-coffee-coverage test/*.{js,coffee} && npm run coverage",
+    "test:fast": "mocha --exit -r ts-node/register -r coffee-script/register test/*.{js,coffee}",
+    "test:build": "tsc && coffee -m -c -o build . && cp -r test/data build/test/ && cp -r src/migrations build/src && cp package.json build",
+    "test:debug": "npm run test:build && mocha --inspect-brk build/test/*.js",
     "versionist": "versionist",
     "coverage": "istanbul report text && istanbul report html"
   },

src/device-api/common.d.ts

@@ -1,5 +1,5 @@
 import ApplicationManager from '../application-manager';
-import { Service } from '../application-manager';
+import { Service } from '../types/service';
 
 export interface ServiceAction {
 	action: string;

tsconfig.json

@@ -8,7 +8,7 @@
 		"removeComments": true,
 		"sourceMap": true,
 		"strictNullChecks": true,
-		"outDir": "./build"
+		"outDir": "./build/src/"
 	},
 	"include": [
 		"src/**/*.ts",