From d8cec7f4145b65209fa6f9fd2949778de5ae14a6 Mon Sep 17 00:00:00 2001 From: Rich-Harris Date: Tue, 18 Apr 2017 08:19:04 -0400 Subject: [PATCH 1/3] style consistency --- src/shared/dom.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/dom.js b/src/shared/dom.js index ba3dbc139c..6280783cb6 100644 --- a/src/shared/dom.js +++ b/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 ) { From a010778ac6a40e2430fefb91c31afe5377b92e58 Mon Sep 17 00:00:00 2001 From: Rich-Harris Date: Tue, 18 Apr 2017 08:31:48 -0400 Subject: [PATCH 2/3] =?UTF-8?q?helpers=20should=20not=20be=20considered=20?= =?UTF-8?q?dependencies=20=E2=80=94=20fixes=20#492?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/generators/Generator.js | 4 +++- test/runtime/samples/dev-warning-helper/_config.js | 13 +++++++++++++ test/runtime/samples/dev-warning-helper/main.html | 11 +++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 test/runtime/samples/dev-warning-helper/_config.js create mode 100644 test/runtime/samples/dev-warning-helper/main.html diff --git a/src/generators/Generator.js b/src/generators/Generator.js index e16d43da04..39569cc1da 100644 --- a/src/generators/Generator.js +++ b/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 ) ); diff --git a/test/runtime/samples/dev-warning-helper/_config.js b/test/runtime/samples/dev-warning-helper/_config.js new file mode 100644 index 0000000000..b562b70b9e --- /dev/null +++ b/test/runtime/samples/dev-warning-helper/_config.js @@ -0,0 +1,13 @@ +export default { + solo: true, + + dev: true, + + data: { + bar: 1 + }, + + html: '2', + + warnings: [] +}; diff --git a/test/runtime/samples/dev-warning-helper/main.html b/test/runtime/samples/dev-warning-helper/main.html new file mode 100644 index 0000000000..f86e8fb09c --- /dev/null +++ b/test/runtime/samples/dev-warning-helper/main.html @@ -0,0 +1,11 @@ +{{foo(bar)}} + + \ No newline at end of file From b9e097f83034649b9a031ca56eda283d494ce129 Mon Sep 17 00:00:00 2001 From: Rich-Harris Date: Tue, 18 Apr 2017 08:33:24 -0400 Subject: [PATCH 3/3] make all tests run --- test/runtime/samples/dev-warning-helper/_config.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/runtime/samples/dev-warning-helper/_config.js b/test/runtime/samples/dev-warning-helper/_config.js index b562b70b9e..4ad6222113 100644 --- a/test/runtime/samples/dev-warning-helper/_config.js +++ b/test/runtime/samples/dev-warning-helper/_config.js @@ -1,6 +1,4 @@ export default { - solo: true, - dev: true, data: {