add skipIntroByDefault compiler option (#547)

sveltejs · May 12, 2018 · 44bb2da · 44bb2da
1 parent 3c1bcfa
commit 44bb2da
Show file tree

Hide file tree

Showing 94 changed files with 282 additions and 224 deletions.
diff --git a/src/compile/dom/index.ts b/src/compile/dom/index.ts
@@ -227,7 +227,7 @@ export default function dom(
 			this._fragment.c();
 			this._fragment.${block.hasIntroMethod ? 'i' : 'm'}(this.shadowRoot, null);
 
-			if (options.target) this._mount(options.target, options.anchor);
+			if (options.target) this._mount(options.target, options.anchor, ${options.skipIntroByDefault ? `options.intro` : 'true'});
 		` : deindent`
 			if (options.target) {
 				${compiler.options.hydratable
@@ -240,7 +240,7 @@ export default function dom(
 						${options.dev && `if (options.hydrate) throw new Error("options.hydrate only works if the component was compiled with the \`hydratable: true\` option");`}
 						this._fragment.c();
 					`}
-				this._mount(options.target, options.anchor);
+				this._mount(options.target, options.anchor, ${options.skipIntroByDefault ? `options.intro` : 'true'});
 
 				${(compiler.hasComponents || target.hasComplexBindings || hasInitHooks || target.hasIntroTransitions) && deindent`
 					${compiler.hasComponents && `this._lock = true;`}

diff --git a/src/compile/nodes/Component.ts b/src/compile/nodes/Component.ts
@@ -383,7 +383,7 @@ export default class Component extends Node {
 
 			block.builders.mount.addBlock(deindent`
 				if (${name}) {
-					${name}._mount(${parentNode || '#target'}, ${parentNode ? 'null' : 'anchor'});
+					${name}._mount(${parentNode || '#target'}, ${parentNode ? 'null' : 'anchor'}, ${compiler.options.skipIntroByDefault ? 'false' : 'true'});
 					${this.ref && `#component.refs.${this.ref} = ${name};`}
 				}
 			`);
@@ -405,7 +405,7 @@ export default class Component extends Node {
 						${name}._fragment.c();
 
 						${this.children.map(child => child.remount(name))}
-						${name}._mount(${updateMountNode}, ${anchor});
+						${name}._mount(${updateMountNode}, ${anchor}, ${compiler.options.skipIntroByDefault ? 'false' : 'true'});
 
 						${this.handlers.map(handler => deindent`
 							${name}.on("${handler.name}", ${handler.var});
@@ -464,7 +464,7 @@ export default class Component extends Node {
 			}
 
 			block.builders.mount.addLine(
-				`${name}._mount(${parentNode || '#target'}, ${parentNode ? 'null' : 'anchor'});`
+				`${name}._mount(${parentNode || '#target'}, ${parentNode ? 'null' : 'anchor'}, ${compiler.options.skipIntroByDefault ? 'false' : 'true'});`
 			);
 
 			if (updates.length) {
@@ -483,7 +483,7 @@ export default class Component extends Node {
 	}
 
 	remount(name: string) {
-		return `${this.var}._mount(${name}._slotted.default, null);`;
+		return `${this.var}._mount(${name}._slotted.default, null, ${this.compiler.options.skipIntroByDefault ? 'false' : 'true'});`;
 	}
 
 	ssr() {

diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -64,6 +64,9 @@ export interface CompileOptions {
 
 	onerror?: (error: Error) => void;
 	onwarn?: (warning: Warning) => void;
+
+	// to remove in v3
+	skipIntroByDefault?: boolean;
 }
 
 export interface GenerateOptions {

diff --git a/src/shared/index.js b/src/shared/index.js
@@ -128,8 +128,8 @@ export function callAll(fns) {
 	while (fns && fns.length) fns.shift()();
 }
 
-export function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+export function _mount(target, anchor, intro) {
+	this._fragment[intro && this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
 export var PENDING = {};

diff --git a/test/cli/samples/basic/expected/Main.js b/test/cli/samples/basic/expected/Main.js
@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.4.4 */
+/* src/Main.html generated by Svelte v2.5.1 */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -31,7 +31,7 @@ function Main(options) {
 
 	if (options.target) {
 		this._fragment.c();
-		this._mount(options.target, options.anchor);
+		this._mount(options.target, options.anchor, true);
 	}
 }
 
@@ -149,8 +149,8 @@ function _set(newState) {
 	}
 }
 
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+function _mount(target, anchor, intro) {
+	this._fragment[intro && this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
 function _differs(a, b) {

diff --git a/test/cli/samples/custom-element/expected/Main.js b/test/cli/samples/custom-element/expected/Main.js
@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.4.4 */
+/* src/Main.html generated by Svelte v2.5.1 */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -37,7 +37,7 @@ class Main extends HTMLElement {
 		this._fragment.c();
 		this._fragment.m(this.shadowRoot, null);
 
-		if (options.target) this._mount(options.target, options.anchor);
+		if (options.target) this._mount(options.target, options.anchor, true);
 	}
 
 	static get observedAttributes() {
@@ -170,8 +170,8 @@ function _set(newState) {
 	}
 }
 
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+function _mount(target, anchor, intro) {
+	this._fragment[intro && this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
 function _differs(a, b) {

diff --git a/test/cli/samples/dev/expected/Main.js b/test/cli/samples/dev/expected/Main.js
@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.4.4 */
+/* src/Main.html generated by Svelte v2.5.1 */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -34,7 +34,7 @@ function Main(options) {
 	if (options.target) {
 		if (options.hydrate) throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");
 		this._fragment.c();
-		this._mount(options.target, options.anchor);
+		this._mount(options.target, options.anchor, true);
 	}
 }
 
@@ -153,8 +153,8 @@ function _set(newState) {
 	}
 }
 
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+function _mount(target, anchor, intro) {
+	this._fragment[intro && this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
 function _differs(a, b) {

diff --git a/test/cli/samples/dir-sourcemap/expected/Main.js b/test/cli/samples/dir-sourcemap/expected/Main.js
diff --git a/test/cli/samples/dir-sourcemap/expected/Widget.js b/test/cli/samples/dir-sourcemap/expected/Widget.js
diff --git a/test/cli/samples/dir-subdir/expected/Main.js b/test/cli/samples/dir-subdir/expected/Main.js
@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.4.4 */
+/* src/Main.html generated by Svelte v2.5.1 */
 import Widget from './widget/Widget.html';
 
 
@@ -15,7 +15,7 @@ function create_main_fragment(component, ctx) {
 		},
 
 		m(target, anchor) {
-			widget._mount(target, anchor);
+			widget._mount(target, anchor, true);
 		},
 
 		p: noop,
@@ -40,7 +40,7 @@ function Main(options) {
 
 	if (options.target) {
 		this._fragment.c();
-		this._mount(options.target, options.anchor);
+		this._mount(options.target, options.anchor, true);
 
 		this._lock = true;
 		callAll(this._beforecreate);
@@ -156,8 +156,8 @@ function _set(newState) {
 	}
 }
 
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+function _mount(target, anchor, intro) {
+	this._fragment[intro && this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
 function _differs(a, b) {

diff --git a/test/cli/samples/dir-subdir/expected/widget/Widget.js b/test/cli/samples/dir-subdir/expected/widget/Widget.js
@@ -1,4 +1,4 @@
-/* src/widget/Widget.html generated by Svelte v2.4.4 */
+/* src/widget/Widget.html generated by Svelte v2.5.1 */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -31,7 +31,7 @@ function Widget(options) {
 
 	if (options.target) {
 		this._fragment.c();
-		this._mount(options.target, options.anchor);
+		this._mount(options.target, options.anchor, true);
 	}
 }
 
@@ -149,8 +149,8 @@ function _set(newState) {
 	}
 }
 
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+function _mount(target, anchor, intro) {
+	this._fragment[intro && this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
 function _differs(a, b) {

diff --git a/test/cli/samples/dir/expected/Main.js b/test/cli/samples/dir/expected/Main.js
@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.4.4 */
+/* src/Main.html generated by Svelte v2.5.1 */
 import Widget from './Widget.html';
 
 
@@ -15,7 +15,7 @@ function create_main_fragment(component, ctx) {
 		},
 
 		m(target, anchor) {
-			widget._mount(target, anchor);
+			widget._mount(target, anchor, true);
 		},
 
 		p: noop,
@@ -40,7 +40,7 @@ function Main(options) {
 
 	if (options.target) {
 		this._fragment.c();
-		this._mount(options.target, options.anchor);
+		this._mount(options.target, options.anchor, true);
 
 		this._lock = true;
 		callAll(this._beforecreate);
@@ -156,8 +156,8 @@ function _set(newState) {
 	}
 }
 
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+function _mount(target, anchor, intro) {
+	this._fragment[intro && this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
 function _differs(a, b) {

diff --git a/test/cli/samples/dir/expected/Widget.js b/test/cli/samples/dir/expected/Widget.js
@@ -1,4 +1,4 @@
-/* src/Widget.html generated by Svelte v2.4.4 */
+/* src/Widget.html generated by Svelte v2.5.1 */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -31,7 +31,7 @@ function Widget(options) {
 
 	if (options.target) {
 		this._fragment.c();
-		this._mount(options.target, options.anchor);
+		this._mount(options.target, options.anchor, true);
 	}
 }
 
@@ -149,8 +149,8 @@ function _set(newState) {
 	}
 }
 
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+function _mount(target, anchor, intro) {
+	this._fragment[intro && this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
 function _differs(a, b) {

diff --git a/test/cli/samples/globals/expected/Main.js b/test/cli/samples/globals/expected/Main.js
@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.4.4 */
+/* src/Main.html generated by Svelte v2.5.1 */
 var Main = (function(answer) { "use strict";
 	answer = (answer && answer.__esModule) ? answer["default"] : answer;
 
@@ -46,7 +46,7 @@ var Main = (function(answer) { "use strict";
 
 		if (options.target) {
 			this._fragment.c();
-			this._mount(options.target, options.anchor);
+			this._mount(options.target, options.anchor, true);
 		}
 	}
 
@@ -170,8 +170,8 @@ var Main = (function(answer) { "use strict";
 		}
 	}
 
-	function _mount(target, anchor) {
-		this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+	function _mount(target, anchor, intro) {
+		this._fragment[intro && this._fragment.i ? 'i' : 'm'](target, anchor || null);
 	}
 
 	function _differs(a, b) {

diff --git a/test/cli/samples/sourcemap-inline/expected/Main.js b/test/cli/samples/sourcemap-inline/expected/Main.js