From 11b55ada46e9b62d5a72965c9d1ac07ba6ec08ab Mon Sep 17 00:00:00 2001 From: Richard Harris Date: Thu, 7 Nov 2019 09:28:47 -0500 Subject: [PATCH 1/4] reinstate banner --- src/compiler/compile/Component.ts | 3 +-- src/compiler/compile/create_module.ts | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts index 4d8abadf34d4..67b2cd43804a 100644 --- a/src/compiler/compile/Component.ts +++ b/src/compiler/compile/Component.ts @@ -240,8 +240,7 @@ export default class Component { const { compile_options, name } = this; const { format = 'esm' } = compile_options; - // TODO reinstate banner (along with fragment marker comments) - const banner = `/* ${this.file ? `${this.file} ` : ``}generated by Svelte v${'__VERSION__'} */`; + const banner = `${this.file ? `${this.file} ` : ``}generated by Svelte v${'__VERSION__'}`; const program: any = { type: 'Program', body: result }; diff --git a/src/compiler/compile/create_module.ts b/src/compiler/compile/create_module.ts index 76e68e758f9c..ce6443e899f7 100644 --- a/src/compiler/compile/create_module.ts +++ b/src/compiler/compile/create_module.ts @@ -44,7 +44,7 @@ function edit_source(source, sveltePath) { function esm( program: any, name: Identifier, - _banner: string, + banner: string, sveltePath: string, internal_path: string, helpers: Array<{ name: string; alias: Identifier }>, @@ -98,6 +98,8 @@ function esm( }; program.body = b` + /* ${banner} */ + ${import_declaration} ${internal_globals} ${imports} @@ -112,7 +114,7 @@ function esm( function cjs( program: any, name: Identifier, - _banner: string, + banner: string, sveltePath: string, internal_path: string, helpers: Array<{ name: string; alias: Identifier }>, @@ -188,6 +190,8 @@ function cjs( const exports = module_exports.map(x => b`exports.${{ type: 'Identifier', name: x.as }} = ${{ type: 'Identifier', name: x.name }};`); program.body = b` + /* ${banner} */ + "use strict"; ${internal_requires} ${internal_globals} From 93ac62413272c450e58132b1798532228b3131b0 Mon Sep 17 00:00:00 2001 From: Richard Harris Date: Sat, 9 Nov 2019 12:59:50 -0500 Subject: [PATCH 2/4] reinstate block comments --- src/compiler/compile/render_dom/Block.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/compiler/compile/render_dom/Block.ts b/src/compiler/compile/render_dom/Block.ts index 56b5d08489b6..0b9784a6e8b1 100644 --- a/src/compiler/compile/render_dom/Block.ts +++ b/src/compiler/compile/render_dom/Block.ts @@ -423,17 +423,17 @@ export default class Block { const key = this.key && this.get_unique_name('key'); const args: any[] = [x`#ctx`]; - if (key) args.unshift(key); - // TODO include this.comment - // ${this.comment && `// ${escape(this.comment, { only_escape_at_symbol: true })}`} + const fn = b`function ${this.name}(${args}) { + ${this.get_contents(key)} + }`; - return b` - function ${this.name}(${args}) { - ${this.get_contents(key)} - } - `; + return this.comment + ? b` + // ${this.comment} + ${fn}` + : fn; } render_listeners(chunk: string = '') { From d8b25afacd5857610068f90a625f04270fa5e161 Mon Sep 17 00:00:00 2001 From: Richard Harris Date: Sat, 9 Nov 2019 12:59:56 -0500 Subject: [PATCH 3/4] update tests --- test/js/index.js | 2 +- .../js/samples/action-custom-event-handler/expected.js | 1 + test/js/samples/action/expected.js | 1 + test/js/samples/bind-online/expected.js | 1 + test/js/samples/bind-open/expected.js | 1 + test/js/samples/bind-width-height/expected.js | 1 + test/js/samples/bindings-readonly-order/expected.js | 1 + test/js/samples/capture-inject-dev-only/expected.js | 1 + .../samples/collapses-text-around-comments/expected.js | 1 + test/js/samples/component-static-array/expected.js | 1 + test/js/samples/component-static-immutable/expected.js | 1 + .../js/samples/component-static-immutable2/expected.js | 1 + test/js/samples/component-static-var/expected.js | 1 + test/js/samples/component-static/expected.js | 1 + .../component-store-access-invalidate/expected.js | 1 + .../component-store-file-invalidate/expected.js | 1 + .../component-store-reassign-invalidate/expected.js | 1 + test/js/samples/computed-collapsed-if/expected.js | 1 + test/js/samples/css-media-query/expected.js | 1 + test/js/samples/css-shadow-dom-keyframes/expected.js | 1 + test/js/samples/data-attribute/expected.js | 1 + test/js/samples/debug-empty/expected.js | 1 + test/js/samples/debug-foo-bar-baz-things/expected.js | 2 ++ test/js/samples/debug-foo/expected.js | 2 ++ test/js/samples/debug-hoisted/expected.js | 1 + test/js/samples/debug-no-dependencies/expected.js | 2 ++ test/js/samples/debug-ssr-foo/expected.js | 1 + test/js/samples/deconflict-builtins/expected.js | 2 ++ test/js/samples/deconflict-globals/expected.js | 2 ++ .../dev-warning-missing-data-computed/expected.js | 1 + test/js/samples/dont-invalidate-this/expected.js | 1 + test/js/samples/dynamic-import/expected.js | 1 + test/js/samples/each-block-array-literal/expected.js | 2 ++ test/js/samples/each-block-changed-check/expected.js | 10 +++------- test/js/samples/each-block-keyed-animated/expected.js | 2 ++ test/js/samples/each-block-keyed/expected.js | 2 ++ test/js/samples/empty-dom/expected.js | 1 + test/js/samples/event-handler-dynamic/expected.js | 1 + test/js/samples/event-handler-no-passive/expected.js | 1 + test/js/samples/event-modifiers/expected.js | 1 + test/js/samples/head-no-whitespace/expected.js | 1 + test/js/samples/hoisted-const/expected.js | 1 + test/js/samples/hoisted-let/expected.js | 1 + test/js/samples/if-block-complex/expected.js | 1 + test/js/samples/if-block-no-update/expected.js | 2 ++ test/js/samples/if-block-simple/expected.js | 1 + .../inline-style-optimized-multiple/expected.js | 1 + test/js/samples/inline-style-optimized-url/expected.js | 1 + test/js/samples/inline-style-optimized/expected.js | 1 + test/js/samples/inline-style-unoptimized/expected.js | 1 + .../samples/inline-style-without-updates/expected.js | 1 + test/js/samples/input-files/expected.js | 1 + test/js/samples/input-no-initial-value/expected.js | 7 ++----- test/js/samples/input-range/expected.js | 1 + .../samples/input-without-blowback-guard/expected.js | 1 + .../instrumentation-script-if-no-block/expected.js | 1 + .../instrumentation-script-x-equals-x/expected.js | 1 + .../instrumentation-template-if-no-block/expected.js | 1 + .../instrumentation-template-x-equals-x/expected.js | 1 + test/js/samples/legacy-input-type/expected.js | 1 + test/js/samples/media-bindings/expected.js | 1 + test/js/samples/non-imported-component/expected.js | 1 + test/js/samples/non-mutable-reference/expected.js | 1 + .../expected.js | 1 + .../expected.js | 1 + test/js/samples/select-dynamic-value/expected.js | 1 + test/js/samples/setup-method/expected.js | 2 ++ test/js/samples/ssr-no-oncreate-etc/expected.js | 2 ++ test/js/samples/ssr-preserve-comments/expected.js | 1 + test/js/samples/svg-title/expected.js | 1 + test/js/samples/title/expected.js | 1 + test/js/samples/transition-local/expected.js | 2 ++ test/js/samples/transition-repeated-outro/expected.js | 1 + test/js/samples/unchanged-expression/expected.js | 1 + .../unreferenced-state-not-invalidated/expected.js | 1 + test/js/samples/use-elements-as-anchors/expected.js | 5 +++++ test/js/samples/window-binding-online/expected.js | 1 + test/js/samples/window-binding-scroll/expected.js | 1 + 78 files changed, 97 insertions(+), 13 deletions(-) diff --git a/test/js/index.js b/test/js/index.js index 5fd632d60629..d4026401c9b6 100644 --- a/test/js/index.js +++ b/test/js/index.js @@ -3,7 +3,7 @@ import * as fs from "fs"; import * as path from "path"; import { loadConfig, svelte } from "../helpers.js"; -describe("js", () => { +describe.only("js", () => { fs.readdirSync(`${__dirname}/samples`).forEach(dir => { if (dir[0] === ".") return; diff --git a/test/js/samples/action-custom-event-handler/expected.js b/test/js/samples/action-custom-event-handler/expected.js index 6204fefd46f2..3fad4fb8cc8d 100644 --- a/test/js/samples/action-custom-event-handler/expected.js +++ b/test/js/samples/action-custom-event-handler/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, detach, diff --git a/test/js/samples/action/expected.js b/test/js/samples/action/expected.js index 71e7b4bbf5bc..78fc4855c624 100644 --- a/test/js/samples/action/expected.js +++ b/test/js/samples/action/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, attr, diff --git a/test/js/samples/bind-online/expected.js b/test/js/samples/bind-online/expected.js index 92494fb75303..d34e84330f77 100644 --- a/test/js/samples/bind-online/expected.js +++ b/test/js/samples/bind-online/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, add_render_callback, diff --git a/test/js/samples/bind-open/expected.js b/test/js/samples/bind-open/expected.js index ded427fb36b1..f7bede2b4ef7 100644 --- a/test/js/samples/bind-open/expected.js +++ b/test/js/samples/bind-open/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, detach, diff --git a/test/js/samples/bind-width-height/expected.js b/test/js/samples/bind-width-height/expected.js index 218a72a7ccc9..ce20bc4aa760 100644 --- a/test/js/samples/bind-width-height/expected.js +++ b/test/js/samples/bind-width-height/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, add_render_callback, diff --git a/test/js/samples/bindings-readonly-order/expected.js b/test/js/samples/bindings-readonly-order/expected.js index b7e004ec2368..04eff699f8cb 100644 --- a/test/js/samples/bindings-readonly-order/expected.js +++ b/test/js/samples/bindings-readonly-order/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, attr, diff --git a/test/js/samples/capture-inject-dev-only/expected.js b/test/js/samples/capture-inject-dev-only/expected.js index 66e5b75fa3a8..ee2f6d0dc929 100644 --- a/test/js/samples/capture-inject-dev-only/expected.js +++ b/test/js/samples/capture-inject-dev-only/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/collapses-text-around-comments/expected.js b/test/js/samples/collapses-text-around-comments/expected.js index 84cfaf35eff7..5fb7aaef1519 100644 --- a/test/js/samples/collapses-text-around-comments/expected.js +++ b/test/js/samples/collapses-text-around-comments/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/component-static-array/expected.js b/test/js/samples/component-static-array/expected.js index 0f32421e912c..b89ee4676433 100644 --- a/test/js/samples/component-static-array/expected.js +++ b/test/js/samples/component-static-array/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, create_component, diff --git a/test/js/samples/component-static-immutable/expected.js b/test/js/samples/component-static-immutable/expected.js index 817db4e494b6..17b42a4a43ff 100644 --- a/test/js/samples/component-static-immutable/expected.js +++ b/test/js/samples/component-static-immutable/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, create_component, diff --git a/test/js/samples/component-static-immutable2/expected.js b/test/js/samples/component-static-immutable2/expected.js index 817db4e494b6..17b42a4a43ff 100644 --- a/test/js/samples/component-static-immutable2/expected.js +++ b/test/js/samples/component-static-immutable2/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, create_component, diff --git a/test/js/samples/component-static-var/expected.js b/test/js/samples/component-static-var/expected.js index 0120b2c8cf48..29c585744eac 100644 --- a/test/js/samples/component-static-var/expected.js +++ b/test/js/samples/component-static-var/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, create_component, diff --git a/test/js/samples/component-static/expected.js b/test/js/samples/component-static/expected.js index 76321cfd8288..16d9ea9c4c6e 100644 --- a/test/js/samples/component-static/expected.js +++ b/test/js/samples/component-static/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, create_component, diff --git a/test/js/samples/component-store-access-invalidate/expected.js b/test/js/samples/component-store-access-invalidate/expected.js index 713c4108b7a6..b3eedd3d6e7a 100644 --- a/test/js/samples/component-store-access-invalidate/expected.js +++ b/test/js/samples/component-store-access-invalidate/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/component-store-file-invalidate/expected.js b/test/js/samples/component-store-file-invalidate/expected.js index 5a466d778676..a4d7ad5c10f9 100644 --- a/test/js/samples/component-store-file-invalidate/expected.js +++ b/test/js/samples/component-store-file-invalidate/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, component_subscribe, diff --git a/test/js/samples/component-store-reassign-invalidate/expected.js b/test/js/samples/component-store-reassign-invalidate/expected.js index 407cfc97308a..890e28f79c3c 100644 --- a/test/js/samples/component-store-reassign-invalidate/expected.js +++ b/test/js/samples/component-store-reassign-invalidate/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/computed-collapsed-if/expected.js b/test/js/samples/computed-collapsed-if/expected.js index d4b02892128c..4d3954358e3d 100644 --- a/test/js/samples/computed-collapsed-if/expected.js +++ b/test/js/samples/computed-collapsed-if/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, init, safe_not_equal } from "svelte/internal"; function instance($$self, $$props, $$invalidate) { diff --git a/test/js/samples/css-media-query/expected.js b/test/js/samples/css-media-query/expected.js index 18b357e0e2d5..f4776700599d 100644 --- a/test/js/samples/css-media-query/expected.js +++ b/test/js/samples/css-media-query/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/css-shadow-dom-keyframes/expected.js b/test/js/samples/css-shadow-dom-keyframes/expected.js index 9c342df87d14..a0a0ebe0211b 100644 --- a/test/js/samples/css-shadow-dom-keyframes/expected.js +++ b/test/js/samples/css-shadow-dom-keyframes/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteElement, detach, diff --git a/test/js/samples/data-attribute/expected.js b/test/js/samples/data-attribute/expected.js index bd4d3a54827b..674be31867af 100644 --- a/test/js/samples/data-attribute/expected.js +++ b/test/js/samples/data-attribute/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, attr, diff --git a/test/js/samples/debug-empty/expected.js b/test/js/samples/debug-empty/expected.js index 2238fa3ecf14..3c65e5a950ec 100644 --- a/test/js/samples/debug-empty/expected.js +++ b/test/js/samples/debug-empty/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponentDev, add_location, diff --git a/test/js/samples/debug-foo-bar-baz-things/expected.js b/test/js/samples/debug-foo-bar-baz-things/expected.js index 4a8c145f5ee0..4d6a0f61c60b 100644 --- a/test/js/samples/debug-foo-bar-baz-things/expected.js +++ b/test/js/samples/debug-foo-bar-baz-things/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponentDev, add_location, @@ -23,6 +24,7 @@ function get_each_context(ctx, list, i) { return child_ctx; } +// (8:0) {#each things as thing} function create_each_block(ctx) { let span; let t0_value = ctx.thing.name + ""; diff --git a/test/js/samples/debug-foo/expected.js b/test/js/samples/debug-foo/expected.js index a91ed932c8ca..3f502bc0ca14 100644 --- a/test/js/samples/debug-foo/expected.js +++ b/test/js/samples/debug-foo/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponentDev, add_location, @@ -23,6 +24,7 @@ function get_each_context(ctx, list, i) { return child_ctx; } +// (6:0) {#each things as thing} function create_each_block(ctx) { let span; let t0_value = ctx.thing.name + ""; diff --git a/test/js/samples/debug-hoisted/expected.js b/test/js/samples/debug-hoisted/expected.js index b43e4a2d69cc..7ab1d3348e9a 100644 --- a/test/js/samples/debug-hoisted/expected.js +++ b/test/js/samples/debug-hoisted/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponentDev, dispatch_dev, diff --git a/test/js/samples/debug-no-dependencies/expected.js b/test/js/samples/debug-no-dependencies/expected.js index 77473d37dfe4..903bdb83b683 100644 --- a/test/js/samples/debug-no-dependencies/expected.js +++ b/test/js/samples/debug-no-dependencies/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponentDev, destroy_each, @@ -21,6 +22,7 @@ function get_each_context(ctx, list, i) { return child_ctx; } +// (4:0) {#each things as thing, index} function create_each_block(ctx) { let t0; let t1_value = ctx.thing + ""; diff --git a/test/js/samples/debug-ssr-foo/expected.js b/test/js/samples/debug-ssr-foo/expected.js index 38d07e994e07..fe34a6a4fd42 100644 --- a/test/js/samples/debug-ssr-foo/expected.js +++ b/test/js/samples/debug-ssr-foo/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { create_ssr_component, debug, each, escape } from "svelte/internal"; const Component = create_ssr_component(($$result, $$props, $$bindings, $$slots) => { diff --git a/test/js/samples/deconflict-builtins/expected.js b/test/js/samples/deconflict-builtins/expected.js index 6d9574fd034c..54448a91b491 100644 --- a/test/js/samples/deconflict-builtins/expected.js +++ b/test/js/samples/deconflict-builtins/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, @@ -19,6 +20,7 @@ function get_each_context(ctx, list, i) { return child_ctx; } +// (5:0) {#each createElement as node} function create_each_block(ctx) { let span; let t_value = ctx.node + ""; diff --git a/test/js/samples/deconflict-globals/expected.js b/test/js/samples/deconflict-globals/expected.js index 92492dcd0552..6bd0c596b92f 100644 --- a/test/js/samples/deconflict-globals/expected.js +++ b/test/js/samples/deconflict-globals/expected.js @@ -1,4 +1,6 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, init, safe_not_equal } from "svelte/internal"; + import { onMount } from "svelte"; function instance($$self, $$props, $$invalidate) { 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 27e0b797a26c..f362a42db642 100644 --- a/test/js/samples/dev-warning-missing-data-computed/expected.js +++ b/test/js/samples/dev-warning-missing-data-computed/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponentDev, add_location, diff --git a/test/js/samples/dont-invalidate-this/expected.js b/test/js/samples/dont-invalidate-this/expected.js index a1365c36189e..98f638dfcfe9 100644 --- a/test/js/samples/dont-invalidate-this/expected.js +++ b/test/js/samples/dont-invalidate-this/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, detach, diff --git a/test/js/samples/dynamic-import/expected.js b/test/js/samples/dynamic-import/expected.js index 605f19983f01..4394e7d8a996 100644 --- a/test/js/samples/dynamic-import/expected.js +++ b/test/js/samples/dynamic-import/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, create_component, diff --git a/test/js/samples/each-block-array-literal/expected.js b/test/js/samples/each-block-array-literal/expected.js index c687748961ed..3804cab6bbd0 100644 --- a/test/js/samples/each-block-array-literal/expected.js +++ b/test/js/samples/each-block-array-literal/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, @@ -19,6 +20,7 @@ function get_each_context(ctx, list, i) { return child_ctx; } +// (9:0) {#each [a, b, c, d, e] as num} function create_each_block(ctx) { let span; let t_value = ctx.num + ""; diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js index 871b5570ca77..a2735ae9c4ef 100644 --- a/test/js/samples/each-block-changed-check/expected.js +++ b/test/js/samples/each-block-changed-check/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { HtmlTag, SvelteComponent, @@ -22,6 +23,7 @@ function get_each_context(ctx, list, i) { return child_ctx; } +// (8:0) {#each comments as comment, i} function create_each_block(ctx) { let div; let strong; @@ -163,13 +165,7 @@ function instance($$self, $$props, $$invalidate) { class Component extends SvelteComponent { constructor(options) { super(); - - init(this, options, instance, create_fragment, safe_not_equal, { - comments: 0, - elapsed: 0, - time: 0, - foo: 0 - }); + init(this, options, instance, create_fragment, safe_not_equal, { comments: 0, elapsed: 0, time: 0, foo: 0 }); } } diff --git a/test/js/samples/each-block-keyed-animated/expected.js b/test/js/samples/each-block-keyed-animated/expected.js index 9ca72054bef2..e3661764b1f6 100644 --- a/test/js/samples/each-block-keyed-animated/expected.js +++ b/test/js/samples/each-block-keyed-animated/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, @@ -22,6 +23,7 @@ function get_each_context(ctx, list, i) { return child_ctx; } +// (19:0) {#each things as thing (thing.id)} function create_each_block(key_1, ctx) { let div; let t_value = ctx.thing.name + ""; diff --git a/test/js/samples/each-block-keyed/expected.js b/test/js/samples/each-block-keyed/expected.js index a845fc833b6d..beb5a613bc04 100644 --- a/test/js/samples/each-block-keyed/expected.js +++ b/test/js/samples/each-block-keyed/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, @@ -20,6 +21,7 @@ function get_each_context(ctx, list, i) { return child_ctx; } +// (5:0) {#each things as thing (thing.id)} function create_each_block(key_1, ctx) { let div; let t_value = ctx.thing.name + ""; diff --git a/test/js/samples/empty-dom/expected.js b/test/js/samples/empty-dom/expected.js index 6ae0bc2999dc..bd5a9fb7ef24 100644 --- a/test/js/samples/empty-dom/expected.js +++ b/test/js/samples/empty-dom/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, init, safe_not_equal } from "svelte/internal"; function instance($$self) { diff --git a/test/js/samples/event-handler-dynamic/expected.js b/test/js/samples/event-handler-dynamic/expected.js index 0678d229b9dd..515d7e36a9c4 100644 --- a/test/js/samples/event-handler-dynamic/expected.js +++ b/test/js/samples/event-handler-dynamic/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/event-handler-no-passive/expected.js b/test/js/samples/event-handler-no-passive/expected.js index bd6f2230a5eb..6f04e678083e 100644 --- a/test/js/samples/event-handler-no-passive/expected.js +++ b/test/js/samples/event-handler-no-passive/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, attr, diff --git a/test/js/samples/event-modifiers/expected.js b/test/js/samples/event-modifiers/expected.js index 831374f98805..3f324bb76d3b 100644 --- a/test/js/samples/event-modifiers/expected.js +++ b/test/js/samples/event-modifiers/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/head-no-whitespace/expected.js b/test/js/samples/head-no-whitespace/expected.js index 87c7b53260e8..444bad3fd48a 100644 --- a/test/js/samples/head-no-whitespace/expected.js +++ b/test/js/samples/head-no-whitespace/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/hoisted-const/expected.js b/test/js/samples/hoisted-const/expected.js index f47afe2d49fc..2842b547516e 100644 --- a/test/js/samples/hoisted-const/expected.js +++ b/test/js/samples/hoisted-const/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, detach, diff --git a/test/js/samples/hoisted-let/expected.js b/test/js/samples/hoisted-let/expected.js index f570417d106b..285b12411835 100644 --- a/test/js/samples/hoisted-let/expected.js +++ b/test/js/samples/hoisted-let/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, detach, diff --git a/test/js/samples/if-block-complex/expected.js b/test/js/samples/if-block-complex/expected.js index 05ce7d49fa1d..badae4a2c0ee 100644 --- a/test/js/samples/if-block-complex/expected.js +++ b/test/js/samples/if-block-complex/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, attr, diff --git a/test/js/samples/if-block-no-update/expected.js b/test/js/samples/if-block-no-update/expected.js index 51bffe061330..b057041e8882 100644 --- a/test/js/samples/if-block-no-update/expected.js +++ b/test/js/samples/if-block-no-update/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, detach, @@ -26,6 +27,7 @@ function create_else_block(ctx) { }; } +// (5:0) {#if foo} function create_if_block(ctx) { let p; diff --git a/test/js/samples/if-block-simple/expected.js b/test/js/samples/if-block-simple/expected.js index 74472a446001..fd2185b86d60 100644 --- a/test/js/samples/if-block-simple/expected.js +++ b/test/js/samples/if-block-simple/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, detach, diff --git a/test/js/samples/inline-style-optimized-multiple/expected.js b/test/js/samples/inline-style-optimized-multiple/expected.js index d29504ec27af..636a4f19bb55 100644 --- a/test/js/samples/inline-style-optimized-multiple/expected.js +++ b/test/js/samples/inline-style-optimized-multiple/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, detach, diff --git a/test/js/samples/inline-style-optimized-url/expected.js b/test/js/samples/inline-style-optimized-url/expected.js index a76b580c74d0..53a9434369b4 100644 --- a/test/js/samples/inline-style-optimized-url/expected.js +++ b/test/js/samples/inline-style-optimized-url/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, detach, diff --git a/test/js/samples/inline-style-optimized/expected.js b/test/js/samples/inline-style-optimized/expected.js index e953ae7eed2a..95079a63fe34 100644 --- a/test/js/samples/inline-style-optimized/expected.js +++ b/test/js/samples/inline-style-optimized/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, detach, diff --git a/test/js/samples/inline-style-unoptimized/expected.js b/test/js/samples/inline-style-unoptimized/expected.js index 7518d5805d4f..93692daa320e 100644 --- a/test/js/samples/inline-style-unoptimized/expected.js +++ b/test/js/samples/inline-style-unoptimized/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, attr, diff --git a/test/js/samples/inline-style-without-updates/expected.js b/test/js/samples/inline-style-without-updates/expected.js index fd101d1acc9d..375896f259ea 100644 --- a/test/js/samples/inline-style-without-updates/expected.js +++ b/test/js/samples/inline-style-without-updates/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, detach, diff --git a/test/js/samples/input-files/expected.js b/test/js/samples/input-files/expected.js index 256c7e5a5fa4..a190d6cf7228 100644 --- a/test/js/samples/input-files/expected.js +++ b/test/js/samples/input-files/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, attr, diff --git a/test/js/samples/input-no-initial-value/expected.js b/test/js/samples/input-no-initial-value/expected.js index f3067156b50c..85bc9dfcefc0 100644 --- a/test/js/samples/input-no-initial-value/expected.js +++ b/test/js/samples/input-no-initial-value/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, @@ -70,11 +71,7 @@ function instance($$self, $$props, $$invalidate) { $$invalidate("test", test); } - return { - test, - handleSubmit, - input_input_handler - }; + return { test, handleSubmit, input_input_handler }; } class Component extends SvelteComponent { diff --git a/test/js/samples/input-range/expected.js b/test/js/samples/input-range/expected.js index 4b6212c4e787..2ea13df0380b 100644 --- a/test/js/samples/input-range/expected.js +++ b/test/js/samples/input-range/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, attr, diff --git a/test/js/samples/input-without-blowback-guard/expected.js b/test/js/samples/input-without-blowback-guard/expected.js index 921c2171973e..eacdbece8362 100644 --- a/test/js/samples/input-without-blowback-guard/expected.js +++ b/test/js/samples/input-without-blowback-guard/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, attr, diff --git a/test/js/samples/instrumentation-script-if-no-block/expected.js b/test/js/samples/instrumentation-script-if-no-block/expected.js index 6e9c04f161f3..4b0574b79dda 100644 --- a/test/js/samples/instrumentation-script-if-no-block/expected.js +++ b/test/js/samples/instrumentation-script-if-no-block/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/instrumentation-script-x-equals-x/expected.js b/test/js/samples/instrumentation-script-x-equals-x/expected.js index c7652815d88c..8a3fa9366a3b 100644 --- a/test/js/samples/instrumentation-script-x-equals-x/expected.js +++ b/test/js/samples/instrumentation-script-x-equals-x/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/instrumentation-template-if-no-block/expected.js b/test/js/samples/instrumentation-template-if-no-block/expected.js index aa815dfe0067..e2d8c4466f95 100644 --- a/test/js/samples/instrumentation-template-if-no-block/expected.js +++ b/test/js/samples/instrumentation-template-if-no-block/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/instrumentation-template-x-equals-x/expected.js b/test/js/samples/instrumentation-template-x-equals-x/expected.js index 5af948efb13e..eefda55f31d8 100644 --- a/test/js/samples/instrumentation-template-x-equals-x/expected.js +++ b/test/js/samples/instrumentation-template-x-equals-x/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/legacy-input-type/expected.js b/test/js/samples/legacy-input-type/expected.js index b067a07dfd50..2b76a485225a 100644 --- a/test/js/samples/legacy-input-type/expected.js +++ b/test/js/samples/legacy-input-type/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, detach, diff --git a/test/js/samples/media-bindings/expected.js b/test/js/samples/media-bindings/expected.js index a48ac2e500b1..1d90e0849e43 100644 --- a/test/js/samples/media-bindings/expected.js +++ b/test/js/samples/media-bindings/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, add_render_callback, diff --git a/test/js/samples/non-imported-component/expected.js b/test/js/samples/non-imported-component/expected.js index be1ff282c360..2784fd17acb3 100644 --- a/test/js/samples/non-imported-component/expected.js +++ b/test/js/samples/non-imported-component/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, create_component, diff --git a/test/js/samples/non-mutable-reference/expected.js b/test/js/samples/non-mutable-reference/expected.js index e22c773e9c8b..93f2145a2e65 100644 --- a/test/js/samples/non-mutable-reference/expected.js +++ b/test/js/samples/non-mutable-reference/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, detach, diff --git a/test/js/samples/reactive-values-non-topologically-ordered/expected.js b/test/js/samples/reactive-values-non-topologically-ordered/expected.js index 69fd368ee84d..3d1b6aaae3f7 100644 --- a/test/js/samples/reactive-values-non-topologically-ordered/expected.js +++ b/test/js/samples/reactive-values-non-topologically-ordered/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, init, safe_not_equal } from "svelte/internal"; function instance($$self, $$props, $$invalidate) { diff --git a/test/js/samples/reactive-values-non-writable-dependencies/expected.js b/test/js/samples/reactive-values-non-writable-dependencies/expected.js index 233e9ef83566..393af95df027 100644 --- a/test/js/samples/reactive-values-non-writable-dependencies/expected.js +++ b/test/js/samples/reactive-values-non-writable-dependencies/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, init, safe_not_equal } from "svelte/internal"; function instance($$self, $$props, $$invalidate) { diff --git a/test/js/samples/select-dynamic-value/expected.js b/test/js/samples/select-dynamic-value/expected.js index 7232d01af482..da284d977a4a 100644 --- a/test/js/samples/select-dynamic-value/expected.js +++ b/test/js/samples/select-dynamic-value/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/setup-method/expected.js b/test/js/samples/setup-method/expected.js index e22398748e6b..5ee43a9f1f16 100644 --- a/test/js/samples/setup-method/expected.js +++ b/test/js/samples/setup-method/expected.js @@ -1,4 +1,6 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, init, safe_not_equal } from "svelte/internal"; + const SOME_CONSTANT = 42; function foo(bar) { diff --git a/test/js/samples/ssr-no-oncreate-etc/expected.js b/test/js/samples/ssr-no-oncreate-etc/expected.js index 1157c77855af..276587eeca14 100644 --- a/test/js/samples/ssr-no-oncreate-etc/expected.js +++ b/test/js/samples/ssr-no-oncreate-etc/expected.js @@ -1,4 +1,6 @@ +/* generated by Svelte vX.Y.Z */ import { create_ssr_component } from "svelte/internal"; + import { onDestroy, onMount } from "svelte"; function preload(input) { diff --git a/test/js/samples/ssr-preserve-comments/expected.js b/test/js/samples/ssr-preserve-comments/expected.js index 872cc2bca0fa..1dc12710c0bb 100644 --- a/test/js/samples/ssr-preserve-comments/expected.js +++ b/test/js/samples/ssr-preserve-comments/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { create_ssr_component } from "svelte/internal"; const Component = create_ssr_component(($$result, $$props, $$bindings, $$slots) => { diff --git a/test/js/samples/svg-title/expected.js b/test/js/samples/svg-title/expected.js index 8c4fc36d7371..cd7ae3b55152 100644 --- a/test/js/samples/svg-title/expected.js +++ b/test/js/samples/svg-title/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/title/expected.js b/test/js/samples/title/expected.js index 0748cdcf2b10..205f35295048 100644 --- a/test/js/samples/title/expected.js +++ b/test/js/samples/title/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, init, noop, safe_not_equal } from "svelte/internal"; function create_fragment(ctx) { diff --git a/test/js/samples/transition-local/expected.js b/test/js/samples/transition-local/expected.js index a9ed7999f7c3..7fa88f4254f8 100644 --- a/test/js/samples/transition-local/expected.js +++ b/test/js/samples/transition-local/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, add_render_callback, @@ -47,6 +48,7 @@ function create_if_block(ctx) { }; } +// (9:1) {#if y} function create_if_block_1(ctx) { let div; let div_intro; diff --git a/test/js/samples/transition-repeated-outro/expected.js b/test/js/samples/transition-repeated-outro/expected.js index 001383a14e25..c40818dc4e6c 100644 --- a/test/js/samples/transition-repeated-outro/expected.js +++ b/test/js/samples/transition-repeated-outro/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, check_outros, diff --git a/test/js/samples/unchanged-expression/expected.js b/test/js/samples/unchanged-expression/expected.js index 1dc7c6fd72a7..231960bb49a3 100644 --- a/test/js/samples/unchanged-expression/expected.js +++ b/test/js/samples/unchanged-expression/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/unreferenced-state-not-invalidated/expected.js b/test/js/samples/unreferenced-state-not-invalidated/expected.js index 9b53d50915e7..f0409c3cca6e 100644 --- a/test/js/samples/unreferenced-state-not-invalidated/expected.js +++ b/test/js/samples/unreferenced-state-not-invalidated/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, diff --git a/test/js/samples/use-elements-as-anchors/expected.js b/test/js/samples/use-elements-as-anchors/expected.js index 135dca5685f2..eeaba55ed08e 100644 --- a/test/js/samples/use-elements-as-anchors/expected.js +++ b/test/js/samples/use-elements-as-anchors/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, append, @@ -28,6 +29,7 @@ function create_if_block_4(ctx) { }; } +// (16:1) {#if b} function create_if_block_3(ctx) { let p; @@ -45,6 +47,7 @@ function create_if_block_3(ctx) { }; } +// (20:1) {#if c} function create_if_block_2(ctx) { let p; @@ -62,6 +65,7 @@ function create_if_block_2(ctx) { }; } +// (26:1) {#if d} function create_if_block_1(ctx) { let p; @@ -79,6 +83,7 @@ function create_if_block_1(ctx) { }; } +// (33:0) {#if e} function create_if_block(ctx) { let p; diff --git a/test/js/samples/window-binding-online/expected.js b/test/js/samples/window-binding-online/expected.js index 92494fb75303..d34e84330f77 100644 --- a/test/js/samples/window-binding-online/expected.js +++ b/test/js/samples/window-binding-online/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, add_render_callback, diff --git a/test/js/samples/window-binding-scroll/expected.js b/test/js/samples/window-binding-scroll/expected.js index 4cd784e2bf90..85d894119b14 100644 --- a/test/js/samples/window-binding-scroll/expected.js +++ b/test/js/samples/window-binding-scroll/expected.js @@ -1,3 +1,4 @@ +/* generated by Svelte vX.Y.Z */ import { SvelteComponent, add_render_callback, From 98519802e89db8b50b9f87d9882a01c30d10b89a Mon Sep 17 00:00:00 2001 From: Richard Harris Date: Sat, 9 Nov 2019 13:06:04 -0500 Subject: [PATCH 4/4] update code-red, enable all tests --- package-lock.json | 6 +++--- package.json | 4 ++-- test/js/index.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 20a0d4a9a4e2..040a9d174fb4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -500,9 +500,9 @@ "dev": true }, "code-red": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/code-red/-/code-red-0.0.18.tgz", - "integrity": "sha512-g7W6RwRqBbQTtMaUqrNWDyyl2GK0Uulk/uZPzGdgTXpOGX/LA8bW67EKQLdQgpYfd6APhZVwoX2lrL7mnJOWkA==", + "version": "0.0.19", + "resolved": "https://registry.npmjs.org/code-red/-/code-red-0.0.19.tgz", + "integrity": "sha512-pzkA9ikMLR7KatByUJVz33kQKkrDnsJhyuvxSSUnyJNBggkGNStmDe/ezYvfP4CZ9XM7vYIID+YIaMJnlYGzLg==", "dev": true, "requires": { "acorn": "^7.1.0", diff --git a/package.json b/package.json index 27f330f9fc39..9f49a0ba7cc8 100644 --- a/package.json +++ b/package.json @@ -56,15 +56,15 @@ }, "homepage": "https://github.com/sveltejs/svelte#README", "devDependencies": { + "@rollup/plugin-replace": "^2.2.1", "@types/mocha": "^5.2.7", "@types/node": "^8.10.53", "@typescript-eslint/eslint-plugin": "^1.13.0", "@typescript-eslint/parser": "^2.1.0", - "@rollup/plugin-replace": "^2.2.1", "acorn": "^7.1.0", "agadoo": "^1.1.0", "c8": "^5.0.1", - "code-red": "0.0.18", + "code-red": "0.0.19", "codecov": "^3.5.0", "css-tree": "1.0.0-alpha22", "eslint": "^6.3.0", diff --git a/test/js/index.js b/test/js/index.js index d4026401c9b6..5fd632d60629 100644 --- a/test/js/index.js +++ b/test/js/index.js @@ -3,7 +3,7 @@ import * as fs from "fs"; import * as path from "path"; import { loadConfig, svelte } from "../helpers.js"; -describe.only("js", () => { +describe("js", () => { fs.readdirSync(`${__dirname}/samples`).forEach(dir => { if (dir[0] === ".") return;