From b5a1d757831a4f9a973103402d256ad54b612bc8 Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Sat, 23 Nov 2019 18:04:49 -0500
Subject: [PATCH] update estree-walker - closes #3977, closes #3979

---
 package-lock.json                 | 6 +++---
 package.json                      | 2 +-
 src/compiler/compile/Component.ts | 9 +--------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dd9d418f18..4a45a6e5fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1190,9 +1190,9 @@
       "dev": true
     },
     "estree-walker": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.8.1.tgz",
-      "integrity": "sha512-H6cJORkqvrNziu0KX2hqOMAlA2CiuAxHeGJXSIoKA/KLv229Dw806J3II6mKTm5xiDX1At1EXCfsOQPB+tMB+g==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.0.tgz",
+      "integrity": "sha512-vY6xMN2j47HfQfVWGRqHshr1olf+XS1Y488NoqjDP1c8E1TcoZr/D3eSGa6akBs76WL1X9nluWjgBsCKdt/qKg==",
       "dev": true
     },
     "esutils": {
diff --git a/package.json b/package.json
index 27ee2f5f94..16bcfe825d 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "eslint": "^6.3.0",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-svelte3": "^2.7.3",
-    "estree-walker": "^0.8.1",
+    "estree-walker": "^1.0.0",
     "is-reference": "^1.1.4",
     "jsdom": "^15.1.1",
     "kleur": "^3.0.3",
diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index 0df89a25de..cec01401fb 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -1,4 +1,4 @@
-import { walk, childKeys } from 'estree-walker';
+import { walk } from 'estree-walker';
 import { getLocator } from 'locate-character';
 import Stats from '../Stats';
 import { globals, reserved, is_valid } from '../utils/names';
@@ -37,13 +37,6 @@ interface ComponentOptions {
 	preserveWhitespace?: boolean;
 }
 
-// We need to tell estree-walker that it should always
-// look for an `else` block, otherwise it might get
-// the wrong idea about the shape of each/if blocks
-childKeys.EachBlock = childKeys.IfBlock = ['children', 'else'];
-childKeys.Attribute = ['value'];
-childKeys.ExportNamedDeclaration = ['declaration', 'specifiers'];
-
 export default class Component {
 	stats: Stats;
 	warnings: Warning[];