From ce712294ff1f2d306aab6b2519a29535cf8e9101 Mon Sep 17 00:00:00 2001
From: Simon Gellis <simongellis@gmail.com>
Date: Sun, 5 Feb 2017 19:20:27 -0500
Subject: [PATCH] Updates dependents to point to old version, fixes old
 tsconfig.json

---
 protractor-helpers/index.d.ts                  | 2 +-
 protractor-helpers/protractor-helpers-tests.ts | 1 +
 protractor-helpers/tsconfig.json               | 3 +++
 protractor-http-mock/index.d.ts                | 2 +-
 protractor-http-mock/tsconfig.json             | 3 +++
 selenium-webdriver/index.d.ts                  | 2 +-
 selenium-webdriver/v2/index.d.ts               | 2 ++
 selenium-webdriver/v2/tsconfig.json            | 8 ++++++--
 8 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/protractor-helpers/index.d.ts b/protractor-helpers/index.d.ts
index 9821f5ba0c..ed6c02d885 100644
--- a/protractor-helpers/index.d.ts
+++ b/protractor-helpers/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-/// <reference types="selenium-webdriver" />
+import * as webdriver from 'selenium-webdriver';
 
 // ElementArrayFinder
 
diff --git a/protractor-helpers/protractor-helpers-tests.ts b/protractor-helpers/protractor-helpers-tests.ts
index 9b03e43005..02ec9d294b 100644
--- a/protractor-helpers/protractor-helpers-tests.ts
+++ b/protractor-helpers/protractor-helpers-tests.ts
@@ -1,6 +1,7 @@
 /// <reference types="jasmine" />
 
 import helpers = require('protractor-helpers');
+import * as webdriver from 'selenium-webdriver';
 
 declare var $$: any, $: any, by: any, element: any; // ??
 
diff --git a/protractor-helpers/tsconfig.json b/protractor-helpers/tsconfig.json
index c3fc74ec13..84c5b93cd5 100644
--- a/protractor-helpers/tsconfig.json
+++ b/protractor-helpers/tsconfig.json
@@ -9,6 +9,9 @@
         "strictNullChecks": false,
         "baseUrl": "../",
         "types": [],
+        "paths": {
+            "selenium-webdriver": ["selenium-webdriver/v2"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/protractor-http-mock/index.d.ts b/protractor-http-mock/index.d.ts
index 5f9dbcd79a..110883a8d3 100644
--- a/protractor-http-mock/index.d.ts
+++ b/protractor-http-mock/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Crevil <https://github.com/Crevil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="selenium-webdriver" />
+import * as webdriver from 'selenium-webdriver';
 
 declare namespace mock {
     interface ProtractorHttpMock {
diff --git a/protractor-http-mock/tsconfig.json b/protractor-http-mock/tsconfig.json
index 1280c748d3..486d3cff30 100644
--- a/protractor-http-mock/tsconfig.json
+++ b/protractor-http-mock/tsconfig.json
@@ -9,6 +9,9 @@
         "strictNullChecks": false,
         "baseUrl": "../",
         "types": [],
+        "paths": {
+            "selenium-webdriver": ["selenium-webdriver/v2"]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/selenium-webdriver/index.d.ts b/selenium-webdriver/index.d.ts
index 67d43c3e2e..12eaa03ada 100644
--- a/selenium-webdriver/index.d.ts
+++ b/selenium-webdriver/index.d.ts
@@ -2547,7 +2547,7 @@ type ByHash = { className: string } |
   { tagName: string } |
   { xpath: string };
 
-  type Locator = By | Function | ByHash;
+  export type Locator = By | Function | ByHash;
 
 /**
  * Common webdriver capability keys.
diff --git a/selenium-webdriver/v2/index.d.ts b/selenium-webdriver/v2/index.d.ts
index 17fba9ceae..374d63f740 100644
--- a/selenium-webdriver/v2/index.d.ts
+++ b/selenium-webdriver/v2/index.d.ts
@@ -2668,6 +2668,8 @@ declare namespace webdriver {
     { tagName: string } |
     { xpath: string };
 
+  export type Locator = By | Function | ByHash;
+
   /**
    * Common webdriver capability keys.
    * @enum {string}
diff --git a/selenium-webdriver/v2/tsconfig.json b/selenium-webdriver/v2/tsconfig.json
index a16c018a47..ed49d9d2b8 100644
--- a/selenium-webdriver/v2/tsconfig.json
+++ b/selenium-webdriver/v2/tsconfig.json
@@ -7,10 +7,14 @@
         "noImplicitAny": true,
         "noImplicitThis": false,
         "strictNullChecks": false,
-        "baseUrl": "../",
+        "baseUrl": "../../",
         "typeRoots": [
-            "../"
+            "../../"
         ],
+        "paths": {
+          "selenium-webdriver": ["selenium-webdriver/v2"],
+          "selenium-webdriver/*": ["selenium-webdriver/v2/*"]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true