Merge branch 'master' into ben/associations

extensions/json/server/package.json

@@ -18,8 +18,7 @@
 		"typescript": "^1.6.2"
 	},
 	"scripts": {
-		"compile": "tsc -p .",
-		"watch": "tsc --watch -p .",
-		"postinstall": "tsc -p ."
+		"compile": "gulp compile-extension:json-server",
+		"watch": "gulp watch-extension:json-server"
 	}
 }

extensions/json/server/src/typings/ref.d.ts

@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+/// <reference path='../../../../../src/typings/mocha.d.ts'/>
+/// <reference path='../../../../../extensions/node.d.ts'/>
+/// <reference path='../../../../../extensions/lib.core.d.ts'/>
+/// <reference path='../../../../../extensions/declares.d.ts'/>

extensions/json/server/tsconfig.json

@@ -1,9 +1,10 @@
 {
 	"compilerOptions": {
+		"noLib": true,
 		"target": "es5",
 		"module": "commonjs",
-		"moduleResolution": "node",
 		"sourceMap": true,
+		"sourceRoot": "../src",
 		"outDir": "./out"
 	},
 	"exclude": [

extensions/json/server/typings/mocha.d.ts

@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-declare function run(): void;
-
-declare function suite(name: string, fn: (err?)=>void);
-declare function test(name: string, fn: (done?: (err?)=>void)=>void);
-declare function suiteSetup(fn: (done?: (err?)=>void)=>void);
-declare function suiteTeardown(fn: (done?: (err?)=>void)=>void);
-declare function setup(fn: (done?: (err?)=>void)=>void);
-declare function teardown(fn: (done?: (err?)=>void)=>void);