merge with upstream

samples/react-officegraph/tsconfig.json

@@ -1,15 +1,15 @@
-{
+{
-  "compilerOptions": {
+  "compilerOptions": {
-    "target": "es5",
+    "target": "es5",
-    "forceConsistentCasingInFileNames": true,
+    "forceConsistentCasingInFileNames": true,
-    "module": "commonjs",
+    "module": "commonjs",
-    "jsx": "react",
+    "jsx": "react",
-    "declaration": true,
+    "declaration": true,
-    "sourceMap": true,
+    "sourceMap": true,
-    "types": [
+    "types": [
-      "es6-promise",
+      "es6-promise",
-      "es6-collections",
+      "es6-collections",
-      "webpack-env"
+      "webpack-env"
-    ]
+    ]
-  }
+  }
-}
+}

samples/react-officegraph/typings/@ms/odsp.d.ts

@@ -1,8 +1,8 @@
-// Type definitions for Microsoft ODSP projects
+// Type definitions for Microsoft ODSP projects
-// Project: ODSP
+// Project: ODSP
-
+
-/* Global definition for UNIT_TEST builds
+/* Global definition for UNIT_TEST builds
-   Code that is wrapped inside an if(UNIT_TEST) {...}
+   Code that is wrapped inside an if(UNIT_TEST) {...}
-   block will not be included in the final bundle when the
+   block will not be included in the final bundle when the
-   --ship flag is specified */
+   --ship flag is specified */
 declare const UNIT_TEST: boolean;

samples/react-officegraph/typings/tsd.d.ts

@@ -1 +1 @@
-/// <reference path="@ms/odsp.d.ts" />
+/// <reference path="@ms/odsp.d.ts" />