Merge pull request #493 from sveltejs/gh-492

Don't treat helpers as dependencies

Author: Rich-Harris

src/generators/Generator.js

@@ -156,6 +156,8 @@ export default class Generator {
 		let scope = annotateWithScopes( expression );
 		const dependencies = [];
 
+		const generator = this; // can't use arrow functions, because of this.skip()
+
 		walk( expression, {
 			enter ( node, parent ) {
 				if ( node._scope ) {
@@ -165,7 +167,7 @@ export default class Generator {
 
 				if ( isReference( node, parent ) ) {
 					const { name } = flattenReference( node );
-					if ( scope.has( name ) ) return;
+					if ( scope.has( name ) || generator.helpers.has( name ) ) return;
 
 					if ( contextDependencies.has( name ) ) {
 						dependencies.push( ...contextDependencies.get( name ) );

src/shared/dom.js

@@ -39,15 +39,15 @@ export function createComment () {
 }
 
 export function addEventListener ( node, event, handler ) {
-	node.addEventListener ( event, handler, false );
+	node.addEventListener( event, handler, false );
 }
 
 export function removeEventListener ( node, event, handler ) {
-	node.removeEventListener ( event, handler, false );
+	node.removeEventListener( event, handler, false );
 }
 
 export function setAttribute ( node, attribute, value ) {
-	node.setAttribute ( attribute, value );
+	node.setAttribute( attribute, value );
 }
 
 export function setXlinkAttribute ( node, attribute, value ) {

test/runtime/samples/dev-warning-helper/_config.js

@@ -0,0 +1,11 @@
+export default {
+	dev: true,
+
+	data: {
+		bar: 1
+	},
+
+	html: '2',
+
+	warnings: []
+};

test/runtime/samples/dev-warning-helper/main.html

@@ -0,0 +1,11 @@
+{{foo(bar)}}
+
+<script>
+	export default {
+		helpers: {
+			foo ( bar ) {
+				return bar * 2;
+			}
+		}
+	};
+</script>