Merge pull request #23 from zalando-incubator/21-typescript2

chore(project): upgrade to typescript2

.editorconfig

@@ -0,0 +1,9 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2

.gitignore

@@ -4,5 +4,3 @@ lib/
 .vscode
 .idea
 **/npm-debug.log
-typings/
-graviton-typings/

README.md

@@ -196,17 +196,14 @@ cleanMock();
 
 * clone this repo
 * `npm install`
-* `typings install`
-* `npm run setup-dev`
 * to build: `tsc`
 * to lint: `npm run tslint`
 
 
 ## Testing
 
-Both commands require a global installed mocha (`npm install -g mocha`) and ts-node (`npm install -g ts-node`).
-
-* `npm test` - runs unit tests
+* `npm test` - runs all tests
+* `npm run unit-test` - runs unit tests
 * `npm run integration-test` - runs integration tests
 
 

package.json

@@ -1,9 +1,9 @@
 {
   "name": "lib-oauth-tooling",
-  "version": "0.23.0",
+  "version": "0.25.0",
   "description": "A simple typescript based oauth tooling library",
-  "main": "./lib/index.js",
-  "typings": "./lib/index.d.ts",
+  "main": "./lib/src/index.js",
+  "typings": "./lib/src/index.d.ts",
   "license": "MIT",
   "keywords": [
     "zalando",
@@ -24,28 +24,36 @@
     "btoa": "^1.1.2",
     "form-urlencoded": "^1.2.0",
     "http-status": "^0.2.0",
-    "nock": "^7.5.0",
+    "nock": "^8.0.0",
     "node-fetch": "^1.3.3",
     "node-uuid": "^1.4.7",
     "q": "^1.4.1"
   },
   "devDependencies": {
+    "@graviton/graviton-typings": "1.0.0",
+    "@types/body-parser": "0.0.33",
+    "@types/chai": "^3.4.33",
+    "@types/chai-as-promised": "0.0.29",
+    "@types/express": "^4.0.33",
+    "@types/http-status": "^0.2.29",
+    "@types/mocha": "^2.2.32",
+    "@types/nock": "^8.0.33",
+    "@types/node-uuid": "0.0.28",
+    "@types/q": "0.0.32",
+    "@types/http-status": "^0.2.29",
     "chai": "^3.4.1",
     "chai-as-promised": "^5.1.0",
     "express": "^4.13.3",
     "mocha": "^3.0.2",
-    "nock": "^7.2.2",
-    "ts-node": "^1.3.0",
     "tslint": "^3.5.0",
-    "typescript": "^1.8.10",
-    "typings": "^1.3.3"
+    "typescript": "^2.0.3"
   },
   "scripts": {
-    "setup-dev": "rm -rf graviton-typings; git clone git@github.bus.zalan.do:graviton/graviton-typings.git ./graviton-typings",
-    "test": "mocha --opts test/mocha.opts",
-    "integration-test": "mocha --opts integration-test/mocha.opts --harmony_default_parameters",
+    "test": "tsc && mocha lib/test lib/integration-test --recursive",
+    "unit-test": "tsc && mocha lib/test --recursive",
+    "integration-test": "tsc && mocha lib/integration-test --recursive",
     "tslint": "tslint src/**/*.ts test/**/*.ts integration-test/**/*.ts",
-    "prepublish": "npm run tslint && npm run test && npm run integration-test && rm -rf lib && tsc"
+    "prepublish": "npm run tslint && npm run test && rm -rf lib && tsc"
   },
   "repository": {
     "type": "git",

tsconfig.json

@@ -11,28 +11,14 @@
     "sourceMap": true,
     "outDir": "./lib"
   },
-  "buildOnSave": true,
-  "compileOnSave": false,
-  "formatCodeOptions": {
-    "indentSize": 2,
-    "tabSize": 2,
-    "newLineCharacter": "\n",
-    "convertTabsToSpaces": true,
-    "insertSpaceAfterCommaDelimiter": true,
-    "insertSpaceAfterSemicolonInForStatements": true,
-    "insertSpaceBeforeAndAfterBinaryOperators": true,
-    "insertSpaceAfterKeywordsInControlFlowStatements": true,
-    "insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
-    "insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
-    "placeOpenBraceOnNewLineForFunctions": false,
-    "placeOpenBraceOnNewLineForControlBlocks": false
-  },
-  "exclude": [
-    "lib",
-    "node_modules",
-    "graviton-typings",
-    "test",
-    "integration-test",
-    "dist"
+  "files": [
+    "node_modules/@graviton/graviton-typings/typings/node-fetch/node-fetch.d.ts",
+    "node_modules/@graviton/graviton-typings/typings/btoa/btoa.d.ts",
+    "node_modules/@graviton/graviton-typings/typings/form-urlencoded/form-urlencoded.d.ts"
+  ],
+  "include": [
+    "src/**/*",
+    "test/**/*",
+    "integration-test/**/*"
   ]
 }