Merge pull request #20 from microsoftgraph/typings-to-types

Migrating away from typings in sdk core and TypeScript sample

Author: dan-silver

README.md

@@ -2,7 +2,7 @@
 [![npm version badge](https://img.shields.io/npm/v/msgraph-sdk-javascript.svg?maxAge=86400)](https://www.npmjs.com/package/msgraph-sdk-javascript)
 [![Travis](https://img.shields.io/travis/microsoftgraph/msgraph-sdk-javascript.svg?maxAge=2592000?style=flat-square)](https://travis-ci.org/microsoftgraph/msgraph-sdk-javascript)
 
-The Microsoft Graph JavaScript SDK is a lightweight wrapper around the Microsoft Graph API that supports both Node and the browser. See the [samples](samples) folder for code examples. You can also use our [TypeScript graph typings](https://github.com/microsoftgraph/msgraph-typescript-typings) with this SDK. 
+The Microsoft Graph JavaScript SDK is a lightweight wrapper around the Microsoft Graph API that supports both Node and the browser. See the [samples](samples) folder for code examples. You can also use our [TypeScript graph types](https://github.com/microsoftgraph/msgraph-typescript-typings) with this SDK. 
 
 > This SDK is currently in preview and we would love to hear your feedback! You can file an issue in this repository or write on our [uservoice page](https://officespdev.uservoice.com/). We're also trying to add more intellisense support beyond the current typings so we're also especially interested in feedback on the [Microsoft Graph TypeScript Typings](https://github.com/microsoftgraph/msgraph-typescript-typings).
 
@@ -21,6 +21,9 @@ Include [lib/graph-js-sdk-web.js](https://github.com/microsoftgraph/msgraph-sdk-
 <script type="text/javascript" src="graph-js-sdk-web.js"></script>
 ```
 ## Changelog
+#### 0.3.0
+* Migrated away from typings in sdk core and TypeScript sample
+
 #### 0.2.2
 * Updated SuperAgent to version ``` 3.3.0 ```
 
@@ -314,7 +317,7 @@ These steps are not required to use this SDK.
 
 ```npm run build``` generates lib/ files for node and browser versions.
 
-```npm pack``` bundles the npm module. This will automatically run ```typings install```.
+```npm pack``` bundles the npm module.
 
 ```npm test``` runs tests.
 
@@ -334,7 +337,7 @@ Please see the [contributing guidelines](CONTRIBUTING.md).
 ## Additional resources
 
 * [Microsoft Graph website](https://graph.microsoft.io)
-* [Microsoft Graph TypeScript typings](https://github.com/microsoftgraph/msgraph-typescript-typings/)
+* [Microsoft Graph TypeScript types](https://github.com/microsoftgraph/msgraph-typescript-typings/)
 * [Angular.js sample using the JavaScript SDK](https://github.com/microsoftgraph/angular-connect-sample)
 * [Node.js sample using the JavaScript SDK](https://github.com/microsoftgraph/nodejs-connect-sample)
 * [Office Dev Center](http://dev.office.com/)

package.json

@@ -1,6 +1,6 @@
 {
  "name": "msgraph-sdk-javascript",
- "version": "0.2.2",
+ "version": "0.3.0",
  "description": "Microsoft Graph JavaScript SDK",
  "main": "lib/src/index.js",
  "typings": "lib/src/index",
@@ -9,13 +9,13 @@
  ],
  "types": "./lib/src/index.d.ts",
  "devDependencies": {
- "typescript": "^2.0",
+ "@types/superagent": "^2.0.36",
+ "@types/mocha": "^2.2.34",
  "browserify": "^13.1.0",
- "mocha": "^3.0.2",
- "typings": "^2.0.0"
+ "mocha": "^3.2.0",
+ "typescript": "^2.1"
  },
  "scripts": {
- "prepublish": "typings install",
  "build": "tsc && node node-browserify.js > lib/graph-js-sdk-web.js",
  "test": "mocha lib/test"
  },

samples/typescript/package.json

@@ -0,0 +1,9 @@
+{
+ "name": "typescript-sample",
+ "version": "0.2.2",
+ "description": "TypeScript Sample",
+ "devDependencies": {
+ "msgraph-types": "https://github.com/microsoftgraph/msgraph-typescript-typings.git",
+ "typescript": "^2.1"
+ }
+}

samples/typescript/sample.ts

@@ -1,5 +1,3 @@
-/// <reference path="../../typings/index.d.ts" />
-
 // For more samples in JavaScript, see https://github.com/microsoftgraph/msgraph-sdk-javascript/blob/master/samples/node/node-sample.js
 
 const secrets = require("../node/secrets");
@@ -8,11 +6,10 @@ const secrets = require("../node/secrets");
 
 import {Client as GraphClient} from "../../lib/src/index";
 
-
-// These are the typings for graph nodes that are published separetlely (User field types, etc.)
-// To reference Microsoft Graph typings, see directions at https://github.com/microsoftgraph/msgraph-typescript-typings/
-// The dependency has been added in typings.json, so just run typings install
-import * as MicrosoftGraph from "microsoft-graph"
+// These are the types for graph nodes that are published separetlely (User field types, messages, contacts, etc.)
+// To reference Microsoft Graph types, see directions at https://github.com/microsoftgraph/msgraph-typescript-typings/
+// The dependency has been added in package.json, so just run npm install
+import * as MicrosoftGraph from "microsoft-graph-typings"
 
 
 const client = GraphClient.init({

samples/typescript/typings.json

@@ -1,5 +1,3 @@
-/// <reference path="../typings/index.d.ts" />
-
 import {Options, URLComponents, GraphError, oDataQueryNames, GraphRequestCallback} from "./common"
 import * as request from 'superagent';
 

src/GraphRequest.ts

@@ -1,5 +1,3 @@
-/// <reference path="../typings/index.d.ts" />
-
 export const oDataQueryNames = ["$select", "$expand", "$orderby", "$filter", "$top", "$skip", "$skipToken", "$count"];
 export const DEFAULT_VERSION = "v1.0";
 export const GRAPH_BASE_URL = "https://graph.microsoft.com/";

src/common.ts

@@ -1,6 +1,3 @@
-/// <reference path="../typings/index.d.ts" />
-'use strict';
-
 import * as request from 'superagent';
 
 import {Options, DEFAULT_VERSION, GRAPH_BASE_URL} from "./common"

src/index.ts

@@ -1,7 +1,6 @@
-/// <reference path="../typings/index.d.ts" />
-
 import {ResponseHandler} from "../src/ResponseHandler"
 import {GraphError} from '../src/common'
+import * as mocha from 'mocha'
 
 import * as assert from 'assert';
 

test/responseHandling.ts

@@ -1,5 +1,3 @@
-/// <reference path="../typings/index.d.ts" />
-
 import * as assert from 'assert';
 
 import {Client as GraphClient} from "../src/index"