Revert "Move frontend package types out of typescript-typings since this package will be used in both node and browser contexts"

This reverts commit 74483631d09395de248fe97034c059a2a8bb2097.

7 files changed, 53 insertions, 56 deletions

diff --git a/packages/react-docs/src/globals.d.ts b/packages/react-docs/src/globals.d.ts
index 12f976a3a..94e63a32d 100644
--- a/packages/react-docs/src/globals.d.ts
+++ b/packages/react-docs/src/globals.d.ts
@@ -1,5 +1,3 @@
-declare module 'react-tooltip';
-
 declare module '*.json' {
     const json: any;
     /* tslint:disable */
diff --git a/packages/react-shared/src/globals.d.ts b/packages/react-shared/src/globals.d.ts
index b633d045c..94e63a32d 100644
--- a/packages/react-shared/src/globals.d.ts
+++ b/packages/react-shared/src/globals.d.ts
@@ -1,5 +1,3 @@
-declare module 'react-highlight';
-
 declare module '*.json' {
     const json: any;
     /* tslint:disable */
diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json
index 10435ff25..fb5353a82 100644
--- a/packages/typescript-typings/package.json
+++ b/packages/typescript-typings/package.json
@@ -25,9 +25,9 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/typescript-typings#readme",
     "dependencies": {
-        "@types/bn.js": "^4.11.0",
+        "ethereum-types": "^1.0.0",
         "bignumber.js": "~4.1.0",
-        "ethereum-types": "^1.0.0"
+        "@types/bn.js": "^4.11.0"
     },
     "devDependencies": {
         "@0xproject/monorepo-scripts": "^1.0.0",
diff --git a/packages/typescript-typings/types/react-highlight/index.d.ts b/packages/typescript-typings/types/react-highlight/index.d.ts
new file mode 100644
index 000000000..875721533
--- /dev/null
+++ b/packages/typescript-typings/types/react-highlight/index.d.ts
@@ -0,0 +1 @@
+declare module 'react-highlight';
diff --git a/packages/typescript-typings/types/react-popper/index.d.ts b/packages/typescript-typings/types/react-popper/index.d.ts
new file mode 100644
index 000000000..d7dbca17f
--- /dev/null
+++ b/packages/typescript-typings/types/react-popper/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for react-popper 1.0.0-beta.6
+// Project: https://github.com/gilbarbara/react-joyride
+
+declare module 'react-popper' {
+    import * as React from 'react';
+    import * as PopperJS from 'popper.js';
+
+    interface ManagerProps {
+        children: React.ReactNode;
+    }
+    export class Manager extends React.Component<ManagerProps, {}> {}
+
+    type RefHandler = (ref: HTMLElement | null) => void;
+
+    export interface ReferenceChildrenProps {
+        ref: RefHandler;
+    }
+
+    export interface ReferenceProps {
+        children: (props: ReferenceChildrenProps) => React.ReactNode;
+    }
+    export class Reference extends React.Component<ReferenceProps, {}> {}
+
+    export interface PopperArrowProps {
+        ref: RefHandler;
+        style: React.CSSProperties;
+    }
+
+    export type Placement = PopperJS.Placement;
+
+    export interface PopperChildrenProps {
+        arrowProps: PopperArrowProps;
+        outOfBoundaries: boolean | null;
+        placement: PopperJS.Placement;
+        ref: RefHandler;
+        scheduleUpdate: () => void;
+        style: React.CSSProperties;
+    }
+
+    export interface PopperProps {
+        children: (props: PopperChildrenProps) => React.ReactNode;
+        eventsEnabled?: boolean;
+        modifiers?: PopperJS.Modifiers;
+        placement?: PopperJS.Placement;
+        positionFixed?: boolean;
+        referenceElement?: Element;
+    }
+    export class Popper extends React.Component<PopperProps, {}> {}
+}
diff --git a/packages/typescript-typings/types/react-tooltip/index.d.ts b/packages/typescript-typings/types/react-tooltip/index.d.ts
new file mode 100644
index 000000000..98cb6d592
--- /dev/null
+++ b/packages/typescript-typings/types/react-tooltip/index.d.ts
@@ -0,0 +1 @@
+declare module 'react-tooltip';
diff --git a/packages/website/ts/globals.d.ts b/packages/website/ts/globals.d.ts
index a63089b51..719c2708a 100644
--- a/packages/website/ts/globals.d.ts
+++ b/packages/website/ts/globals.d.ts
@@ -3,7 +3,6 @@ declare module 'whatwg-fetch';
 declare module 'thenby';
 declare module 'react-document-title';
 declare module 'react-ga';
-declare module 'react-tooltip';
 
 declare module '*.json' {
     const json: any;
@@ -18,52 +17,3 @@ interface System {
     import<T>(module: string): Promise<T>;
 }
 declare var System: System;
-
-// Type definitions for react-popper 1.0.0-beta.6
-// Project: https://github.com/gilbarbara/react-joyride
-declare module 'react-popper' {
-    import * as React from 'react';
-    import * as PopperJS from 'popper.js';
-
-    interface ManagerProps {
-        children: React.ReactNode;
-    }
-    export class Manager extends React.Component<ManagerProps, {}> {}
-
-    type RefHandler = (ref: HTMLElement | null) => void;
-
-    export interface ReferenceChildrenProps {
-        ref: RefHandler;
-    }
-
-    export interface ReferenceProps {
-        children: (props: ReferenceChildrenProps) => React.ReactNode;
-    }
-    export class Reference extends React.Component<ReferenceProps, {}> {}
-
-    export interface PopperArrowProps {
-        ref: RefHandler;
-        style: React.CSSProperties;
-    }
-
-    export type Placement = PopperJS.Placement;
-
-    export interface PopperChildrenProps {
-        arrowProps: PopperArrowProps;
-        outOfBoundaries: boolean | null;
-        placement: PopperJS.Placement;
-        ref: RefHandler;
-        scheduleUpdate: () => void;
-        style: React.CSSProperties;
-    }
-
-    export interface PopperProps {
-        children: (props: PopperChildrenProps) => React.ReactNode;
-        eventsEnabled?: boolean;
-        modifiers?: PopperJS.Modifiers;
-        placement?: PopperJS.Placement;
-        positionFixed?: boolean;
-        referenceElement?: Element;
-    }
-    export class Popper extends React.Component<PopperProps, {}> {}
-}