From 8ff92a89b8a1a4d2d40c14bf30119c773e6e680c Mon Sep 17 00:00:00 2001
From: Peter Burns <rictic@google.com>
Date: Tue, 2 Aug 2016 17:28:41 -0700
Subject: [PATCH] Use properly modular estree in downstream typings

---
 acorn/acorn-tests.ts             | 1 +
 acorn/index.d.ts                 | 1 +
 esprima/esprima-tests.ts         | 1 +
 esprima/index.d.ts               | 3 ++-
 static-eval/index.d.ts           | 1 +
 static-eval/static-eval-tests.ts | 2 ++
 6 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/acorn/acorn-tests.ts b/acorn/acorn-tests.ts
index 3b2a116897..c51ba151f8 100644
--- a/acorn/acorn-tests.ts
+++ b/acorn/acorn-tests.ts
@@ -1,6 +1,7 @@
 /// <reference types="estree" />
 
 import acorn = require('acorn');
+import * as ESTree from 'estree';
 
 declare var token: acorn.Token;
 declare var tokens: acorn.Token[];
diff --git a/acorn/index.d.ts b/acorn/index.d.ts
index c7b76692c6..982abb4f54 100644
--- a/acorn/index.d.ts
+++ b/acorn/index.d.ts
@@ -7,6 +7,7 @@
 
 export as namespace acorn;
 export = acorn;
+import * as ESTree from 'estree';
 
 declare namespace acorn {
     var version: string;
diff --git a/esprima/esprima-tests.ts b/esprima/esprima-tests.ts
index c4cbec5240..4e808a1225 100644
--- a/esprima/esprima-tests.ts
+++ b/esprima/esprima-tests.ts
@@ -2,6 +2,7 @@
 
 
 import esprima = require('esprima');
+import * as ESTree from 'estree';
 
 var token: esprima.Token;
 var comment: esprima.Comment;
diff --git a/esprima/index.d.ts b/esprima/index.d.ts
index 6b0341a1f3..ccc0c177a9 100644
--- a/esprima/index.d.ts
+++ b/esprima/index.d.ts
@@ -7,6 +7,7 @@
 
 export = esprima;
 export as namespace esprima;
+import * as ESTree from 'estree';
 
 declare namespace esprima {
 
@@ -20,7 +21,7 @@ declare namespace esprima {
         value: string;
     }
 
-    interface Comment extends ESTree.Node {
+    interface Comment extends ESTree.BaseNode {
         value: string;
     }
 
diff --git a/static-eval/index.d.ts b/static-eval/index.d.ts
index 53db0266fc..0eac33d21f 100644
--- a/static-eval/index.d.ts
+++ b/static-eval/index.d.ts
@@ -5,6 +5,7 @@
 
 /// <reference types="esprima" />
 
+import * as ESTree from 'estree';
 
 /**
 * Evaluates the given ESTree.Expression, with the given named variables in place.
diff --git a/static-eval/static-eval-tests.ts b/static-eval/static-eval-tests.ts
index bb893a4d60..d4307c50f4 100644
--- a/static-eval/static-eval-tests.ts
+++ b/static-eval/static-eval-tests.ts
@@ -2,6 +2,8 @@
 
 import evaluate = require('static-eval');
 import esprima = require('esprima');
+import * as ESTree from 'estree';
+
 var parse = esprima.parse;