From bc505161d10c5b31b2ddf86e86cb2ba7f379f5eb Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Wed, 13 Dec 2017 09:38:16 -0500
Subject: [PATCH] deconflict properly

---
 src/generators/Generator.ts                     | 2 +-
 test/runtime/samples/deconflict-self/_config.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts
index 52d571f76a..eea74c3173 100644
--- a/src/generators/Generator.ts
+++ b/src/generators/Generator.ts
@@ -161,9 +161,9 @@ export default class Generator {
 
 		this.computations = [];
 		this.templateProperties = {};
-		this.name = this.alias(name);
 
 		this.walkJs(dom);
+		this.name = this.alias(name);
 
 		if (options.customElement === true) {
 			this.customElement = {
diff --git a/test/runtime/samples/deconflict-self/_config.js b/test/runtime/samples/deconflict-self/_config.js
index 2f3a66c53b..86341e7379 100644
--- a/test/runtime/samples/deconflict-self/_config.js
+++ b/test/runtime/samples/deconflict-self/_config.js
@@ -1,4 +1,3 @@
 export default {
-	skip: true,
 	html: `<p>nested component</p>`
 };