dep(types): typescript and typings dependencies (#3485)

- remove typings dependency, scripts, and gulp task
- add @types dependencies
- clean up globals.ts from npm publishing
- add declaration flag for tsc globals gulp task
- ignore globals.d.ts from tsconfig and .gitignore

closes #3484

.gitignore

@@ -14,3 +14,4 @@ npm-debug.log
 
 *.swp
 globals.js
+globals.d.ts

.npmignore

@@ -19,3 +19,4 @@ libpeerconnection.log
 npm-debug.log
 xmloutput*
 release.md
+globals.ts

exampleTypescript/.gitignore

@@ -1 +1,2 @@
 *.js
+node_modules

exampleTypescript/package.json

@@ -6,15 +6,16 @@
   "license": "MIT",
   "scripts": {
     "tsc": "tsc",
-    "typings": "typings install",
-    "postinstall": "typings install",
-    "pretest": "tsc",
+    "pretest": "npm run tsc",
     "test": "protractor tmp/conf.js"
   },
   "dependencies": {
     "jasmine": "^2.4.1",
     "protractor": "file:../",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.5"
+    "typescript": "^2.0.0"
+  },
+  "devDependencies": {
+    "@types/jasmine": "^2.2.31",
+    "@types/node": "^6.0.35"
   }
 }

exampleTypescript/tsconfig.json

@@ -10,7 +10,6 @@
   },
   "exclude": [
     "node_modules",
-    "typings/globals",
     "asyncAwait",
     "plugins.ts"
   ]

gulpfile.js

@@ -61,27 +61,23 @@ gulp.task('format', () => {
     format.format('file', clangFormat)).pipe(gulp.dest('.'));
 });
 
-gulp.task('typings', function(done) {
-  runSpawn(done, 'node', ['node_modules/typings/dist/bin.js', 'install']);
-});
-
 gulp.task('tsc', function(done) {
   runSpawn(done, 'node', ['node_modules/typescript/bin/tsc']);
 });
 
 gulp.task('tsc:globals', function(done) {
-  runSpawn(done, 'node', ['node_modules/typescript/bin/tsc', 'globals.ts'],
+  runSpawn(done, 'node', ['node_modules/typescript/bin/tsc', '-d', 'globals.ts'],
     'ignore');
 });
 
 gulp.task('prepublish', function(done) {
-  runSequence(['typings', 'jshint', 'format'], 'tsc', 'tsc:globals', 'types',
+  runSequence(['jshint', 'format'], 'tsc', 'tsc:globals', 'types',
     'ambient', 'built:copy', done);
 });
 
 gulp.task('pretest', function(done) {
   runSequence(
-    ['webdriver:update', 'typings', 'jshint', 'format'], 'tsc', 'tsc:globals',
+    ['webdriver:update', 'jshint', 'format'], 'tsc', 'tsc:globals',
     'types', 'ambient', 'built:copy', done);
 });
 

lib/browser.ts

@@ -3,7 +3,7 @@ import * as net from 'net';
 import * as url from 'url';
 import * as util from 'util';
 
-import {ElementArrayFinder, ElementFinder, build$, build$$} from './element';
+import {build$, build$$, ElementArrayFinder, ElementFinder} from './element';
 import {ProtractorExpectedConditions} from './expectedConditions';
 import {Locator, ProtractorBy} from './locators';
 import {Logger} from './logger';

lib/element.ts

@@ -429,23 +429,23 @@ export class ElementArrayFinder extends WebdriverWebElement {
    */
   applyAction_(actionFn: Function): ElementArrayFinder {
     let callerError = new Error();
-    let actionResults =
-        this.getWebElements()
-            .then((arr: any) => {
-              return webdriver.promise.all(arr.map(actionFn));
-            })
-            .then(null, (e: Error) => {
-              let noSuchErr: any;
-              let stack: string;
-              if (e instanceof Error) {
-                noSuchErr = (e as any)
-                noSuchErr.stack = noSuchErr.stack + (callerError as any).stack;
-              } else {
-                noSuchErr = (new Error(e.toString()) as any);
-                noSuchErr.stack = (callerError as any).stack;
-              }
-              throw noSuchErr;
-            });
+    let actionResults = this.getWebElements()
+                            .then((arr: any) => {
+                              return webdriver.promise.all(arr.map(actionFn));
+                            })
+                            .then(null, (e: Error | string) => {
+                              let noSuchErr: any;
+                              let stack: string;
+                              if (e instanceof Error) {
+                                noSuchErr = e;
+                                noSuchErr.stack =
+                                    noSuchErr.stack + callerError.stack;
+                              } else {
+                                noSuchErr = new Error(e as string);
+                                noSuchErr.stack = callerError.stack;
+                              }
+                              throw noSuchErr;
+                            });
     return new ElementArrayFinder(
         this.browser_, this.getWebElements, this.locator_, actionResults);
   }

package.json

@@ -25,6 +25,14 @@
     "webdriver-manager": "^10.2.2"
   },
   "devDependencies": {
+    "@types/chalk": "^0.4.28",
+    "@types/glob": "^5.0.29",
+    "@types/jasmine": "^2.2.31",
+    "@types/minimatch": "^2.0.28",
+    "@types/minimist": "^1.1.28",
+    "@types/node": "^6.0.35",
+    "@types/optimist": "0.0.28",
+    "@types/q": "0.0.28",
     "body-parser": "~1.15.2",
     "chai": "~3.5.0",
     "chai-as-promised": "~5.3.0",
@@ -39,8 +47,7 @@
     "mocha": "2.5.3",
     "rimraf": "~2.5.3",
     "run-sequence": "^1.1.5",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4"
+    "typescript": "^2.0.0"
   },
   "repository": {
     "type": "git",

tsconfig.json

@@ -14,9 +14,9 @@
     "node_modules",
     "testapp",
     "website",
-    "typings/globals",
     "scripts",
     "globals.ts",
+    "globals.d.ts",
     "exampleTypescript",
     "spec"
   ]