Merge pull request #1367 from sveltejs/gh-1316

refactor

.gitignore

@@ -1,22 +1,16 @@
 .DS_Store
-node_modules
-compiler
-ssr
-shared.js
-scratch
-!test/compiler
-!test/ssr
 .nyc_output
-coverage
-coverage.lcov
-test/sourcemaps/samples/*/output.js
-test/sourcemaps/samples/*/output.js.map
-_actual.*
-_actual-v2.*
-_actual-bundle.*
-src/generators/dom/shared.ts
-package-lock.json
-.idea/
-*.iml
-store.umd.js
-yarn-error.log
+node_modules
+/compiler/
+/ssr/
+/shared.js
+/scratch/
+/coverage/
+/coverage.lcov/
+/test/sourcemaps/samples/*/output.js
+/test/sourcemaps/samples/*/output.js.map
+/src/compile/shared.ts
+/package-lock.json
+/store.umd.js
+/yarn-error.log
+_actual*.*

rollup.config.js

@@ -34,7 +34,7 @@ export default [
 
 	/* ssr/register.js */
 	{
-		input: 'src/server-side-rendering/register.js',
+		input: 'src/ssr/register.js',
 		plugins: [
 			resolve(),
 			commonjs(),

src/Stats.ts

@@ -1,5 +1,5 @@
 import { Node, Warning } from './interfaces';
-import Generator from './generators/Generator';
+import Compiler from './compile/Compiler';
 
 const now = (typeof process !== 'undefined' && process.hrtime)
 	? () => {
@@ -73,12 +73,12 @@ export default class Stats {
 		this.currentChildren = this.currentTiming ? this.currentTiming.children : this.timings;
 	}
 
-	render(generator: Generator) {
+	render(compiler: Compiler) {
 		const timings = Object.assign({
 			total: now() - this.startTime
 		}, collapseTimings(this.timings));
 
-		const imports = generator.imports.map(node => {
+		const imports = compiler.imports.map(node => {
 			return {
 				source: node.source.value,
 				specifiers: node.specifiers.map(specifier => {
@@ -95,8 +95,8 @@ export default class Stats {
 		});
 
 		const hooks: Record<string, boolean> = {};
-		if (generator.templateProperties.oncreate) hooks.oncreate = true;
-		if (generator.templateProperties.ondestroy) hooks.ondestroy = true;
+		if (compiler.templateProperties.oncreate) hooks.oncreate = true;
+		if (compiler.templateProperties.ondestroy) hooks.ondestroy = true;
 
 		return {
 			timings,