v2

src/Stats.ts

@@ -26,18 +26,24 @@ function collapseTimings(timings) {
 }
 
 export default class Stats {
+	onwarn: (warning: Warning) => void;
+
 	startTime: number;
 	currentTiming: Timing;
 	currentChildren: Timing[];
 	timings: Timing[];
 	stack: Timing[];
 	warnings: Warning[];
 
-	constructor() {
+	constructor({ onwarn }: {
+		onwarn: (warning: Warning) => void
+	}) {
 		this.startTime = now();
 		this.stack = [];
 		this.currentChildren = this.timings = [];
 
+		this.onwarn = onwarn;
+
 		this.warnings = [];
 	}
 
@@ -99,4 +105,9 @@ export default class Stats {
 			hooks
 		};
 	}
+
+	warn(warning) {
+		this.warnings.push(warning);
+		this.onwarn(warning);
+	}
 }

src/generators/Generator.ts

@@ -369,31 +369,13 @@ export default class Generator {
 			})
 		};
 
-		Object.getOwnPropertyNames(String.prototype).forEach(name => {
-			const descriptor = Object.getOwnPropertyDescriptor(String.prototype, name);
-			if (typeof descriptor.value === 'function') {
-				Object.defineProperty(css, name, {
-					value: (...args) => {
-						return css.code === null
-							? null
-							: css.code[name].call(css.code, ...args);
-					}
-				});
-			}
-		});
-
 		this.stats.stop('compile');
 
 		return {
 			ast: this.ast,
 			js,
 			css,
-			stats: this.stats.render(this),
-
-			// TODO deprecate
-			code: js.code,
-			map: js.map,
-			cssMap: css.map
+			stats: this.stats.render(this)
 		};
 	}
 

src/generators/dom/index.ts

