v2

test/runtime/index.js

@@ -21,11 +21,11 @@ let compileOptions = null;
 let compile = null;
 
 function getName(filename) {
-	const base = path.basename(filename).replace('-v2', '').replace(".html", "");
+	const base = path.basename(filename).replace(".html", "");
 	return base[0].toUpperCase() + base.slice(1);
 }
 
-describe("runtime", () => {
+describe.only("runtime", () => {
 	before(() => {
 		svelte = loadSvelte(false);
 		svelte$ = loadSvelte(true);
@@ -46,7 +46,7 @@ describe("runtime", () => {
 
 	const failed = new Set();
 
-	function runTest(dir, shared, hydrate, v2) {
+	function runTest(dir, shared, hydrate) {
 		if (dir[0] === ".") return;
 
 		const config = loadConfig(`./runtime/samples/${dir}/_config.js`);
@@ -55,7 +55,7 @@ describe("runtime", () => {
 			throw new Error("Forgot to remove `solo: true` from test");
 		}
 
-		(config.skip ? it.skip : config.solo ? it.only : it)(`${dir} (${shared ? 'shared' : 'inline'} helpers${hydrate ? ', hydration' : ''}${v2 ? ', v2' : ''})`, () => {
+		(config.skip ? it.skip : config.solo ? it.only : it)(`${dir} (${shared ? 'shared' : 'inline'} helpers${hydrate ? ', hydration' : ''})`, () => {
 			if (failed.has(dir)) {
 				// this makes debugging easier, by only printing compiled output once
 				throw new Error('skipping test, already failed');
@@ -72,7 +72,7 @@ describe("runtime", () => {
 			compileOptions.dev = config.dev;
 			compileOptions.store = !!config.store;
 			compileOptions.immutable = config.immutable;
-			compileOptions.parser = v2 ? 'v2' : 'v1';
+			compileOptions.parser = 'v2'; // TODO remove
 
 			Object.keys(require.cache)
 				.filter(x => x.endsWith(".html"))
@@ -112,7 +112,7 @@ describe("runtime", () => {
 					};
 
 					try {
-						SvelteComponent = require(`./samples/${dir}/main${v2 ? '-v2' : ''}.html`);
+						SvelteComponent = require(`./samples/${dir}/main.html`);
 					} catch (err) {
 						showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store }, compile); // eslint-disable-line no-console
 						throw err;
@@ -172,12 +172,12 @@ describe("runtime", () => {
 						config.error(assert, err);
 					} else {
 						failed.add(dir);
-						showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store, v2 }, compile); // eslint-disable-line no-console
+						showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store, v2: true }, compile); // eslint-disable-line no-console
 						throw err;
 					}
 				})
 				.then(() => {
-					if (config.show) showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store, v2 }, compile);
+					if (config.show) showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store, v2: true }, compile);
 				});
 		});
 	}
@@ -187,10 +187,6 @@ describe("runtime", () => {
 		runTest(dir, shared, false);
 		runTest(dir, shared, true);
 		runTest(dir, null, false);
-
-		if (fs.existsSync(`test/runtime/samples/${dir}/main-v2.html`)) {
-			runTest(dir, shared, false, true);
-		}
 	});
 
 	it("fails if options.target is missing in dev mode", () => {

test/runtime/samples/action-this/main.html

@@ -1,4 +1,4 @@
-<button use:foo>{{x}}</button>
+<button use:foo>{x}</button>
 
 <script>
 	export default {

test/runtime/samples/action-update/main.html

@@ -1,5 +1,5 @@
 <button use:tooltip="tooltip">action</button>
-<:Window on:keydown="checkForCtrl(event)" on:keyup="checkForCtrl(event)"/>
+<svelte:window on:keydown="checkForCtrl(event)" on:keyup="checkForCtrl(event)"/>
 
 <script>
 	export default {
@@ -36,7 +36,7 @@
 
 				node.addEventListener('mouseenter', onMouseEnter);
 				node.addEventListener('mouseleave', onMouseLeave);
-				
+
 				return {
 					update(text) {
 						if (tooltip) tooltip.textContent = text;

test/runtime/samples/attribute-boolean-false/main.html

@@ -1 +1 @@
-<textarea readonly="{{false}}"></textarea>
+<textarea readonly="{false}"></textarea>

test/runtime/samples/attribute-boolean-indeterminate/main.html

@@ -1 +1 @@
-<input type='checkbox' indeterminate='{{indeterminate}}'>
+<input type='checkbox' indeterminate='{indeterminate}'>

test/runtime/samples/attribute-boolean-true/main.html

@@ -1 +1 @@
-<textarea readonly="{{true}}"></textarea>
+<textarea readonly="{true}"></textarea>

test/runtime/samples/attribute-dynamic-multiple/main.html

@@ -1,3 +1,3 @@
-{{#each items as item, i}}
-	<div class='{{item.foo ? "foo" : ""}} {{item.bar ? "bar" : ""}}'>{{i + 1}}</div>
-{{/each}}
+{#each items as item, i}
+	<div class='{item.foo ? "foo" : ""} {item.bar ? "bar" : ""}'>{i + 1}</div>
+{/each}

test/runtime/samples/attribute-dynamic-quotemarks/main.html

@@ -1 +1 @@
-<span title='{{"\"foo\""}}'>foo</span>
+<span title='{"\"foo\""}'>foo</span>

test/runtime/samples/attribute-dynamic-reserved/main.html

@@ -1 +1 @@
-<div class='{{class}}'></div>{{123}}
+<div class='{class}'></div>{123}

test/runtime/samples/attribute-dynamic-shorthand/main.html

@@ -1,4 +1,4 @@
-<div :id/>
+<div {id}/>
 
 <script>
 	export default {

test/runtime/samples/attribute-dynamic-type/main.html

@@ -1 +1 @@
-<input type='{{inputType}}' value='{{inputValue}}'>
+<input type='{inputType}' value='{inputValue}'>

test/runtime/samples/attribute-dynamic/main.html

@@ -1,4 +1,4 @@
-<div style='color: {{color}};'>{{color}}</div>
+<div style='color: {color};'>{color}</div>
 
 <script>
 	export default {

test/runtime/samples/attribute-namespaced/main.html

@@ -1,3 +1,3 @@
 <svg>
-	<use xlink:href="#{{foo}}"/>
+	<use xlink:href="#{foo}"/>
 </svg>

test/runtime/samples/attribute-partial-number/Component.html

@@ -1 +1 @@
-<p data-value="{{value}}"></p>
+<p data-value="{value}"></p>

test/runtime/samples/attribute-prefer-expression/main.html

@@ -1,2 +1,2 @@
-<input type='radio' bind:group='foo' value='{{false}}'>
-<input type='radio' bind:group='foo' value='{{true}}'>
+<input type='radio' bind:group='foo' value='{false}'>
+<input type='radio' bind:group='foo' value='{true}'>

test/runtime/samples/autofocus/main.html

@@ -1,3 +1,3 @@
-{{#if visible}}
+{#if visible}
 	<input ref:input autofocus>
-{{/if}}
+{/if}

test/runtime/samples/await-component-oncreate/Foo.html

@@ -1,5 +1,5 @@
-<p>{{value}}</p>
-<p>{{called}}</p>
+<p>{value}</p>
+<p>{called}</p>
 
 <script>
 	export default {

test/runtime/samples/await-component-oncreate/main.html

@@ -1,6 +1,6 @@
-{{#await promise then value}}
-	<Foo :value />
-{{/await}}
+{#await promise then value}
+	<Foo {value} />
+{/await}
 
 <script>
 	import Foo from './Foo.html';

test/runtime/samples/await-set-simultaneous/main.html

@@ -1,9 +1,9 @@
-{{#if promise}}
-	{{#await promise}}
+{#if promise}
+	{#await promise}
 		<p>wait for it...</p>
-	{{then _}}
-		<p>the answer is {{answer}}!</p>
-	{{catch error}}
+	{:then _}
+		<p>the answer is {answer}!</p>
+	{:catch error}
 		<p>well that's odd</p>
-	{{/await}}
-{{/if}}
+	{/await}
+{/if}

test/runtime/samples/await-then-catch-anchor/main.html

@@ -1,9 +1,9 @@
 <div>
-{{#await thePromise}}
+{#await thePromise}
 <p>loading...</p>
-{{then theValue}}
-<p>the value is {{theValue}}</p>
-{{catch theError}}
-<p>oh no! {{theError.message}}</p>
-{{/await}}
+{:then theValue}
+<p>the value is {theValue}</p>
+{:catch theError}
+<p>oh no! {theError.message}</p>
+{/await}
 </div>

test/runtime/samples/await-then-catch-event/main.html

@@ -1,7 +1,7 @@
-{{#await thePromise}}
+{#await thePromise}
 	<p>loading...</p>
-{{then theValue}}
+{:then theValue}
 	<button ref:button on:click='set({ clicked: theValue })'>click me</button>
-{{catch theError}}
-	<p>oh no! {{theError.message}}</p>
-{{/await}}
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}

test/runtime/samples/await-then-catch-if/main.html

@@ -1,11 +1,11 @@
-{{#if show}}
-{{#await thePromise}}
+{#if show}
+{#await thePromise}
 <p>loading...</p>
-{{then theValue}}
-<p>the value is {{theValue}}</p>
-{{catch theError}}
-<p>oh no! {{theError.message}}</p>
-{{/await}}
-{{else}}
+{:then theValue}
+<p>the value is {theValue}</p>
+{:catch theError}
+<p>oh no! {theError.message}</p>
+{/await}
+{:else}
 <p>Else</p>
-{{/if}}
+{/if}

test/runtime/samples/await-then-catch-in-slot/main.html

@@ -1,11 +1,11 @@
 <Foo>
-	{{#await thePromise}}
+	{#await thePromise}
 		<p>loading...</p>
-	{{then theValue}}
-		<p>the value is {{theValue}}</p>
-	{{catch theError}}
-		<p>oh no! {{theError.message}}</p>
-	{{/await}}
+	{:then theValue}
+		<p>the value is {theValue}</p>
+	{:catch theError}
+		<p>oh no! {theError.message}</p>
+	{/await}
 </Foo>
 
 <script>

test/runtime/samples/await-then-catch-multiple/main.html

@@ -1,15 +1,15 @@
-{{#await thePromise}}
+{#await thePromise}
 	<p>loading...</p>
-{{then theValue}}
-	<p>the value is {{theValue}}</p>
-{{catch theError}}
-	<p>oh no! {{theError.message}}</p>
-{{/await}}
+{:then theValue}
+	<p>the value is {theValue}</p>
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}
 
-{{#await thePromise}}
+{#await thePromise}
 	<p>loading...</p>
-{{then theValue}}
-	<p>the value is {{theValue}}</p>
-{{catch theError}}
-	<p>oh no! {{theError.message}}</p>
-{{/await}}
+{:then theValue}
+	<p>the value is {theValue}</p>
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}

test/runtime/samples/await-then-catch-non-promise/main.html

@@ -1,7 +1,7 @@
-{{#await thePromise}}
+{#await thePromise}
 	<p>loading...</p>
-{{then theValue}}
-	<p>the value is {{theValue}}</p>
-{{catch theError}}
-	<p>oh no! {{theError.message}}</p>
-{{/await}}
+{:then theValue}
+	<p>the value is {theValue}</p>
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}

test/runtime/samples/await-then-catch/main.html

@@ -1,7 +1,7 @@
-{{#await thePromise}}
+{#await thePromise}
 	<p>loading...</p>
-{{then theValue}}
-	<p>the value is {{theValue}}</p>
-{{catch theError}}
-	<p>oh no! {{theError.message}}</p>
-{{/await}}
+{:then theValue}
+	<p>the value is {theValue}</p>
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}