From b6beef00efad374cd5fbb09795ca466abe1a6834 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 29 Apr 2018 20:58:05 -0400 Subject: [PATCH] keep ES5 function names in dev mode --- src/compile/dom/Block.ts | 22 ++++++++++--------- .../expected-bundle.js | 8 +++---- .../expected.js | 8 +++---- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/compile/dom/Block.ts b/src/compile/dom/Block.ts index fa11c9b702..5c48d8ba00 100644 --- a/src/compile/dom/Block.ts +++ b/src/compile/dom/Block.ts @@ -140,6 +140,8 @@ export default class Block { } toString() { + const { dev } = this.compiler.options; + let introing; const hasIntros = !this.builders.intro.isEmpty(); if (hasIntros) { @@ -184,7 +186,7 @@ export default class Block { ); properties.addBlock(deindent` - c() { + ${dev ? 'c: function create' : 'c'}() { ${this.builders.create} ${hydrate} }, @@ -196,7 +198,7 @@ export default class Block { properties.addBlock(`l: @noop,`); } else { properties.addBlock(deindent` - l(nodes) { + ${dev ? 'l: function claim' : 'l'}(nodes) { ${this.builders.claim} ${!this.builders.hydrate.isEmpty() && `this.h();`} }, @@ -206,7 +208,7 @@ export default class Block { if (this.compiler.options.hydratable && !this.builders.hydrate.isEmpty()) { properties.addBlock(deindent` - h() { + ${dev ? 'h: function hydrate' : 'h'}() { ${this.builders.hydrate} }, `); @@ -216,7 +218,7 @@ export default class Block { properties.addBlock(`m: @noop,`); } else { properties.addBlock(deindent` - m(#target, anchor) { + ${dev ? 'm: function mount' : 'm'}(#target, anchor) { ${this.builders.mount} }, `); @@ -227,7 +229,7 @@ export default class Block { properties.addBlock(`p: @noop,`); } else { properties.addBlock(deindent` - p(changed, ${this.maintainContext ? '_ctx' : 'ctx'}) { + ${dev ? 'p: function update' : 'p'}(changed, ${this.maintainContext ? '_ctx' : 'ctx'}) { ${this.maintainContext && `ctx = _ctx;`} ${this.builders.update} }, @@ -238,7 +240,7 @@ export default class Block { if (this.hasIntroMethod) { if (hasIntros) { properties.addBlock(deindent` - i(#target, anchor) { + ${dev ? 'i: function intro' : 'i'}(#target, anchor) { if (${introing}) return; ${introing} = true; ${hasOutros && `${outroing} = false;`} @@ -250,7 +252,7 @@ export default class Block { `); } else { properties.addBlock(deindent` - i(#target, anchor) { + ${dev ? 'i: function intro' : 'i'}(#target, anchor) { this.m(#target, anchor); }, `); @@ -260,7 +262,7 @@ export default class Block { if (this.hasOutroMethod) { if (hasOutros) { properties.addBlock(deindent` - o(#outrocallback) { + ${dev ? 'o: function outro' : 'o'}(#outrocallback) { if (${outroing}) return; ${outroing} = true; ${hasIntros && `${introing} = false;`} @@ -281,7 +283,7 @@ export default class Block { properties.addBlock(`u: @noop,`); } else { properties.addBlock(deindent` - u() { + ${dev ? 'u: function unmount' : 'u'}() { ${this.builders.unmount} }, `); @@ -291,7 +293,7 @@ export default class Block { properties.addBlock(`d: @noop`); } else { properties.addBlock(deindent` - d() { + ${dev ? 'd: function destroy' : 'd'}() { ${this.builders.destroy} } `); diff --git a/test/js/samples/dev-warning-missing-data-computed/expected-bundle.js b/test/js/samples/dev-warning-missing-data-computed/expected-bundle.js index fdedc5d78f..bea4d272db 100644 --- a/test/js/samples/dev-warning-missing-data-computed/expected-bundle.js +++ b/test/js/samples/dev-warning-missing-data-computed/expected-bundle.js @@ -169,21 +169,21 @@ function create_main_fragment(component, ctx) { var p, text_value = ctx.Math.max(0, ctx.foo), text, text_1, text_2; return { - c() { + c: function create() { p = createElement("p"); text = createText(text_value); text_1 = createText("\n\t"); text_2 = createText(ctx.bar); }, - m(target, anchor) { + m: function mount(target, anchor) { insertNode(p, target, anchor); appendNode(text, p); appendNode(text_1, p); appendNode(text_2, p); }, - p(changed, ctx) { + p: function update(changed, ctx) { if ((changed.Math || changed.foo) && text_value !== (text_value = ctx.Math.max(0, ctx.foo))) { text.data = text_value; } @@ -193,7 +193,7 @@ function create_main_fragment(component, ctx) { } }, - u() { + u: function unmount() { detachNode(p); }, diff --git a/test/js/samples/dev-warning-missing-data-computed/expected.js b/test/js/samples/dev-warning-missing-data-computed/expected.js index b9ee1c8f87..93be0ba0c1 100644 --- a/test/js/samples/dev-warning-missing-data-computed/expected.js +++ b/test/js/samples/dev-warning-missing-data-computed/expected.js @@ -9,21 +9,21 @@ function create_main_fragment(component, ctx) { var p, text_value = ctx.Math.max(0, ctx.foo), text, text_1, text_2; return { - c() { + c: function create() { p = createElement("p"); text = createText(text_value); text_1 = createText("\n\t"); text_2 = createText(ctx.bar); }, - m(target, anchor) { + m: function mount(target, anchor) { insertNode(p, target, anchor); appendNode(text, p); appendNode(text_1, p); appendNode(text_2, p); }, - p(changed, ctx) { + p: function update(changed, ctx) { if ((changed.Math || changed.foo) && text_value !== (text_value = ctx.Math.max(0, ctx.foo))) { text.data = text_value; } @@ -33,7 +33,7 @@ function create_main_fragment(component, ctx) { } }, - u() { + u: function unmount() { detachNode(p); },