fix(types): do not publish built/globals.d.ts (#3546)

- do not publish built/globals.d.ts - remove type interface for HttpProxyAgent and set to to any
angular · Sep 14, 2016 · 58459a9 · 58459a9
1 parent 11c9418
commit 58459a9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -50,7 +50,7 @@ gulp.task('checkVersion', function(done) {
 });
 
 gulp.task('built:copy', function(done) {
-  return gulp.src(['lib/**/*.js','lib/globals.d.ts','lib/index.d.ts'])
+  return gulp.src(['lib/**/*.js','lib/index.d.ts'])
       .pipe(gulp.dest('built/'));
   done();
 });

diff --git a/lib/browser.ts b/lib/browser.ts
@@ -679,8 +679,12 @@ export class ProtractorBrowser extends Webdriver {
                     let $timeout = $delegate;
 
                     let taskId = 0;
-                    if (!window['NG_PENDING_TIMEOUTS']) {
-                      window['NG_PENDING_TIMEOUTS'] = {};
+
+                    interface Window {
+                      [key: string]: any;
+                    }
+                    if (!(<Window>window)['NG_PENDING_TIMEOUTS']) {
+                      (<Window>window)['NG_PENDING_TIMEOUTS'] = {};
                     }
 
                     let extendedTimeout: any = function() {
@@ -691,10 +695,12 @@ export class ProtractorBrowser extends Webdriver {
 
                       taskId++;
                       let fn = args[0];
-                      window['NG_PENDING_TIMEOUTS'][taskId] = fn.toString();
+                      (<Window>window)['NG_PENDING_TIMEOUTS'][taskId] =
+                          fn.toString();
                       let wrappedFn = ((taskId_: number) => {
                         return function() {
-                          delete window['NG_PENDING_TIMEOUTS'][taskId_];
+                          delete (
+                              <Window>window)['NG_PENDING_TIMEOUTS'][taskId_];
                           return fn.apply(null, arguments);
                         };
                       })(taskId);
@@ -708,7 +714,7 @@ export class ProtractorBrowser extends Webdriver {
                     extendedTimeout.cancel = function() {
                       let taskId_ = arguments[0] && arguments[0].ptorTaskId_;
                       if (taskId_) {
-                        delete window['NG_PENDING_TIMEOUTS'][taskId_];
+                        delete (<Window>window)['NG_PENDING_TIMEOUTS'][taskId_];
                       }
                       return $timeout.cancel.apply($timeout, arguments);
                     };
@@ -1044,7 +1050,11 @@ export class ProtractorBrowser extends Webdriver {
     let vm_ = require('vm');
     let flow = webdriver.promise.controlFlow();
 
-    let context: Object = {require: require};
+    interface Context {
+      require: any;
+      [key: string]: any;
+    }
+    let context: Context = {require: require};
     global.list = (locator: Locator) => {
       /* globals browser */
       return global.browser.findElements(locator).then(

diff --git a/lib/config.ts b/lib/config.ts
@@ -100,7 +100,7 @@ export interface Config {
    * to generate the agent or use sauceProxy as an alternative. If a
    * sauceProxy is provided, the sauceAgent will be overridden.
    */
-  sauceAgent?: HttpProxyAgent;
+  sauceAgent?: any;
   /**
    * Use sauceProxy if you are behind a corporate proxy to connect to
    * saucelabs.com.

diff --git a/lib/globals.d.ts b/lib/globals.d.ts
@@ -3,9 +3,7 @@ declare namespace angular {
   var module: Function;
 }
 
-declare interface Object { [key: string]: any; }
-
-declare interface Window { [key: string]: any; }
+// declare interface Window { [key: string]: any; }
 
 declare namespace NodeJS {
   interface Process {
@@ -35,5 +33,3 @@ declare interface IError extends Error {
   code?: number;
   stack?: string;
 }
-
-declare interface HttpProxyAgent { constructor(opts: Object): HttpProxyAgent; }
diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -1,5 +1,4 @@
 /// <reference path="../typings/index.d.ts" />
-/// <reference path="./globals.d.ts" />
 export {ElementHelper, ProtractorBrowser} from './browser';
 export {Config} from './config';
 export {ElementArrayFinder, ElementFinder} from './element';

diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
   "dependencies": {
     "@types/jasmine": "^2.2.31",
     "@types/node": "^6.0.35",
+    "@types/q": "^0.0.30",
     "adm-zip": "0.4.7",
     "chalk": "^1.1.3",
     "glob": "^7.0.3",
@@ -32,7 +33,6 @@
     "@types/minimatch": "^2.0.28",
     "@types/minimist": "^1.1.28",
     "@types/optimist": "0.0.28",
-    "@types/q": "^0.0.30",
     "body-parser": "~1.15.2",
     "chai": "~3.5.0",
     "chai-as-promised": "~5.3.0",