@@ -143,8 +143,8 @@ export default function dom(
 		? `@proto`
 		: deindent`
 		{
-			${['destroy', 'get', 'fire', 'observe', 'on', 'set', 'teardown', '_set', '_mount', '_unmount', '_differs']
-				.map(n => `${n}: @${n === 'teardown' ? 'destroy' : n}`)
+			${['destroy', 'get', 'fire', 'on', 'set', '_set', '_mount', '_unmount', '_differs']
+				.map(n => `${n}: @${n}`)
 				.join(',\n')}
 		}`;
 
@@ -294,7 +294,7 @@ export default function dom(
 
 				${props.map(prop => deindent`
 					get ${prop}() {
-						return this.get('${prop}');
+						return this.get().${prop};
 					}
 
 					set ${prop}(value) {

src/generators/nodes/Element.ts

@@ -580,16 +580,8 @@ export default class Element extends Node {
 					});
 				`);
 
-				if (generator.options.dev) {
-					block.builders.hydrate.addBlock(deindent`
-						if (${handlerName}.teardown) {
-							console.warn("Return 'destroy()' from custom event handlers. Returning 'teardown()' has been deprecated and will be unsupported in Svelte 2");
-						}
-					`);
-				}
-
 				block.builders.destroy.addLine(deindent`
-					${handlerName}[${handlerName}.destroy ? 'destroy' : 'teardown']();
+					${handlerName}.destroy();
 				`);
 			} else {
 				const handler = deindent`

src/generators/nodes/Window.ts

@@ -86,16 +86,8 @@ export default class Window extends Node {
 						});
 					`);
 
-					if (generator.options.dev) {
-						block.builders.hydrate.addBlock(deindent`
-							if (${handlerName}.teardown) {
-								console.warn("Return 'destroy()' from custom event handlers. Returning 'teardown()' has been deprecated and will be unsupported in Svelte 2");
-							}
-						`);
-					}
-
 					block.builders.destroy.addLine(deindent`
-						${handlerName}[${handlerName}.destroy ? 'destroy' : 'teardown']();
+						${handlerName}.destroy();
 					`);
 				} else {
 					block.builders.init.addBlock(deindent`

src/generators/nodes/shared/mungeAttribute.ts

@@ -55,7 +55,7 @@ export default function mungeAttribute(attribute: Node, block: Block): MungedAtt
 			return {
 				spread: false,
 				name: attribute.name,
-				value: isNaN(value.data) ? stringify(value.data) : value.data,
+				value: stringify(value.data),
 				dynamic: false,
 				dependencies: []
 			};

src/generators/server-side-rendering/index.ts

@@ -163,47 +163,6 @@ export default function ssr(
 		};
 
 		var warned = false;
-		${name}.renderCss = function() {
-			if (!warned) {
-				console.error('Component.renderCss(...) is deprecated and will be removed in v2 — use Component.render(...).css instead');
-				warned = true;
-			}
-
-			var components = [];
-
-			${generator.stylesheet.hasStyles &&
-				deindent`
-				components.push({
-					filename: ${name}.filename,
-					css: ${name}.css && ${name}.css.code,
-					map: ${name}.css && ${name}.css.map
-				});
-			`}
-
-			${templateProperties.components &&
-				deindent`
-				var seen = {};
-
-				function addComponent(component) {
-					var result = component.renderCss();
-					result.components.forEach(x => {
-						if (seen[x.filename]) return;
-						seen[x.filename] = true;
-						components.push(x);
-					});
-				}
-
-				${templateProperties.components.value.properties.map((prop: Node) => {
-					return `addComponent(%components-${getName(prop.key)});`;
-				})}
-			`}
-
-			return {
-				css: components.map(x => x.css).join('\\n'),
-				map: null,
-				components
-			};
-		};
 
 		${templateProperties.preload && `${name}.preload = %preload;`}
 

src/generators/server-side-rendering/visitors/Component.ts

@@ -57,7 +57,7 @@ export default function visitComponent(
 		if (attribute.value.length === 1) {
 			const chunk = attribute.value[0];
 			if (chunk.type === 'Text') {
-				return isNaN(chunk.data) ? stringify(chunk.data) : chunk.data;
+				return stringify(chunk.data);
 			}
 
 			block.contextualise(chunk.expression);

src/index.ts

@@ -106,11 +106,13 @@ export async function preprocess(source: string, options: PreprocessOptions) {
 	};
 }
 
-export function compile(source: string, _options: CompileOptions) {
+function compile(source: string, _options: CompileOptions) {
 	const options = normalizeOptions(_options);
 	let parsed: Parsed;
 
-	const stats = new Stats();
+	const stats = new Stats({
+		onwarn: options.onwarn
+	});
 
 	try {
 		stats.start('parse');
@@ -126,33 +128,29 @@ export function compile(source: string, _options: CompileOptions) {
 	stats.stop('stylesheet');
 
 	stats.start('validate');
-	// TODO remove this when we remove svelte.validate from public API — we
-	// can use the stats object instead
-	const onwarn = options.onwarn;
-	options.onwarn = warning => {
-		stats.warnings.push(warning);
-		onwarn(warning);
-	};
-
-	validate(parsed, source, stylesheet, options);
+	validate(parsed, source, stylesheet, stats, options);
 	stats.stop('validate');
 
+	if (options.generate === false) {
+		return { ast: parsed, stats, js: null, css: null };
+	}
+
 	const compiler = options.generate === 'ssr' ? generateSSR : generate;
 
 	return compiler(parsed, source, stylesheet, options, stats);
 };
 
-export function create(source: string, _options: CompileOptions = {}) {
+function create(source: string, _options: CompileOptions = {}) {
 	_options.format = 'eval';
 
 	const compiled = compile(source, _options);
 
-	if (!compiled || !compiled.code) {
+	if (!compiled || !compiled.js.code) {
 		return;
 	}
 
 	try {
-		return (0, eval)(compiled.code);
+		return (0, eval)(compiled.js.code);
 	} catch (err) {
 		if (_options.onerror) {
 			_options.onerror(err);
@@ -163,4 +161,4 @@ export function create(source: string, _options: CompileOptions = {}) {
 	}
 }
 
-export { parse, validate, Stylesheet, version as VERSION };
+export { parse, create, compile, version as VERSION };

src/interfaces.ts

@@ -44,7 +44,7 @@ export interface CompileOptions {
 	format?: ModuleFormat;
 	name?: string;
 	filename?: string;
-	generate?: string;
+	generate?: string | false;
 	globals?: ((id: string) => string) | object;
 	amd?: {
 		id?: string;

src/server-side-rendering/register.js

@@ -37,9 +37,9 @@ function _register(extension) {
 			generate: 'ssr'
 		});
 
-		const {code} = compile(fs.readFileSync(filename, 'utf-8'), options);
+		const { js } = compile(fs.readFileSync(filename, 'utf-8'), options);
 
-		return module._compile(code, filename);
+		return module._compile(js.code, filename);
 	};
 }
 

src/shared/.eslintrc.json

@@ -29,7 +29,7 @@
         "plugin:import/warnings"
     ],
     "parserOptions": {
-        "ecmaVersion": 6,
+        "ecmaVersion": 9,
         "sourceType": "module"
     },
     "settings": {

src/shared/_build.js

@@ -9,18 +9,13 @@ fs.readdirSync(__dirname).forEach(file => {
 
 	const source = fs.readFileSync(path.join(__dirname, file), 'utf-8');
 	const ast = acorn.parse(source, {
-		ecmaVersion: 6,
+		ecmaVersion: 9,
 		sourceType: 'module'
 	});
 
 	ast.body.forEach(node => {
 		if (node.type !== 'ExportNamedDeclaration') return;
 
-		// check no ES6+ slipped in
-		acorn.parse(source.slice(node.declaration.start, node.end), {
-			ecmaVersion: 5
-		});
-
 		const declaration = node.declaration;
 		if (!declaration) return;